diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-21 10:38:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-21 10:38:41 +0100 |
| commit | 022a0f0fb3a32a2b9ddbb0ca6060dcf08b721632 (patch) | |
| tree | 8ae6ae9497d5c6fdae4cfa33e1c7c629db1f60ed /mkspecs | |
| parent | 543e2d5e01712850171a7ed0f7de257e1fdee08b (diff) | |
| parent | d4a29a53ebfb78a9acf5e6f34b6f0721d02f8727 (diff) | |
Merge "Merge 'release' into stable" into refs/staging/stable
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 7 | ||||
| -rw-r--r-- | mkspecs/features/qt_module_fwdpri.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/win32/thread.prf | 22 | ||||
| -rw-r--r-- | mkspecs/features/win32/thread_off.prf | 2 |
4 files changed, 5 insertions, 27 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 159733e02e..19cdc2a26a 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -51,6 +51,10 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri !build_pass { # Create a module .pri file + unix:!static: \ + module_rpath = "QT.$${MODULE}.rpath = $$[QT_INSTALL_LIBS/raw]" + else: \ + module_rpath = !isEmpty(QT_FOR_PRIVATE) { contains(QT_FOR_PRIVATE, .*-private$):error("QT_FOR_PRIVATE may not contain *-private.") module_privdep = "QT.$${MODULE}.private_depends = $$QT_FOR_PRIVATE" @@ -82,10 +86,9 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri "QT.$${MODULE}.bins = \$\$QT_MODULE_BIN_BASE" \ "QT.$${MODULE}.includes = $$MODULE_INCLUDES" \ "QT.$${MODULE}.private_includes = $$MODULE_PRIVATE_INCLUDES" \ - "QT.$${MODULE}.sources = $$val_escape(_PRO_FILE_PWD_)" \ "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \ "QT.$${MODULE}.libexecs = \$\$QT_MODULE_LIBEXEC_BASE" \ - "QT.$${MODULE}.rpath = $$[QT_INSTALL_LIBS/raw]" \ + $$module_rpath \ "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \ "QT.$${MODULE}.imports = \$\$QT_MODULE_IMPORT_BASE" \ "QT.$${MODULE}.qml = \$\$QT_MODULE_QML_BASE" \ diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index ce0b09d616..58b016803e 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -59,7 +59,6 @@ # Create a forwarding module .pri file MODULE_FWD_PRI_CONT = \ - "QT_MODULE_BASE = $$MODULE_BASE_DIR" \ "QT_MODULE_BIN_BASE = $$MODULE_BASE_OUTDIR/bin" \ "QT_MODULE_INCLUDE_BASE = $$MODULE_BASE_OUTDIR/include" \ "QT_MODULE_IMPORT_BASE = $$MODULE_BASE_OUTDIR/imports" \ diff --git a/mkspecs/features/win32/thread.prf b/mkspecs/features/win32/thread.prf deleted file mode 100644 index fc832a0990..0000000000 --- a/mkspecs/features/win32/thread.prf +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG -= thread_off - -# #### These need to go -debug { - contains(DEFINES, QT_DLL) { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_MT_DLLDBG - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_MT_DLLDBG - } else { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_MT_DBG - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_MT_DBG - } -} else { - contains(DEFINES, QT_DLL) { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_MT_DLL - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_MT_DLL - } else { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_MT - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_MT - } -} - -QMAKE_LIBS += $$QMAKE_LIBS_RTMT diff --git a/mkspecs/features/win32/thread_off.prf b/mkspecs/features/win32/thread_off.prf deleted file mode 100644 index 436a2c8166..0000000000 --- a/mkspecs/features/win32/thread_off.prf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG -= thread -QMAKE_LIBS += $$QMAKE_LIBS_RT |