From 4917152126998bcd448c3b001b962eb8f8bede62 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 8 Nov 2012 19:10:36 +0100 Subject: remove app_bundle config only if it is a static build on Mac Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56 Reviewed-by: Karsten Heimrich --- installerfw.pri | 1 + src/sdk/sdk.pro | 2 -- tools/archivegen/archivegen.pro | 1 - tools/binarycreator/binarycreator.pro | 1 - tools/repogen/repogen.pro | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/installerfw.pri b/installerfw.pri index b5d6d7e55..9a1f632d4 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -65,4 +65,5 @@ CONFIG(shared, static|shared):DEFINES += LIB_INSTALLER_SHARED static { win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib unix:exists($$IFW_LIB_PATH/libinstaller.a):POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a + macx:equals(TEMPLATE, app):CONFIG -= app_bundle } diff --git a/src/sdk/sdk.pro b/src/sdk/sdk.pro index 3cf5b6c64..0594defbf 100644 --- a/src/sdk/sdk.pro +++ b/src/sdk/sdk.pro @@ -6,8 +6,6 @@ TARGET = installerbase include(../../installerfw.pri) QT += network script - -CONFIG -= app_bundle DESTDIR = $$IFW_APP_PATH if (exists($$LRELEASE)) { diff --git a/tools/archivegen/archivegen.pro b/tools/archivegen/archivegen.pro index 886a9856e..252c07962 100644 --- a/tools/archivegen/archivegen.pro +++ b/tools/archivegen/archivegen.pro @@ -9,7 +9,6 @@ QT -= gui QT += script CONFIG += console -CONFIG -= app_bundle DESTDIR = $$IFW_APP_PATH SOURCES += archive.cpp \ diff --git a/tools/binarycreator/binarycreator.pro b/tools/binarycreator/binarycreator.pro index 2e36e1575..2d020f45e 100644 --- a/tools/binarycreator/binarycreator.pro +++ b/tools/binarycreator/binarycreator.pro @@ -9,7 +9,6 @@ QT -= gui QT += script CONFIG += console -CONFIG -= app_bundle DESTDIR = $$IFW_APP_PATH SOURCES = binarycreator.cpp \ diff --git a/tools/repogen/repogen.pro b/tools/repogen/repogen.pro index e4df1f56b..75564cfa1 100644 --- a/tools/repogen/repogen.pro +++ b/tools/repogen/repogen.pro @@ -9,7 +9,6 @@ QT -= gui QT += script CONFIG += console -CONFIG -= app_bundle DESTDIR = $$IFW_APP_PATH SOURCES += repogen.cpp \ -- cgit v1.2.3