From d7438593a890749b72ec042b7817c59d6d99815c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 18 Aug 2017 16:45:22 +0200 Subject: Remove QMAKE_LIBS_CORE variable Define the lib dependencies for corelib in corelib.pro, where they belong. Change-Id: I973d3b0c571782d869b27dea243e899db4dddc43 Reviewed-by: Oswald Buddenhagen --- mkspecs/common/ghs-base.conf | 2 -- mkspecs/common/msvc-desktop.conf | 1 - mkspecs/common/winrt_winphone/qmake.conf | 1 - 3 files changed, 4 deletions(-) (limited to 'mkspecs/common') 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 -- cgit v1.2.3