Blob Blame History Raw
--- mkspecs/features/qt_functions.prf.orig      2012-09-05 23:30:01.612735271 +0200
+++ mkspecs/features/qt_functions.prf   2012-09-05 23:32:40.030869399 +0200
@@ -134,6 +134,21 @@
         }
         $$3 += $$LINKAGE
     }
+
+    win32:CONFIG(static) {
+        isEqual(MODULE_NAME, Qt5Core) {
+            $$3 += $$QMAKE_LIBS_CORE
+        } else:isEqual(MODULE_NAME, Qt5Widgets) {
+            $$3 += $$QMAKE_LIBS_WIDGETS
+        } else:isEqual(MODULE_NAME, Qt5Gui) {
+            $$3 += $$QMAKE_LIBS_GUI
+        } else:isEqual(MODULE_NAME, Qt5Network) {
+            $$3 += $$QMAKE_LIBS_NETWORK
+        } else:isEqual(MODULE_NAME, Qt5OpenGL) {
+            $$3 += $$QMAKE_LIBS_OPENGL
+        }
+    }
+
     export($$3)
     export(INCLUDEPATH)
     export(QMAKE_FRAMEWORKPATH)
--- mkspecs/features/default_post.prf.orig      2012-09-05 23:28:56.827501401 +0200
+++ mkspecs/features/default_post.prf   2012-09-05 23:29:31.617923080 +0200
@@ -47,3 +50,7 @@
 
 QMAKE_INCDIR += $$QMAKE_INCDIR_POST
 QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
+
+win32:contains(CONFIG, static) {
+    QMAKE_LFLAGS += -static
+}
--- mkspecs/features/qt.prf.orig	2012-09-07 20:35:43.711572661 +0200
+++ mkspecs/features/qt.prf	2012-09-07 20:35:48.794607868 +0200
@@ -2,12 +2,14 @@
 
 #handle defines
 win32 {
-   contains(QT_CONFIG, shared) {
+   contains(CONFIG, shared) {
       # this variable is read by qmake in qmake/generators/win32/msvc_vcproj.cpp
       # function VcprojGenerator::initDeploymentTool(), which contains some hardcoded
       # library names (the ones that were static in Qt 4)
       # it probably doesn't work anymore and should not be in this file
       QMAKE_QT_DLL = 1
+   } else {
+      DEFINES += QT_STATIC
    }
 }
 CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG
--- configure.orig	2012-12-10 23:51:02.920255366 +0100
+++ configure	2012-12-10 23:55:58.101753703 +0100
@@ -6032,6 +6032,12 @@
 QT_EDITION = $Edition
 QT_CONFIG += $QT_CONFIG
 
+contains(CONFIG, static) {
+    QT_CONFIG += static jpeg
+    QT_CONFIG -= shared
+    QT_DEFINES += QT_STATIC
+}
+
 #versioning
 QT_VERSION = $QT_VERSION
 QT_MAJOR_VERSION = $QT_MAJOR_VERSION