Always use static Qt with jpeg/gif plugins on Windows.
This commit is contained in:
+4
-3
@@ -7,10 +7,10 @@ isEmpty( PREFIX ){
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
CODECFORSRC = UTF-8
|
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 release
|
||||||
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
|
#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
|
#QTPLUGIN += qjpeg qgif
|
||||||
|
|
||||||
UI_DIR = uics
|
UI_DIR = uics
|
||||||
@@ -269,6 +269,7 @@ TRANSLATIONS = \
|
|||||||
ts/pokerth_START_HERE.ts
|
ts/pokerth_START_HERE.ts
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
QTPLUGIN += qjpeg qgif
|
||||||
DEFINES += CURL_STATICLIB
|
DEFINES += CURL_STATICLIB
|
||||||
DEPENDPATH += src/net/win32/ src/core/win32
|
DEPENDPATH += src/net/win32/ src/core/win32
|
||||||
INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer
|
INCLUDEPATH += ../boost/ ../SDL/include ../SDL_mixer
|
||||||
|
|||||||
+2
-2
@@ -3,8 +3,8 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CODECFORSRC = UTF-8
|
CODECFORSRC = UTF-8
|
||||||
|
|
||||||
#CONFIG += staticlib thread exceptions rtti stl warn_on release
|
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 debug
|
||||||
|
|
||||||
UI_DIR = uics
|
UI_DIR = uics
|
||||||
TARGET = lib/pokerth_lib
|
TARGET = lib/pokerth_lib
|
||||||
|
|||||||
+2
-2
@@ -7,8 +7,8 @@ isEmpty( PREFIX ){
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
CODECFORSRC = UTF-8
|
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 release
|
||||||
CONFIG += thread console embed_manifest_exe exceptions rtti stl warn_on debug
|
#CONFIG += thread console embed_manifest_exe exceptions rtti stl warn_on debug
|
||||||
|
|
||||||
UI_DIR = uics
|
UI_DIR = uics
|
||||||
TARGET = bin/pokerth_server
|
TARGET = bin/pokerth_server
|
||||||
|
|||||||
+6
-1
@@ -57,11 +57,16 @@
|
|||||||
#define ENABLE_LEAK_CHECK()
|
#define ENABLE_LEAK_CHECK()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//Uncomment this for RELEASE
|
//Uncomment this for RELEASE on Linux/Unix/BSD (static Qt only)
|
||||||
// #include <QtPlugin>
|
// #include <QtPlugin>
|
||||||
// Q_IMPORT_PLUGIN(qjpeg)
|
// Q_IMPORT_PLUGIN(qjpeg)
|
||||||
// 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;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user