Always use static Qt with jpeg/gif plugins on Windows.

This commit is contained in:
lotodore
2009-03-21 12:32:46 +00:00
parent e352a90657
commit 1bb674f8b7
4 changed files with 14 additions and 8 deletions
+4 -3
View File
@@ -7,10 +7,10 @@ isEmpty( PREFIX ){
TEMPLATE = app
CODECFORSRC = UTF-8
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
#####Uncomment this for RELEASE
#####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt)
#QTPLUGIN += qjpeg qgif
UI_DIR = uics
@@ -269,6 +269,7 @@ TRANSLATIONS = \
ts/pokerth_START_HERE.ts
win32 {
QTPLUGIN += qjpeg qgif
DEFINES += CURL_STATICLIB
DEPENDPATH += src/net/win32/ src/core/win32
INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer
+2 -2
View File
@@ -3,8 +3,8 @@
TEMPLATE = lib
CODECFORSRC = UTF-8
#CONFIG += staticlib thread exceptions rtti stl warn_on release
CONFIG += staticlib thread exceptions rtti stl warn_on debug
CONFIG += staticlib thread exceptions rtti stl warn_on release
#CONFIG += staticlib thread exceptions rtti stl warn_on debug
UI_DIR = uics
TARGET = lib/pokerth_lib
+2 -2
View File
@@ -7,8 +7,8 @@ isEmpty( PREFIX ){
TEMPLATE = app
CODECFORSRC = UTF-8
#CONFIG += thread console embed_manifest_exe exceptions rtti stl warn_on release
CONFIG += thread console embed_manifest_exe exceptions rtti stl warn_on debug
CONFIG += thread console embed_manifest_exe exceptions rtti stl warn_on release
#CONFIG += thread console embed_manifest_exe exceptions rtti stl warn_on debug
UI_DIR = uics
TARGET = bin/pokerth_server
+6 -1
View File
@@ -57,11 +57,16 @@
#define ENABLE_LEAK_CHECK()
#endif
//Uncomment this for RELEASE
//Uncomment this for RELEASE on Linux/Unix/BSD (static Qt only)
// #include <QtPlugin>
// Q_IMPORT_PLUGIN(qjpeg)
// 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;