diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-04-29 10:50:49 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-04-29 09:45:27 +0000 |
| commit | a1c67da0a2188a4bf7ccc816a8f762da959ef44a (patch) | |
| tree | 0a4f2d930a61be0f17c5c72cb1b29d94b83b3aa0 /src | |
| parent | e1b7de34798e4adca04911d380e6d41975c4e8da (diff) | |
Tools: Use "QTC_" prefix for build-system environment variables
Change-Id: I4b75dce6a2c7bd794b8c330521292c86057e63ef
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/plugins.pro | 6 | ||||
| -rw-r--r-- | src/tools/tools.pro | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index dab57ff855..102e8eda76 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -86,8 +86,8 @@ qtHaveModule(designercomponents_private) { warning("Qt Widget Designer plugin has been disabled since the Qt Designer module is not available.") } -DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER) -isEmpty(DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) { +QTC_DO_NOT_BUILD_QMLDESIGNER = $$(QTC_DO_NOT_BUILD_QMLDESIGNER) +isEmpty(QTC_DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) { exists($$[QT_INSTALL_QML]/QtQuick/Controls/qmldir) { SUBDIRS += qmldesigner } else { @@ -97,7 +97,7 @@ isEmpty(DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) { !qtHaveModule(quick-private) { warning("QmlDesigner plugin has been disabled since the Qt Quick module is not available.") } else { - warning("QmlDesigner plugin has been disabled since DO_NOT_BUILD_QMLDESIGNER is set.") + warning("QmlDesigner plugin has been disabled since QTC_DO_NOT_BUILD_QMLDESIGNER is set.") } } diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 7b67fec3f2..688ff570af 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -11,8 +11,8 @@ SUBDIRS = qtpromaker \ isEmpty(QTC_SKIP_SDKTOOL): SUBDIRS += sdktool -DO_NOT_BUILD_QMLDESIGNER = $$(DO_NOT_BUILD_QMLDESIGNER) -isEmpty(DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private): SUBDIRS += qml2puppet +QTC_DO_NOT_BUILD_QMLDESIGNER = $$(QTC_DO_NOT_BUILD_QMLDESIGNER) +isEmpty(QTC_DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private): SUBDIRS += qml2puppet win32 { SUBDIRS += qtcdebugger \ |