diff --git a/.gitignore b/.gitignore index 284f151..ef347a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ # build artifacts -Makefile -.qmake.stash -*_qml.cpp -lokicp +build/ tags diff --git a/README.md b/README.md index 570ef7d..a49cf34 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,9 @@ sudo apt install qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml- Then build and run: ```bash -qmake . +mkdir build +cd build +qmake ../lokicp.pro "CONFIG+=debug" make ./lokicp ``` diff --git a/lokicp.pro b/lokicp.pro index 3e8bdfb..2876823 100644 --- a/lokicp.pro +++ b/lokicp.pro @@ -2,7 +2,7 @@ TEMPLATE = app QT += qml quick widgets -SOURCES += main.cpp +SOURCES += src/main.cpp -RESOURCES += resources.qrc +RESOURCES += res/resources.qrc diff --git a/TestPanel.qml b/res/qml/TestPanel.qml similarity index 100% rename from TestPanel.qml rename to res/qml/TestPanel.qml diff --git a/main.qml b/res/qml/main.qml similarity index 100% rename from main.qml rename to res/qml/main.qml diff --git a/res/resources.qrc b/res/resources.qrc new file mode 100644 index 0000000..6086a61 --- /dev/null +++ b/res/resources.qrc @@ -0,0 +1,9 @@ + + + qml/main.qml + qml/TestPanel.qml + + + images/icon.png + + diff --git a/resources.qrc b/resources.qrc deleted file mode 100644 index 852de10..0000000 --- a/resources.qrc +++ /dev/null @@ -1,9 +0,0 @@ - - - main.qml - TestPanel.qml - - - res/images/icon.png - - diff --git a/main.cpp b/src/main.cpp similarity index 78% rename from main.cpp rename to src/main.cpp index cc31de9..026c77d 100644 --- a/main.cpp +++ b/src/main.cpp @@ -8,7 +8,7 @@ int32_t main(int32_t argc, char *argv[]) QApplication app(argc, argv); QQmlApplicationEngine engine; - engine.load(QUrl(QStringLiteral("qrc:/main.qml"))); + engine.load(QUrl(QStringLiteral("qrc:/res/qml/main.qml"))); return app.exec(); }