From c344032bd5c3eca615e382d0a3b1d6975102096b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 15 Nov 2011 17:30:21 +0100
Subject: centralize setting of "CONFIG += shared dll" for libraries

"dll" and "shared" set each other, but too late to actually test for it
in the project files, so include both.
note that this will slightly modify the build of some of our imported qt
solutions.

Change-Id: I0bd4f41a68fd160f8e87eb0a0fa66096fe70ef3e
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
---
 src/libs/3rdparty/botan/src/src.pro            | 2 --
 src/libs/cplusplus/cplusplus.pro               | 1 -
 src/libs/glsl/glsl.pro                         | 1 -
 src/libs/languageutils/languageutils.pro       | 1 -
 src/libs/qmleditorwidgets/qmleditorwidgets.pro | 1 -
 src/libs/qmljs/qmljs.pro                       | 1 -
 src/libs/qmljsdebugclient/qmljsdebugclient.pro | 1 -
 src/libs/symbianutils/symbianutils.pro         | 1 -
 src/libs/utils/utils.pro                       | 1 -
 src/plugins/debugger/dumper.pro                | 1 -
 src/plugins/debugger/ptracepreload.pro         | 1 -
 src/qtcreatorlibrary.pri                       | 2 ++
 12 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/libs/3rdparty/botan/src/src.pro b/src/libs/3rdparty/botan/src/src.pro
index 15967fbd1e..63646891e0 100644
--- a/src/libs/3rdparty/botan/src/src.pro
+++ b/src/libs/3rdparty/botan/src/src.pro
@@ -1,8 +1,6 @@
 TEMPLATE = lib
 TARGET = Botan
 
-CONFIG += dll
-
 PRECOMPILED_HEADER = ../../precompiled_headers/botan_pch.h
 
 include(../../../../qtcreatorlibrary.pri)
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index 57d009f161..82ee8bfded 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG+=dll
 TARGET = CPlusPlus
 
 DEFINES += NDEBUG
diff --git a/src/libs/glsl/glsl.pro b/src/libs/glsl/glsl.pro
index 3041ec1d65..14dc79d67c 100644
--- a/src/libs/glsl/glsl.pro
+++ b/src/libs/glsl/glsl.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG += dll
 TARGET = GLSL
 DEFINES += GLSL_BUILD_LIB QT_CREATOR
 
diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro
index c1478a8e0d..ecf4888922 100644
--- a/src/libs/languageutils/languageutils.pro
+++ b/src/libs/languageutils/languageutils.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG += dll
 TARGET = LanguageUtils
 DEFINES += QT_CREATOR
 
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pro b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
index ad9e1dfa21..c449baac71 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.pro
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG+=dll
 TARGET = QmlEditorWidgets
 
 DEFINES += QWEAKPOINTER_ENABLE_ARROW
diff --git a/src/libs/qmljs/qmljs.pro b/src/libs/qmljs/qmljs.pro
index 30dfe3d6d9..0c46c7a6d0 100644
--- a/src/libs/qmljs/qmljs.pro
+++ b/src/libs/qmljs/qmljs.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG += dll
 TARGET = QmlJS
 DEFINES += QMLJS_BUILD_DIR QT_CREATOR
 
diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient.pro b/src/libs/qmljsdebugclient/qmljsdebugclient.pro
index 43300f4b39..6e82922235 100644
--- a/src/libs/qmljsdebugclient/qmljsdebugclient.pro
+++ b/src/libs/qmljsdebugclient/qmljsdebugclient.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG += dll
 TARGET = QmlJSDebugClient
 QT += network
 DEFINES += QMLJSDEBUGCLIENT_LIBRARY
diff --git a/src/libs/symbianutils/symbianutils.pro b/src/libs/symbianutils/symbianutils.pro
index 3ae094e9d7..016f98b68d 100644
--- a/src/libs/symbianutils/symbianutils.pro
+++ b/src/libs/symbianutils/symbianutils.pro
@@ -1,5 +1,4 @@
 TEMPLATE = lib
-CONFIG+=dll
 TARGET = symbianutils
 DEFINES += SYMBIANUTILS_BUILD_LIB
 include(../../qtcreatorlibrary.pri)
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index f77c4b0835..4e2ff15b05 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -3,7 +3,6 @@ TARGET = Utils
 QT += gui \
     network
 
-CONFIG += dll
 include(../../qtcreatorlibrary.pri)
 include(utils_dependencies.pri)
 
diff --git a/src/plugins/debugger/dumper.pro b/src/plugins/debugger/dumper.pro
index ee0cad0fd6..43da6f900a 100644
--- a/src/plugins/debugger/dumper.pro
+++ b/src/plugins/debugger/dumper.pro
@@ -4,7 +4,6 @@ include(../../qtcreatorlibrary.pri)
 
 TEMPLATE = lib
 TARGET = DebuggingHelper
-CONFIG += shared
 DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
 
 linux-* {
diff --git a/src/plugins/debugger/ptracepreload.pro b/src/plugins/debugger/ptracepreload.pro
index 1a9e00aa74..4c0b0d9846 100644
--- a/src/plugins/debugger/ptracepreload.pro
+++ b/src/plugins/debugger/ptracepreload.pro
@@ -3,7 +3,6 @@ include(../../qtcreatorlibrary.pri)
 
 TEMPLATE = lib
 TARGET = ptracepreload
-CONFIG += shared
 CONFIG -= qt
 DESTDIR = $$IDE_LIBRARY_PATH
 
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index 335e2ea978..e46e3a2d28 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -13,6 +13,8 @@ include(rpath.pri)
 
 TARGET = $$qtLibraryName($$TARGET)
 
+CONFIG += shared dll
+
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 !macx {
-- 
cgit v1.2.1