From 9c0cf384fac57c4c8470459901022429fad1a8a7 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Fri, 1 Apr 2011 05:47:28 -0500 Subject: Add module.prf, and install MODULE_PRI for each module Output warning if not present --- src/declarative/declarative.pro | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/declarative') diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index fdbb07072a..a54284fe6f 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -2,6 +2,10 @@ load(qt_module) TARGET = QtDeclarative QPRO_PWD = $$PWD + +CONFIG += module +MODULE_PRI += ../../modules/qt_declarative.pri + QT = core gui script network contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING -- cgit v1.2.3 From 23131cd3240f71a333e4a6fc58a68b4b830ea2b3 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 6 Apr 2011 15:33:13 +0200 Subject: Define the QT_NO_.... when the module is absant from QT_CONFIG Task-number: QTMODULARIZATION-38 --- src/declarative/util/util.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/declarative') diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 62fa8f1664..5bc8b117c0 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -69,4 +69,6 @@ contains(QT_CONFIG, xmlpatterns) { QT+=xmlpatterns SOURCES += $$PWD/qdeclarativexmllistmodel.cpp HEADERS += $$PWD/qdeclarativexmllistmodel_p.h +} else { + DEFINES += QT_NO_XMLPATTERNS } -- cgit v1.2.3 From 8017c9a69084ec492128b0511bc055fe2702cda7 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 21 Apr 2011 07:55:54 -0500 Subject: Use private headers --- src/declarative/declarative.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative') diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index a54284fe6f..4c2e380540 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -6,7 +6,7 @@ QPRO_PWD = $$PWD CONFIG += module MODULE_PRI += ../../modules/qt_declarative.pri -QT = core gui script network +QT = core-private gui-private script-private network contains(QT_CONFIG, svg): QT += svg DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 -- cgit v1.2.3