From 06100e103459d0149c8c3c37e524715e7e7fbdd5 Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@nokia.com>
Date: Tue, 13 Mar 2012 16:38:56 +0100
Subject: Keep common just for the tools.

All other files should be in the lib anyway. Fix includes.

Change-Id: I654fadf0a77b8d19953a6b47820e6398af11e2df
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
---
 installerbuilder/libinstaller/libinstaller.pro | 48 ++++++++++++--------------
 1 file changed, 23 insertions(+), 25 deletions(-)

(limited to 'installerbuilder/libinstaller/libinstaller.pro')

diff --git a/installerbuilder/libinstaller/libinstaller.pro b/installerbuilder/libinstaller/libinstaller.pro
index 10f58d409..7a01e0a5f 100644
--- a/installerbuilder/libinstaller/libinstaller.pro
+++ b/installerbuilder/libinstaller/libinstaller.pro
@@ -1,11 +1,9 @@
 TEMPLATE = lib
 TARGET = installer
-DEPENDPATH += . \
-    .. \
-    ../common
 
-INCLUDEPATH += . \
-    ..
+INCLUDEPATH += . ..
+DEPENDPATH += . .. 3rdparty/kdtools
+
 DESTDIR = $$OUT_PWD/../lib
 DLLDESTDIR = $$OUT_PWD/../bin
 
@@ -29,16 +27,16 @@ contains(CONFIG, static): {
 include(3rdparty/7zip/7zip.pri)
 include(3rdparty/kdtools/kdtools.pri)
 
-HEADERS += $$PWD/packagemanagercore.h \
-    $$PWD/packagemanagercore_p.h \
-    $$PWD/packagemanagergui.h \
-    ../common/binaryformat.h \
-    ../common/binaryformatengine.h \
-    ../common/binaryformatenginehandler.h \
-    ../common/repository.h \
-    ../common/zipjob.h \
-    ../common/utils.h \
-    ../common/errors.h \
+HEADERS += packagemanagercore.h \
+    packagemanagercore_p.h \
+    packagemanagergui.h \
+    binaryformat.h \
+    binaryformatengine.h \
+    binaryformatenginehandler.h \
+    repository.h \
+    zipjob.h \
+    utils.h \
+    errors.h \
     component.h \
     componentmodel.h \
     qinstallerglobal.h \
@@ -101,16 +99,16 @@ HEADERS += $$PWD/packagemanagercore.h \
     packagemanagerproxyfactory.h \
     createlocalrepositoryoperation.h
 
-SOURCES += $$PWD/packagemanagercore.cpp \
-    $$PWD/packagemanagercore_p.cpp \
-    $$PWD/packagemanagergui.cpp \
-    ../common/binaryformat.cpp \
-    ../common/binaryformatengine.cpp \
-    ../common/binaryformatenginehandler.cpp \
-    ../common/repository.cpp \
-    ../common/zipjob.cpp \
-    ../common/fileutils.cpp \
-    ../common/utils.cpp \
+SOURCES += packagemanagercore.cpp \
+    packagemanagercore_p.cpp \
+    packagemanagergui.cpp \
+    binaryformat.cpp \
+    binaryformatengine.cpp \
+    binaryformatenginehandler.cpp \
+    repository.cpp \
+    zipjob.cpp \
+    fileutils.cpp \
+    utils.cpp \
     component.cpp \
     componentmodel.cpp \
     qtpatch.cpp \
-- 
cgit v1.2.3