Commit a1ddd8aa authored by Aleix Pol Gonzalez's avatar Aleix Pol Gonzalez 🐧

Make sure we never use the local plugin instead

Discover qml plugin is included in the application now
parent 5cbcb4ca
......@@ -52,21 +52,21 @@ void DiscoverDeclarativePlugin::initializeEngine(QQmlEngine* engine, const char*
void DiscoverDeclarativePlugin::registerTypes(const char* /*uri*/)
{
qmlRegisterType<TransactionListener>("org.kde.discover", 1, 0, "TransactionListener");
qmlRegisterType<TransactionListener>("org.kde.discover", 2, 0, "TransactionListener");
qmlRegisterType<TransactionModel>();
qmlRegisterType<ResourcesUpdatesModel>("org.kde.discover", 1, 0, "ResourcesUpdatesModel");
qmlRegisterType<ResourcesProxyModel>("org.kde.discover", 1, 0, "ResourcesProxyModel");
qmlRegisterType<ResourcesUpdatesModel>("org.kde.discover", 2, 0, "ResourcesUpdatesModel");
qmlRegisterType<ResourcesProxyModel>("org.kde.discover", 2, 0, "ResourcesProxyModel");
qmlRegisterType<ReviewsModel>("org.kde.discover", 1, 0, "ReviewsModel");
qmlRegisterType<ApplicationAddonsModel>("org.kde.discover", 1, 0, "ApplicationAddonsModel");
qmlRegisterType<ScreenshotsModel>("org.kde.discover", 1, 0, "ScreenshotsModel");
qmlRegisterType<MessageActionsModel>("org.kde.discover", 1, 0, "MessageActionsModel");
qmlRegisterType<UpdateModel>("org.kde.discover", 1, 0, "UpdateModel");
qmlRegisterType<ReviewsModel>("org.kde.discover", 2, 0, "ReviewsModel");
qmlRegisterType<ApplicationAddonsModel>("org.kde.discover", 2, 0, "ApplicationAddonsModel");
qmlRegisterType<ScreenshotsModel>("org.kde.discover", 2, 0, "ScreenshotsModel");
qmlRegisterType<MessageActionsModel>("org.kde.discover", 2, 0, "MessageActionsModel");
qmlRegisterType<UpdateModel>("org.kde.discover", 2, 0, "UpdateModel");
qmlRegisterUncreatableType<QAction>("org.kde.discover", 1, 0, "QAction", QStringLiteral("Use QQC Action"));
qmlRegisterUncreatableType<AbstractResource>("org.kde.discover", 1, 0, "AbstractResource", QStringLiteral("should come from the ResourcesModel"));
qmlRegisterUncreatableType<AbstractSourcesBackend>("org.kde.discover", 1, 0, "AbstractSourcesBackend", QStringLiteral("should come from the SourcesModel"));
qmlRegisterUncreatableType<Transaction>("org.kde.discover", 1, 0, "Transaction", QStringLiteral("should come from the backends"));
qmlRegisterUncreatableType<QAction>("org.kde.discover", 2, 0, "QAction", QStringLiteral("Use QQC Action"));
qmlRegisterUncreatableType<AbstractResource>("org.kde.discover", 2, 0, "AbstractResource", QStringLiteral("should come from the ResourcesModel"));
qmlRegisterUncreatableType<AbstractSourcesBackend>("org.kde.discover", 2, 0, "AbstractSourcesBackend", QStringLiteral("should come from the SourcesModel"));
qmlRegisterUncreatableType<Transaction>("org.kde.discover", 2, 0, "Transaction", QStringLiteral("should come from the backends"));
qmlRegisterType<Rating>();
qmlRegisterType<AbstractResourcesBackend>();
qmlRegisterType<AbstractReviewsBackend>();
......
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.kquickcontrolsaddons 2.0
import "navigation.js" as Navigation
import org.kde.kirigami 2.0 as Kirigami
......
......@@ -22,7 +22,7 @@ import QtQuick.Controls 1.1
import QtQuick.Window 2.1
import QtQuick.Layouts 1.1
import org.kde.kquickcontrolsaddons 2.0
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kirigami 2.0 as Kirigami
import "navigation.js" as Navigation
......
......@@ -21,7 +21,7 @@
import QtQuick 2.1
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.kirigami 2.0 as Kirigami
Flow {
......
......@@ -23,7 +23,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Window 2.2
import "navigation.js" as Navigation
import org.kde.discover.app 1.0
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.kirigami 2.0 as Kirigami
DiscoverPage {
......
......@@ -20,9 +20,9 @@
import QtQuick 2.4
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.kquickcontrolsaddons 2.0
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import "navigation.js" as Navigation
import org.kde.kirigami 2.1 as Kirigami
......
......@@ -20,7 +20,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kquickcontrolsaddons 2.0
import "navigation.js" as Navigation
......
......@@ -21,7 +21,7 @@
import QtQuick 2.5
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kirigami 2.0 as Kirigami
import "navigation.js" as Navigation
......
import QtQuick 2.1
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kirigami 2.0 as Kirigami
import "navigation.js" as Navigation
......
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.kirigami 2.0 as Kirigami
ConditionalLoader
......
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kirigami 2.0 as Kirigami
......
......@@ -2,7 +2,7 @@ import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.kquickcontrolsaddons 2.0
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.kirigami 2.0 as Kirigami
import "navigation.js" as Navigation
......
......@@ -20,7 +20,7 @@
import QtQuick 2.1
import QtQuick.Layouts 1.1
import org.kde.kirigami 2.0
import org.kde.discover 1.0
import org.kde.discover 2.0
ColumnLayout
{
......
......@@ -20,7 +20,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kirigami 2.0 as Kirigami
......
import QtQuick 2.4
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kquickcontrolsaddons 2.0
import org.kde.kirigami 2.0 as Kirigami
......
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import QtQuick 2.4
import org.kde.discover 1.0
import org.kde.discover 2.0
import org.kde.discover.app 1.0
import org.kde.kquickcontrolsaddons 2.0
import org.kde.kcoreaddons 1.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment