Restructure qmake project

a268b0d3 · akiraohgaki · b8fd5565 · a268b0d3 · a268b0d3 · a268b0d3
Commit a268b0d3 authored 8 years ago by akiraohgaki
--- a/src/app/app.pri
+++ b/src/app/app.pri
@@ -6,16 +6,16 @@ QT += \
    svg

 HEADERS += \
-    $${PWD}/handlers/confighandler.h \
-    $${PWD}/handlers/ocsurlhandler.h
+    $${PWD}/src/handlers/confighandler.h \
+    $${PWD}/src/handlers/ocsurlhandler.h

 SOURCES += \
-    $${PWD}/main.cpp \
-    $${PWD}/handlers/confighandler.cpp \
-    $${PWD}/handlers/ocsurlhandler.cpp
+    $${PWD}/src/main.cpp \
+    $${PWD}/src/handlers/confighandler.cpp \
+    $${PWD}/src/handlers/ocsurlhandler.cpp

 RESOURCES += \
    $${PWD}/configs/configs.qrc \
    $${PWD}/qml/qml.qrc

-INCLUDEPATH += $${PWD}
+INCLUDEPATH += $${PWD}/src
--- a/src/app/configs/application.json
+++ b/src/app/configs/application.json
--- a/src/app/configs/configs.qrc
+++ b/src/app/configs/configs.qrc
--- a/src/app/configs/install_types.json
+++ b/src/app/configs/install_types.json
--- a/src/app/configs/install_types_alias.json
+++ b/src/app/configs/install_types_alias.json
--- a/src/app/qml/main.qml
+++ b/src/app/qml/main.qml
--- a/src/app/qml/qml.qrc
+++ b/src/app/qml/qml.qrc
--- a/src/app/qml/scripts/Utility.js
+++ b/src/app/qml/scripts/Utility.js
--- a/src/app/handlers/confighandler.cpp
+++ b/src/app/handlers/confighandler.cpp
--- a/src/app/handlers/confighandler.h
+++ b/src/app/handlers/confighandler.h
--- a/src/app/handlers/ocsurlhandler.cpp
+++ b/src/app/handlers/ocsurlhandler.cpp
--- a/src/app/handlers/ocsurlhandler.h
+++ b/src/app/handlers/ocsurlhandler.h
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
--- a/deployment.pri
+++ b/deployment.pri
@@ -3,7 +3,7 @@ unix:!ios:!android {
        PREFIX = /usr/local
    }

-    SRCDIR = $${PWD}/src
+    SRCDIR = $${PWD}
    BINDIR = $${PREFIX}/bin
    DATADIR = $${PREFIX}/share


--- a/desktop/desktop.pri
+++ b/desktop/desktop.pri
+RESOURCES += $${PWD}/desktop.qrc
+
+DISTFILES += $${PWD}/ocs-url.desktop
--- a/src/desktop/desktop.qrc
+++ b/src/desktop/desktop.qrc
--- a/src/desktop/ocs-url.desktop
+++ b/src/desktop/ocs-url.desktop
--- a/src/desktop/ocs-url.svg
+++ b/src/desktop/ocs-url.svg
--- a/i18n/i18n.pri
+++ b/i18n/i18n.pri
+RESOURCES += $${PWD}/i18n.qrc
--- a/src/i18n/i18n.pro
+++ b/src/i18n/i18n.pro
@@ -4,4 +4,4 @@ TRANSLATIONS += \
    messages.ts \
    messages.en_US.ts

-RESOURCES += i18n.qrc
+include(i18n.pri)