diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-19 19:31:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-19 19:34:53 +0100 |
| commit | d4a29a53ebfb78a9acf5e6f34b6f0721d02f8727 (patch) | |
| tree | 92436a56de0f549b29d3b75df855775fc7a21331 /mkspecs/features/win32 | |
| parent | 234163adb3ceb9a6f2fac04a276724bf8495ca8e (diff) | |
| parent | d1c10615e31acc487eae0c966e8c3a8e5927af84 (diff) | |
Merge 'release' into stable
Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/thread.prf | 22 | ||||
| -rw-r--r-- | mkspecs/features/win32/thread_off.prf | 2 |
2 files changed, 0 insertions, 24 deletions
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 |