From b294bdc12d2523be67584b3fb200ca612f0d1e06 Mon Sep 17 00:00:00 2001
From: tjenssen <tim.jenssen@nokia.com>
Date: Tue, 13 Mar 2012 17:14:30 +0100
Subject: clean up pro files

Change-Id: I46dd8eff3a744099e0827573e6aee253ce149baf
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
---
 installerbuilder/binarycreator/binarycreator.pro        |  3 ---
 installerbuilder/libinstaller/3rdparty/7zip/win/win.pri |  2 --
 installerbuilder/libinstaller/libinstaller.pri          |  1 -
 installerbuilder/libinstaller/libinstaller.pro          | 11 ++++++-----
 4 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'installerbuilder')

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
-- 
cgit v1.2.3