diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:43:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-30 11:43:33 +0200 |
| commit | bedc477943ba94c38db133b8cf6d20132d56a315 (patch) | |
| tree | ae64d44a5d12f66e07a0c2d963d885bcf0ceb5db /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 3aa0e500392192dc6306a29d4a60b4d362a29811 (diff) | |
| parent | 71f1919de9a1ce0abc370fb2a1044ad6e85438cf (diff) | |
| download | qt-creator-bedc477943ba94c38db133b8cf6d20132d56a315.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 4f7c9d5b28..093123caa8 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1067,6 +1067,13 @@ bool BaseQtVersion::hasQmlDump() const return m_hasQmlDump; } +bool BaseQtVersion::hasQmlDumpWithRelocatableFlag() const +{ + updateVersionInfo(); + return ((qtVersion() > QtVersionNumber(4, 8, 4) && qtVersion() < QtVersionNumber(5, 0, 0)) + || qtVersion() >= QtVersionNumber(5, 1, 0)); +} + bool BaseQtVersion::needsQmlDump() const { updateVersionInfo(); |