summarylogtreecommitdiffstats
path: root/qt-merge-static-and-shared-library-trees.patch
blob: 95e9a1ae240ab9c6c9adf2c3fa178a4f61726534 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
--- a/mkspecs/features/qt_functions.prf.orig	2014-08-01 23:54:20.441986402 +0200
+++ b/mkspecs/features/qt_functions.prf	2014-08-01 23:55:33.603172013 +0200
@@ -83,6 +83,19 @@
         QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX}
     }
     LIBS += $$LINKAGE
+
+    win32:CONFIG(static) {
+        isEqual(LIB_NAME, QtCore) {
+            LIBS += $$QMAKE_LIBS_CORE
+        } else:isEqual(LIB_NAME, QtGui) {
+            LIBS += $$QMAKE_LIBS_GUI
+        } else:isEqual(LIB_NAME, QtNetwork) {
+            LIBS += $$QMAKE_LIBS_NETWORK
+        } else:isEqual(LIB_NAME, QtOpenGL) {
+            LIBS += $$QMAKE_LIBS_OPENGL
+        }
+    }
+
     export(LIBS)
     export(INCLUDEPATH)
     export(QMAKE_FRAMEWORKPATH)
--- a/mkspecs/features/default_post.prf.orig	2014-08-01 23:51:16.864011435 +0200
+++ b/mkspecs/features/default_post.prf	2014-08-01 23:51:29.830221559 +0200
@@ -96,6 +96,11 @@
 QMAKE_INCDIR += $$QMAKE_INCDIR_POST
 QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
 
+win32:contains(CONFIG, static) {
+    DEFINES += QT_STATIC
+    QMAKE_LFLAGS += -static
+}
+
 # Let every project have a standard GNU `check' target
 !contains(QMAKE_EXTRA_TARGETS, check) {
     # `make check' should iterate through all subdirs
--- a/configure.orig	2012-12-10 23:51:02.920255366 +0100
+++ b/configure	2012-12-10 23:55:58.101753703 +0100
@@ -6032,6 +6032,12 @@
 QT_EDITION = $Edition
 QT_CONFIG += $QT_CONFIG
 
+contains(CONFIG, static) {
+    CONFIG -= shared
+    QT_CONFIG += static jpeg gif
+    QT_CONFIG -= shared
+}
+
 #versioning
 QT_VERSION = $QT_VERSION
 QT_MAJOR_VERSION = $QT_MAJOR_VERSION