qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

automatically add QT_BUILD_FOO_LIB to DEFINES 

Change-Id: I35d9861e48469eb5cc8824e361450684047e6559
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-11 17:28:49 +02:00
parent 0f548b1744
commit c595988a58
14 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/qt_module_config.prf
View File

@ -110,6 +110,11 @@ linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!isEmpty(DESTDIR):CONFIG += create_cmake
contains(TARGET, QtAddOn.*): \
DEFINES += QT_BUILD_ADDON_$${ucmodule}_LIB
else: \
DEFINES += QT_BUILD_$${ucmodule}_LIB
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
contains(QT_CONFIG, largefile):CONFIG += largefile

2
src/concurrent/concurrent.pro
View File

@ -4,7 +4,7 @@ TARGET = QtConcurrent
QT = core-private
CONFIG += exceptions
DEFINES += QT_BUILD_CONCURRENT_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
load(qt_module_config)

2
src/corelib/corelib.pro
View File

@ -7,7 +7,7 @@ CONFIG += exceptions
MODULE = core # not corelib, as per project file
MODULE_CONFIG = moc resources
DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused

3
src/dbus/dbus.pro
View File

@ -5,8 +5,7 @@ QT = core-private
CONFIG += link_pkgconfig
MODULE_CONFIG = dbusadaptors dbusinterfaces
DEFINES += QT_BUILD_DBUS_LIB \
DBUS_API_SUBJECT_TO_CHANGE
DEFINES += DBUS_API_SUBJECT_TO_CHANGE
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
contains(QT_CONFIG, dbus-linked) {
LIBS_PRIVATE += $$QT_LIBS_DBUS

2
src/gui/gui.pro
View File

@ -4,7 +4,7 @@ TARGET = QtGui
QT = core-private
MODULE_CONFIG = opengl
DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
load(qt_module_config)

2
src/network/network.pro
View File

@ -3,7 +3,7 @@ load(qt_module)
TARGET = QtNetwork
QT = core-private
DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
#DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG
#DEFINES += QNETWORKDISKCACHE_DEBUG
#DEFINES += QSSLSOCKET_DEBUG

1
src/opengl/opengl.pro
View File

@ -3,7 +3,6 @@ load(qt_module)
TARGET = QtOpenGL
QT = core-private gui-private widgets-private
DEFINES += QT_BUILD_OPENGL_LIB
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2

2
src/platformsupport/platformsupport.pro
View File

@ -5,8 +5,6 @@ QT = core-private gui-private
CONFIG += staticlib
mac:LIBS += -lz -framework CoreFoundation -framework Carbon
DEFINES += QT_BUILD_PLATFORMSUPPORT_LIB
load(qt_module_config)
DEFINES += QT_NO_CAST_FROM_ASCII

2
src/printsupport/printsupport.pro
View File

@ -3,7 +3,7 @@ load(qt_module)
TARGET = QtPrintSupport
QT = core-private gui-private widgets-private
DEFINES += QT_BUILD_PRINTSUPPORT_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
load(qt_module_config)

1
src/sql/sql.pro
View File

@ -3,7 +3,6 @@ load(qt_module)
TARGET = QtSql
QT = core-private
DEFINES += QT_BUILD_SQL_LIB
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000

2
src/testlib/qtest_global.h
View File

@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
#if !defined(QT_SHARED) && !defined(QT_DLL)
# define Q_TESTLIB_EXPORT
#else
# ifdef QTESTLIB_MAKEDLL
# ifdef QT_BUILD_TESTLIB_LIB
# define Q_TESTLIB_EXPORT Q_DECL_EXPORT
# else
# define Q_TESTLIB_EXPORT Q_DECL_IMPORT

1
src/testlib/testlib.pro
View File

@ -58,7 +58,6 @@ SOURCES = qtestcase.cpp \
qxunittestlogger.cpp
DEFINES *= QT_NO_CAST_TO_ASCII \
QT_NO_CAST_FROM_ASCII \
QTESTLIB_MAKEDLL \
QT_NO_DATASTREAM
embedded:QMAKE_CXXFLAGS += -fno-rtti
wince*::LIBS += libcmt.lib \

2
src/widgets/widgets.pro
View File

@ -4,7 +4,7 @@ TARGET = QtWidgets
QT = core-private gui-private
MODULE_CONFIG = uic
DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused

2
src/xml/xml.pro
View File

@ -3,7 +3,7 @@ load(qt_module)
TARGET = QtXml
QT = core-private
DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
load(qt_module_config)