diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-18 16:45:22 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-28 13:10:38 +0000 |
| commit | d7438593a890749b72ec042b7817c59d6d99815c (patch) | |
| tree | c666a82787d5516380c4ce0772c15e73d4715ca5 /src/corelib/corelib.pro | |
| parent | 3380c7949e897cb65fe4ea4d8f58b44ccd6c999c (diff) | |
Remove QMAKE_LIBS_CORE variable
Define the lib dependencies for corelib in corelib.pro, where they
belong.
Change-Id: I973d3b0c571782d869b27dea243e899db4dddc43
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 10 |
1 files changed, 7 insertions, 3 deletions
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 |