Add module.prf, and install MODULE_PRI for each module
Output warning if not present
This commit is contained in:
parent
738d5c7c85
commit
6319779bed
7
mkspecs/features/module.prf
Normal file
7
mkspecs/features/module.prf
Normal file
@ -0,0 +1,7 @@
|
||||
!isEmpty(MODULE_PRI) {
|
||||
pritarget.path = $$[QT_INSTALL_DATA]/mkspecs/modules
|
||||
pritarget.files = $$MODULE_PRI
|
||||
INSTALLS = pritarget
|
||||
} else {
|
||||
warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects")
|
||||
}
|
@ -1,7 +1,11 @@
|
||||
MODULE = core
|
||||
TARGET = QtCore
|
||||
QPRO_PWD = $$PWD
|
||||
QT =
|
||||
|
||||
CONFIG += module
|
||||
MODULE = core # not corelib, as per project file
|
||||
MODULE_PRI = ../modules/qt_core.pri
|
||||
|
||||
DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE
|
||||
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
|
||||
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
|
||||
|
@ -2,7 +2,10 @@ TARGET = QtDBus
|
||||
QPRO_PWD = $$PWD
|
||||
QT = core \
|
||||
xml
|
||||
CONFIG += link_pkgconfig
|
||||
|
||||
CONFIG += link_pkgconfig module
|
||||
MODULE_PRI = ../modules/qt_dbus.pri
|
||||
|
||||
DEFINES += QT_BUILD_DBUS_LIB \
|
||||
DBUS_API_SUBJECT_TO_CHANGE
|
||||
QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
|
||||
|
@ -1,6 +1,10 @@
|
||||
TARGET = QtGui
|
||||
QPRO_PWD = $$PWD
|
||||
QT = core
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_gui.pri
|
||||
|
||||
DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
|
||||
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
|
||||
irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
|
||||
|
@ -1,7 +1,10 @@
|
||||
# Qt network module
|
||||
|
||||
TARGET = QtNetwork
|
||||
QPRO_PWD = $$PWD
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_network.pri
|
||||
|
||||
DEFINES += QT_BUILD_NETWORK_LIB QT_NO_USING_NAMESPACE
|
||||
#DEFINES += QLOCALSERVER_DEBUG QLOCALSOCKET_DEBUG
|
||||
#DEFINES += QNETWORKDISKCACHE_DEBUG
|
||||
|
@ -1,6 +1,10 @@
|
||||
TARGET = QtOpenGL
|
||||
QPRO_PWD = $$PWD
|
||||
QT = core gui
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_opengl.pri
|
||||
|
||||
DEFINES += QT_BUILD_OPENGL_LIB
|
||||
DEFINES += QT_NO_USING_NAMESPACE
|
||||
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
|
||||
|
@ -2,6 +2,9 @@ TARGET = QtOpenVG
|
||||
QT += core \
|
||||
gui
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_openvg.pri
|
||||
|
||||
DEFINES+=QT_BUILD_OPENVG_LIB
|
||||
|
||||
contains(QT_CONFIG, shivavg) {
|
||||
|
@ -1,6 +1,10 @@
|
||||
TARGET = QtSql
|
||||
QPRO_PWD = $$PWD
|
||||
QT = core
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_sql.pri
|
||||
|
||||
DEFINES += QT_BUILD_SQL_LIB
|
||||
DEFINES += QT_NO_USING_NAMESPACE
|
||||
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x62000000
|
||||
|
@ -1,6 +1,10 @@
|
||||
TARGET = QtTest
|
||||
QPRO_PWD = $$PWD
|
||||
QT = core
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_testlib.pri
|
||||
|
||||
INCLUDEPATH += .
|
||||
unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \
|
||||
Unit \
|
||||
|
@ -1,9 +1,12 @@
|
||||
MODULE = uitools
|
||||
QPRO_PWD = $$PWD
|
||||
TEMPLATE = lib
|
||||
TARGET = $$qtLibraryTarget(QtUiTools)
|
||||
QT = core xml
|
||||
CONFIG += qt staticlib
|
||||
|
||||
CONFIG += qt staticlib # Not adding module here, since the module pri's are only used for building
|
||||
MODULE_PRI = ../modules/qt_uitools.pri \
|
||||
../modules/qt_uilib.pri
|
||||
|
||||
DESTDIR = $$QMAKE_LIBDIR_QT
|
||||
|
||||
symbian {
|
||||
|
@ -1,6 +1,10 @@
|
||||
TARGET = QtXml
|
||||
QPRO_PWD = $$PWD
|
||||
QT = core
|
||||
|
||||
CONFIG += module
|
||||
MODULE_PRI = ../modules/qt_xml.pri
|
||||
|
||||
DEFINES += QT_BUILD_XML_LIB QT_NO_USING_NAMESPACE
|
||||
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user