Win32 jpeg/gif plugins no longer required using qt 4.7.0.

This commit is contained in:
lotodore
2010-09-24 20:10:41 +00:00
parent 9dfe3dc344
commit 4246dd206f
2 changed files with 6 additions and 14 deletions
+6 -8
View File
@@ -292,8 +292,6 @@ TRANSLATIONS = ts/pokerth_af.ts \
ts/pokerth_tr.ts \ ts/pokerth_tr.ts \
ts/pokerth_START_HERE.ts ts/pokerth_START_HERE.ts
win32 { win32 {
QTPLUGIN += qjpeg \
qgif
DEFINES += CURL_STATICLIB DEFINES += CURL_STATICLIB
DEFINES += _WIN32_WINNT=0x0501 DEFINES += _WIN32_WINNT=0x0501
DEPENDPATH += src/net/win32/ \ DEPENDPATH += src/net/win32/ \
@@ -326,12 +324,12 @@ win32 {
-llibcurl -llibcurl
win32-g++ { win32-g++ {
LIBS += -lgnutls-openssl \ LIBS += -lgnutls-openssl \
-lgnutls \ -lgnutls \
-lgcrypt \ -lgcrypt \
-ltasn1 \ -ltasn1 \
-lgpg-error \ -lgpg-error \
-lgsasl \ -lgsasl \
-lidn -lidn
LIBS += -lcurl LIBS += -lcurl
LIBS += -lz LIBS += -lz
LIBS += -lboost_thread-mgw45-mt-1_44.dll LIBS += -lboost_thread-mgw45-mt-1_44.dll
-6
View File
@@ -64,12 +64,6 @@
//Q_IMPORT_PLUGIN(qgif) //Q_IMPORT_PLUGIN(qgif)
#ifdef _WIN32 // Always use static Qt on Windows.
#include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
Q_IMPORT_PLUGIN(qgif)
#endif
using namespace std; using namespace std;
class startWindowImpl; class startWindowImpl;