diff options
6 files changed, 6 insertions, 15 deletions
diff --git a/installerbuilder/binarycreator/binarycreator.pro b/installerbuilder/binarycreator/binarycreator.pro index 237ce9952..7145ace41 100644 --- a/installerbuilder/binarycreator/binarycreator.pro +++ b/installerbuilder/binarycreator/binarycreator.pro @@ -20,6 +20,3 @@ SOURCES = binarycreator.cpp \ ../common/repositorygen.cpp HEADERS = rcc/rcc.h - -win32:OBJECTS_DIR = .obj -win32:LIBS += Shell32.lib diff --git a/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri b/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri index 1045d02a1..a02ae151b 100644 --- a/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri +++ b/installerbuilder/libinstaller/3rdparty/7zip/win/win.pri @@ -5,8 +5,6 @@ isEmpty(7ZIP_BASE): error(Please call qmake with 7ZIP_BASE=<path to nokia-sdk so CONFIG += no_batch # this is needed because we have a same named *.c and *.cpp file -> 7in -win32:LIBS += -loleaut32 -luser32 -ladvapi32 - DEFINES += WIN_LONG_PATH _UNICODE _CRT_SECURE_NO_WARNINGS INCLUDEPATH += $$7ZIP_BASE/CPP diff --git a/installerbuilder/libinstaller/libinstaller.pri b/installerbuilder/libinstaller/libinstaller.pri index 74f9e27f6..09f8ef7ad 100644 --- a/installerbuilder/libinstaller/libinstaller.pri +++ b/installerbuilder/libinstaller/libinstaller.pri @@ -29,7 +29,6 @@ QT += gui # gui needed for KDUpdater include (compareVersion), which indirectly LIBS = -L$$OUT_PWD/../lib -L$$OUT_PWD/../../lib -linstaller $$LIBS -win32:LIBS += -lole32 -lUser32 -loleaut32 -lshell32 macx:LIBS += -framework Security unix:!macx:LIBS += -lutil diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro index 6ee1e20f0..10f58d409 100644 --- a/installerbuilder/libinstaller/libinstaller.pro +++ b/installerbuilder/libinstaller/libinstaller.pro @@ -180,10 +180,11 @@ win32:SOURCES += adminauthorization_win.cpp macx:SOURCES += adminauthorization_mac.cpp unix:!macx: SOURCES += adminauthorization_x11.cpp -win32:OBJECTS_DIR = .obj -win32:LIBS += ole32.lib \ - oleaut32.lib \ - user32.lib +# Needed by createshortcutoperation +win32:LIBS += -lole32 + +# Needed by 7zip +win32:LIBS += -loleaut32 -lUser32 # Needed by kdtools (in kdlog_win.cpp): win32:LIBS += advapi32.lib psapi.lib @@ -191,7 +192,7 @@ macx:LIBS += -framework Carbon CONFIG( shared, static|shared ): { DEFINES += LIB_INSTALLER_SHARED - win32: LIBS += shell32.lib + win32: LIBS += -lshell32 } macx: LIBS += -framework Security diff --git a/tests/environmentvariable/environmentvariable.pro b/tests/environmentvariable/environmentvariable.pro index 036a4ff02..5ac132500 100644 --- a/tests/environmentvariable/environmentvariable.pro +++ b/tests/environmentvariable/environmentvariable.pro @@ -17,6 +17,4 @@ SOURCES = environmentvariabletest.cpp HEADERS = environmentvariabletest.h LIBS = -L../../installerbuilder/lib -linstaller $$LIBS -win32:LIBS += ole32.lib oleaut32.lib user32.lib -win32:OBJECTS_DIR = .obj diff --git a/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro b/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro index ce3551e1d..170a7690a 100644 --- a/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro +++ b/tests/extractarchiveoperationtest/extractarchiveoperationtest.pro @@ -17,5 +17,3 @@ SOURCES = extractarchiveoperationtest.cpp HEADERS = extractarchiveoperationtest.h LIBS = -L../../installerbuilder/lib -linstaller $$LIBS -win32:LIBS += ole32.lib oleaut32.lib user32.lib -win32:OBJECTS_DIR = .obj |