forked from qt-creator/qt-creator
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>
This commit is contained in:
2
src/libs/3rdparty/botan/src/src.pro
vendored
2
src/libs/3rdparty/botan/src/src.pro
vendored
@@ -1,8 +1,6 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
TARGET = Botan
|
TARGET = Botan
|
||||||
|
|
||||||
CONFIG += dll
|
|
||||||
|
|
||||||
PRECOMPILED_HEADER = ../../precompiled_headers/botan_pch.h
|
PRECOMPILED_HEADER = ../../precompiled_headers/botan_pch.h
|
||||||
|
|
||||||
include(../../../../qtcreatorlibrary.pri)
|
include(../../../../qtcreatorlibrary.pri)
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG+=dll
|
|
||||||
TARGET = CPlusPlus
|
TARGET = CPlusPlus
|
||||||
|
|
||||||
DEFINES += NDEBUG
|
DEFINES += NDEBUG
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG += dll
|
|
||||||
TARGET = GLSL
|
TARGET = GLSL
|
||||||
DEFINES += GLSL_BUILD_LIB QT_CREATOR
|
DEFINES += GLSL_BUILD_LIB QT_CREATOR
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG += dll
|
|
||||||
TARGET = LanguageUtils
|
TARGET = LanguageUtils
|
||||||
DEFINES += QT_CREATOR
|
DEFINES += QT_CREATOR
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG+=dll
|
|
||||||
TARGET = QmlEditorWidgets
|
TARGET = QmlEditorWidgets
|
||||||
|
|
||||||
DEFINES += QWEAKPOINTER_ENABLE_ARROW
|
DEFINES += QWEAKPOINTER_ENABLE_ARROW
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG += dll
|
|
||||||
TARGET = QmlJS
|
TARGET = QmlJS
|
||||||
DEFINES += QMLJS_BUILD_DIR QT_CREATOR
|
DEFINES += QMLJS_BUILD_DIR QT_CREATOR
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG += dll
|
|
||||||
TARGET = QmlJSDebugClient
|
TARGET = QmlJSDebugClient
|
||||||
QT += network
|
QT += network
|
||||||
DEFINES += QMLJSDEBUGCLIENT_LIBRARY
|
DEFINES += QMLJSDEBUGCLIENT_LIBRARY
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CONFIG+=dll
|
|
||||||
TARGET = symbianutils
|
TARGET = symbianutils
|
||||||
DEFINES += SYMBIANUTILS_BUILD_LIB
|
DEFINES += SYMBIANUTILS_BUILD_LIB
|
||||||
include(../../qtcreatorlibrary.pri)
|
include(../../qtcreatorlibrary.pri)
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ TARGET = Utils
|
|||||||
QT += gui \
|
QT += gui \
|
||||||
network
|
network
|
||||||
|
|
||||||
CONFIG += dll
|
|
||||||
include(../../qtcreatorlibrary.pri)
|
include(../../qtcreatorlibrary.pri)
|
||||||
include(utils_dependencies.pri)
|
include(utils_dependencies.pri)
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ include(../../qtcreatorlibrary.pri)
|
|||||||
|
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
TARGET = DebuggingHelper
|
TARGET = DebuggingHelper
|
||||||
CONFIG += shared
|
|
||||||
DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
|
DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
|
||||||
|
|
||||||
linux-* {
|
linux-* {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ include(../../qtcreatorlibrary.pri)
|
|||||||
|
|
||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
TARGET = ptracepreload
|
TARGET = ptracepreload
|
||||||
CONFIG += shared
|
|
||||||
CONFIG -= qt
|
CONFIG -= qt
|
||||||
DESTDIR = $$IDE_LIBRARY_PATH
|
DESTDIR = $$IDE_LIBRARY_PATH
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ include(rpath.pri)
|
|||||||
|
|
||||||
TARGET = $$qtLibraryName($$TARGET)
|
TARGET = $$qtLibraryName($$TARGET)
|
||||||
|
|
||||||
|
CONFIG += shared dll
|
||||||
|
|
||||||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||||
|
|
||||||
!macx {
|
!macx {
|
||||||
|
|||||||
Reference in New Issue
Block a user