diff --git a/mix/ConstantCompilation.cpp b/mix/ConstantCompilation.cpp index 34f5b3967..72e7b2bfe 100644 --- a/mix/ConstantCompilation.cpp +++ b/mix/ConstantCompilation.cpp @@ -41,7 +41,7 @@ ConstantCompilation::ConstantCompilation(QTextDocument* _doc) } QString ConstantCompilation::tabUrl(){ - return QStringLiteral("qrc:/BasicContent.qml"); + return QStringLiteral("qrc:/qml/BasicContent.qml"); } void ConstantCompilation::start() diff --git a/mix/ContextualTabs.qml b/mix/ContextualTabs.qml deleted file mode 100644 index d32e6c3af..000000000 --- a/mix/ContextualTabs.qml +++ /dev/null @@ -1,5 +0,0 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 - - - diff --git a/mix/main.cpp b/mix/main.cpp index 088830c3c..49b6e5195 100644 --- a/mix/main.cpp +++ b/mix/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) ApplicationCtx::SetApplicationContext(engine); QObject::connect(&app, SIGNAL(lastWindowClosed()), ApplicationCtx::GetInstance(), SLOT(QuitApplication())); //use to kill ApplicationContext and other stuff - engine->load(QUrl(QStringLiteral("qrc:/main.qml"))); + engine->load(QUrl(QStringLiteral("qrc:/qml/main.qml"))); return app.exec(); } diff --git a/mix/qml.qrc b/mix/qml.qrc index 65dc7f826..267427ce5 100644 --- a/mix/qml.qrc +++ b/mix/qml.qrc @@ -1,8 +1,8 @@ - main.qml - BasicContent.qml - TabStyle.qml - MainContent.qml + qml/BasicContent.qml + qml/main.qml + qml/MainContent.qml + qml/TabStyle.qml diff --git a/mix/BasicContent.qml b/mix/qml/BasicContent.qml similarity index 100% rename from mix/BasicContent.qml rename to mix/qml/BasicContent.qml diff --git a/mix/MainContent.qml b/mix/qml/MainContent.qml similarity index 100% rename from mix/MainContent.qml rename to mix/qml/MainContent.qml diff --git a/mix/TabStyle.qml b/mix/qml/TabStyle.qml similarity index 100% rename from mix/TabStyle.qml rename to mix/qml/TabStyle.qml diff --git a/mix/main.qml b/mix/qml/main.qml similarity index 100% rename from mix/main.qml rename to mix/qml/main.qml