From b9d72a57376e7a41de2320f40363372248ebce21 Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Mon, 19 Feb 2018 12:26:51 +0100 Subject: qmljs: remove remaining references to QtQuick1 This patch removes all references to QtQuick1 in qml library, plugin, designer, profiler and tests. Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3 Reviewed-by: Ulf Hermann --- src/plugins/qmljstools/qmljsbundleprovider.cpp | 10 ---------- src/plugins/qmljstools/qmljsbundleprovider.h | 2 -- 2 files changed, 12 deletions(-) (limited to 'src/plugins/qmljstools') diff --git a/src/plugins/qmljstools/qmljsbundleprovider.cpp b/src/plugins/qmljstools/qmljsbundleprovider.cpp index d73665f9da..b1058176af 100644 --- a/src/plugins/qmljstools/qmljsbundleprovider.cpp +++ b/src/plugins/qmljstools/qmljsbundleprovider.cpp @@ -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")); diff --git a/src/plugins/qmljstools/qmljsbundleprovider.h b/src/plugins/qmljstools/qmljsbundleprovider.h index 8fc2258c69..a0bf3b4c3d 100644 --- a/src/plugins/qmljstools/qmljsbundleprovider.h +++ b/src/plugins/qmljstools/qmljsbundleprovider.h @@ -66,8 +66,6 @@ public: , const QHash &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(); -- cgit v1.2.3