summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-03-01 19:11:48 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-12 20:47:01 +0100
commit32724df8720c38f125d264b5534d6e31b07e53d6 (patch)
tree5f520694622083467761e50423d65f10547944d9
parent6d3733e5d948fad5a3cdb6173abe0506f82d3376 (diff)
downloadqtquickcontrols-32724df8720c38f125d264b5534d6e31b07e53d6.tar.gz
use qml_plugin.prf in parent-less mode
Change-Id: Ifeba27380b874e2ee0f74710e681df3abd93f9a0 Reviewed-by: Liang Qi <liang.qi@digia.com>
-rw-r--r--.qmake.conf2
-rw-r--r--src/controls/controls.pro2
-rw-r--r--src/private/private.pro2
3 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45..f5a422c1 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,3 @@
load(qt_build_config)
+
+MODULE_VERSION = 5.1.0
diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index f0f977de..8f527e1b 100644
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -1,4 +1,3 @@
-CXX_MODULE = qml
TARGET = plugin
TARGETPATH = QtQuick/Controls
@@ -38,4 +37,5 @@ QML_FILES = \
include(plugin.pri)
+CONFIG += no_cxx_module
load(qml_plugin)
diff --git a/src/private/private.pro b/src/private/private.pro
index d36c08e2..29707586 100644
--- a/src/private/private.pro
+++ b/src/private/private.pro
@@ -1,4 +1,3 @@
-CXX_MODULE = qml
TARGET = privateplugin
TARGETPATH = QtQuick/Controls/Private
@@ -39,4 +38,5 @@ mac {
LIBS += -framework Carbon
}
+CONFIG += no_cxx_module
load(qml_plugin)