diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/declarative.pro | 2 | ||||
| -rw-r--r-- | src/declarative/util/util.pri | 2 | ||||
| -rw-r--r-- | src/imports/imports.pro | 4 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index 365cb04e..c5741c2b 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -1,6 +1,6 @@ TARGET = QtDeclarative QT = core-private gui-private widgets-private script-private -!isEmpty(QT.xmlpatterns.name): QT_PRIVATE = xmlpatterns +qtHaveModule(xmlpatterns): QT_PRIVATE = xmlpatterns else: DEFINES += QT_NO_XMLPATTERNS MODULE=declarative diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index 62fa8f16..3978b5eb 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -65,7 +65,7 @@ HEADERS += \ $$PWD/qdeclarativelistmodelworkeragent_p.h \ $$PWD/qlistmodelinterface_p.h -contains(QT_CONFIG, xmlpatterns) { +qtHaveModule(xmlpatterns) { QT+=xmlpatterns SOURCES += $$PWD/qdeclarativexmllistmodel.cpp HEADERS += $$PWD/qdeclarativexmllistmodel_p.h diff --git a/src/imports/imports.pro b/src/imports/imports.pro index aba013aa..2d7f4a55 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs SUBDIRS += folderlistmodel particles gestures builtins.pro -contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders +qtHaveModule(opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders -!isEmpty(QT.webkitwidgets.name): SUBDIRS += webview +qtHaveModule(webkitwidgets): SUBDIRS += webview diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 49039871..7c4b8370 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs SUBDIRS += qmltooling -contains(QT_CONFIG, designer):SUBDIRS += qdeclarativeview +qtHaveModule(designer): SUBDIRS += qdeclarativeview |