From 4246dd206fb0ebda65301f1fa175812299532caa Mon Sep 17 00:00:00 2001 From: lotodore Date: Fri, 24 Sep 2010 20:10:41 +0000 Subject: [PATCH] Win32 jpeg/gif plugins no longer required using qt 4.7.0. --- pokerth_game.pro | 14 ++++++-------- src/pokerth.cpp | 6 ------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pokerth_game.pro b/pokerth_game.pro index 2568efdc..8468134a 100644 --- a/pokerth_game.pro +++ b/pokerth_game.pro @@ -292,8 +292,6 @@ TRANSLATIONS = ts/pokerth_af.ts \ ts/pokerth_tr.ts \ ts/pokerth_START_HERE.ts win32 { - QTPLUGIN += qjpeg \ - qgif DEFINES += CURL_STATICLIB DEFINES += _WIN32_WINNT=0x0501 DEPENDPATH += src/net/win32/ \ @@ -326,12 +324,12 @@ win32 { -llibcurl win32-g++ { LIBS += -lgnutls-openssl \ - -lgnutls \ - -lgcrypt \ - -ltasn1 \ - -lgpg-error \ - -lgsasl \ - -lidn + -lgnutls \ + -lgcrypt \ + -ltasn1 \ + -lgpg-error \ + -lgsasl \ + -lidn LIBS += -lcurl LIBS += -lz LIBS += -lboost_thread-mgw45-mt-1_44.dll diff --git a/src/pokerth.cpp b/src/pokerth.cpp index ab11931c..f7792047 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -64,12 +64,6 @@ //Q_IMPORT_PLUGIN(qgif) -#ifdef _WIN32 // Always use static Qt on Windows. -#include -Q_IMPORT_PLUGIN(qjpeg) -Q_IMPORT_PLUGIN(qgif) -#endif - using namespace std; class startWindowImpl;