aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@theqtcompany.com>2016-04-06 14:25:13 +0200
committerThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2016-04-06 15:18:11 +0000
commit217fef2b1b09419c666c49d567eac47e426aaa3b (patch)
tree6ca519adccf2929772b2a60485f8113bcf9f78e1 /share
parent6ffbb88b7bd4d957004d34faea4c152a996f96d7 (diff)
QmlDesigner: fix binding is not working
Change-Id: Ic40eca09f281626428157dd94ed802c846b2f7e9 Task-number: QTCREATORBUG-15942 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri24
1 files changed, 24 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri
index 357c85c920..a72b032488 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.pri
@@ -1,5 +1,29 @@
INCLUDEPATH += $$PWD/
+# in case we are building the puppet inside qtcreator we don't have the qtcreator.pri where this function comes from
+defineTest(minQtVersion) {
+ maj = $$1
+ min = $$2
+ patch = $$3
+ isEqual(QT_MAJOR_VERSION, $$maj) {
+ isEqual(QT_MINOR_VERSION, $$min) {
+ isEqual(QT_PATCH_VERSION, $$patch) {
+ return(true)
+ }
+ greaterThan(QT_PATCH_VERSION, $$patch) {
+ return(true)
+ }
+ }
+ greaterThan(QT_MINOR_VERSION, $$min) {
+ return(true)
+ }
+ }
+ greaterThan(QT_MAJOR_VERSION, $$maj) {
+ return(true)
+ }
+ return(false)
+}
+
minQtVersion(5, 6, 0) {
HEADERS += \
$$PWD/qmlprivategate.h