diff options
| -rw-r--r-- | mkspecs/common/ghs-base.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/winrt_winphone/qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/win32-g++/qmake.conf | 1 | ||||
| -rw-r--r-- | src/angle/src/common/common.pri | 2 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 10 | ||||
| -rw-r--r-- | src/platformsupport/fontdatabases/winrt/winrt.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/winrt/winrt.pro | 2 |
8 files changed, 10 insertions, 11 deletions
diff --git a/mkspecs/common/ghs-base.conf b/mkspecs/common/ghs-base.conf index addc05241c..a66971578c 100644 --- a/mkspecs/common/ghs-base.conf +++ b/mkspecs/common/ghs-base.conf @@ -38,5 +38,3 @@ QMAKE_LFLAGS_RELEASE += -Ospeed -Olink -Omax QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_LFLAGS_RELEASE -g QMAKE_LFLAGS_CXX11 += --c++11 --thread_local_storage QMAKE_LFLAGS_EXCEPTIONS_ON += --exceptions - -QMAKE_LIBS_CORE = -lposix -livfs -lsocket -lnet -lshm_client diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index f538acfcd9..f95a3bbdc8 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -88,7 +88,6 @@ QMAKE_EXTENSION_SHLIB = dll QMAKE_PREFIX_STATICLIB = QMAKE_EXTENSION_STATICLIB = lib -QMAKE_LIBS_CORE = kernel32.lib user32.lib shell32.lib uuid.lib ole32.lib advapi32.lib ws2_32.lib QMAKE_LIBS_GUI = gdi32.lib comdlg32.lib oleaut32.lib imm32.lib winmm.lib ws2_32.lib ole32.lib user32.lib advapi32.lib QMAKE_LIBS_NETWORK = ws2_32.lib QMAKE_LIBS_OPENGL = glu32.lib opengl32.lib gdi32.lib user32.lib diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf index 8e0aba7371..2bb6f9bcbd 100644 --- a/mkspecs/common/winrt_winphone/qmake.conf +++ b/mkspecs/common/winrt_winphone/qmake.conf @@ -76,7 +76,6 @@ QMAKE_PREFIX_STATICLIB = QMAKE_EXTENSION_STATICLIB = lib QMAKE_LIBS += runtimeobject.lib -QMAKE_LIBS_CORE += ws2_32.lib QMAKE_LIBS_GUI = QMAKE_LIBS_NETWORK += ws2_32.lib diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index d2500355ac..185afaaa49 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -61,7 +61,6 @@ QMAKE_EXTENSION_STATICLIB = a QMAKE_LIB_EXTENSIONS = a dll.a QMAKE_LIBS = -QMAKE_LIBS_CORE = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 QMAKE_LIBS_NETWORK = -lws2_32 QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 7305362d86..c1fad14951 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -12,7 +12,7 @@ INCLUDEPATH += \ $$ANGLE_DIR/src \ $$ANGLE_DIR/include -LIBS_PRIVATE = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_GUI +LIBS_PRIVATE = $$QMAKE_LIBS_GUI TR_EXCLUDE += $$ANGLE_DIR/src/* diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 7d09070b81..32f9992b6b 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -53,8 +53,10 @@ win32 { # Override MinGW's definition in _mingw.h DEFINES += WINVER=0x600 _WIN32_WINNT=0x0600 } - - !winrt: LIBS_PRIVATE += -lwinmm + LIBS_PRIVATE += -lws2_32 + !winrt { + LIBS_PRIVATE += -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lwinmm + } } darwin { @@ -66,7 +68,9 @@ darwin { LIBS_PRIVATE += -framework Foundation } -QMAKE_LIBS += $$QMAKE_LIBS_CORE +integrity { + LIBS_PRIVATE += -lposix -livfs -lsocket -lnet -lshm_client +} QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist diff --git a/src/platformsupport/fontdatabases/winrt/winrt.pri b/src/platformsupport/fontdatabases/winrt/winrt.pri index 4875338182..291ada220f 100644 --- a/src/platformsupport/fontdatabases/winrt/winrt.pri +++ b/src/platformsupport/fontdatabases/winrt/winrt.pri @@ -8,4 +8,4 @@ HEADERS += \ DEFINES += __WRL_NO_DEFAULT_LIB__ -LIBS += $$QMAKE_LIBS_CORE -ldwrite +LIBS += -lws2_32 -ldwrite diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro index 02a848b03f..042b270cff 100644 --- a/src/plugins/platforms/winrt/winrt.pro +++ b/src/plugins/platforms/winrt/winrt.pro @@ -8,7 +8,7 @@ QT += \ DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__ -LIBS += $$QMAKE_LIBS_CORE -ld3d11 +LIBS += -lws2_32 -ld3d11 SOURCES = \ main.cpp \ |