diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-11-23 10:22:51 +0100 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-11-23 12:17:28 +0100 |
| commit | e12d360cdf35c608245974601672631789e91c72 (patch) | |
| tree | 472a41107a49f1a6d42fe922adbce6461e908273 | |
| parent | 6c049b89590d18136a29a97acfe085a2e40642b7 (diff) | |
| download | qt-creator-e12d360cdf35c608245974601672631789e91c72.tar.gz | |
QmlJS: Require Qt >= 4.8.0 to dump builtins.
The qmlplugindump tool is only shipped with Qt since 4.8.0.
Change-Id: I05c77da2bcfc9e1dbf055c45add78543cacce79c
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| -rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index e8b1f99501..87c2ba1b80 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -349,8 +349,9 @@ void ModelManager::updateProjectInfo(const ProjectInfo &pinfo) } updateSourceFiles(newFiles, false); - // dump builtin types if the shipped definitions are probably outdated - if (QtSupport::QtVersionNumber(pinfo.qtVersionString) > QtSupport::QtVersionNumber(4, 7, 3)) + // dump builtin types if the shipped definitions are probably outdated and the + // Qt version ships qmlplugindump + if (QtSupport::QtVersionNumber(pinfo.qtVersionString) >= QtSupport::QtVersionNumber(4, 8, 0)) m_pluginDumper->loadBuiltinTypes(pinfo); emit projectInfoUpdated(pinfo); |