aboutsummarylogtreecommitdiffstats
path: root/qt5-merge-static-and-shared-library-trees.patch
blob: 9e6271a6ea630d28b70b42f87f28d41610d0e540 (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
--- mkspecs/features/qt.prf.orig	2016-03-27 17:38:28.396736835 +0200
+++ mkspecs/features/qt.prf	2016-03-27 18:09:17.061088857 +0200
@@ -141,6 +141,18 @@
                 }
             }
         }
+
+        win32:CONFIG(static) {
+            isEqual(MODULE_NAME, QtCore) {
+                LIBS$$var_sfx += $$QMAKE_LIBS_CORE
+            } else:isEqual(MODULE_NAME, QtGui) {
+                LIBS$$var_sfx += $$QMAKE_LIBS_GUI
+            } else:isEqual(MODULE_NAME, QtNetwork) {
+                LIBS$$var_sfx += $$QMAKE_LIBS_NETWORK
+            } else:isEqual(MODULE_NAME, QtOpenGL) {
+                LIBS$$var_sfx += $$QMAKE_LIBS_OPENGL
+            }
+        }
     }
     !isEmpty(BAD_QT):error("Unknown module(s) in QT$$var_sfx: $$replace(BAD_QT, _private$, -private)")

--- 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,11 @@

 QMAKE_INCDIR += $$QMAKE_INCDIR_POST
 QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST
+
+win32:contains(CONFIG, static) {
+    DEFINES += QT_STATIC QT_DESIGNER_STATIC
+    DEFINES -= QT_SHARED
+    contains(QT_CONFIG, angle): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC
+    QMAKE_LFLAGS += -static -static-libstdc++ -static-libgcc
+    QMAKE_EXT_PRL=-static.prl # prevents qmake from finding the prl file for shared libs
+}
--- configure.orig	2012-12-10 23:51:02.920255366 +0100
+++ configure	2012-12-10 23:55:58.101753703 +0100
@@ -6193,6 +6193,12 @@
 }
 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