feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: update qt-creator builtins.qmltypes, and use them for qt<-4.8.5

Browse Source 
qmlplugindump of qt <= 4.8.5 does not output exportMetaObjectRevisions
so do not use its output for the builtins.

Task-number: QTCREATORBUG-9076
Change-Id: I82bdd325ef15f800c70c830ead4867787f6b7b0a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Fawzi Mohamed
2013-04-10 10:03:23 +02:00
parent 359ef53280
commit a019c4c7a1
2 changed files with 2046 additions and 5534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7578
share/qtcreator/qml-type-descriptions/builtins.qmltypes
View File

File diff suppressed because it is too large Load Diff

2
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -473,7 +473,7 @@ void ModelManager::updateProjectInfo(const ProjectInfo &pinfo)
// dump builtin types if the shipped definitions are probably outdated and the // dump builtin types if the shipped definitions are probably outdated and the
// Qt version ships qmlplugindump // Qt version ships qmlplugindump
if (QtSupport::QtVersionNumber(pinfo.qtVersionString) >= QtSupport::QtVersionNumber(4, 8, 0)) if (QtSupport::QtVersionNumber(pinfo.qtVersionString) > QtSupport::QtVersionNumber(4, 8, 5))
m_pluginDumper->loadBuiltinTypes(pinfo); m_pluginDumper->loadBuiltinTypes(pinfo);
emit projectInfoUpdated(pinfo); emit projectInfoUpdated(pinfo);