From 1bb674f8b79c06a78a28dd6d83d47223df9d9c34 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Sat, 21 Mar 2009 12:32:46 +0000
Subject: [PATCH] Always use static Qt with jpeg/gif plugins on Windows.

---
 pokerth_game.pro   | 7 ++++---
 pokerth_lib.pro    | 4 ++--
 pokerth_server.pro | 4 ++--
 src/pokerth.cpp    | 7 ++++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pokerth_game.pro b/pokerth_game.pro
index 4d08bda0..85aa7bab 100644
--- a/pokerth_game.pro
+++ b/pokerth_game.pro
@@ -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
diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 97c88aaa..d0126fcc 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -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
diff --git a/pokerth_server.pro b/pokerth_server.pro
index a69abd62..53a64cc2 100644
--- a/pokerth_server.pro
+++ b/pokerth_server.pro
@@ -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
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index c4058ae3..8fd2425a 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -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;