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