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

qmljs: remove remaining references to QtQuick1

Browse Source 
This patch removes all references to QtQuick1 in qml library,
plugin, designer, profiler and tests.

Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Marco Benelli
2018-02-19 12:26:51 +01:00
parent 4e4a07ea1d
commit b9d72a5737
17 changed files with 15 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmljstools/qmljsbundleprovider.cpp
View File

@@ -68,16 +68,6 @@ QmlBundle BasicBundleProvider::defaultBundle(const QString &bundleInfoName)
return res;
}
QmlBundle BasicBundleProvider::defaultQt4QtQuick1Bundle()
{
return defaultBundle(QLatin1String("qt4QtQuick1-bundle.json"));
}
QmlBundle BasicBundleProvider::defaultQt5QtQuick1Bundle()
{
return defaultBundle(QLatin1String("qt5QtQuick1-bundle.json"));
}
QmlBundle BasicBundleProvider::defaultQt5QtQuick2Bundle()
{
return defaultBundle(QLatin1String("qt5QtQuick2-bundle.json"));

2
src/plugins/qmljstools/qmljsbundleprovider.h
View File

@@ -66,8 +66,6 @@ public:
, const QHash<QString,QString> &replacements);
static QmlJS::QmlBundle defaultBundle(const QString &bundleInfoName);
static QmlJS::QmlBundle defaultQt4QtQuick1Bundle();
static QmlJS::QmlBundle defaultQt5QtQuick1Bundle();
static QmlJS::QmlBundle defaultQt5QtQuick2Bundle();
static QmlJS::QmlBundle defaultQbsBundle();
static QmlJS::QmlBundle defaultQmltypesBundle();