Permalink
Browse files

Manually define subdirectories so that files are deployed on the corr…

…ect place

There is a bug in the .pro qml templates making all qml and js files shipped in
the same directory, thus failing to run in deployment
(https://launchpad.net/bugs/1488048).
In addition, qmldir files are not shipped as part of the click package.
  • Loading branch information...
1 parent d2db161 commit 11fd9cd1d399539597f186b5e94ef207abfdd986 @didrocks committed Aug 24, 2015
Showing with 20 additions and 24 deletions.
  1. +20 −24 splitthebill/splitthebill.pro
@@ -3,29 +3,23 @@ TARGET = splitthebill
RESOURCES += splitthebill.qrc
-QML_FILES += $$files(*.qml,true) \
- $$files(*.js,true)
+QML_FILES += $$files(*.qml,false) \
+ $$files(*.js,false)
+
+COMPONENTS_FILES += $$files(components/*.qml,false) \
+ $$files(components/*.js,false)
+
+SETTINGS_FILES += $$files(components/settings/*,false)
+
+PAGES_FILES += $$files(pages/*.qml,false) \
+ $$files(pages/*.js,false)
CONF_FILES += splitthebill.apparmor \
splitthebill.desktop \
splitthebill.png
OTHER_FILES += $${CONF_FILES} \
- $${QML_FILES} \
- components/AddRemoveInt.qml \
- components/Bills.qml \
- components/Bill.qml \
- components/Total.qml \
- components/BillListItem.qml \
- tools.js \
- pages/BillsListPage.qml \
- components/PageWithBottomEdge.qml \
- pages/BillEditPage.qml \
- pages/SettingsPage.qml \
- components/ErrorDialog.qml \
- components/DateTimeDialog.qml \
- components/NewListModel.qml \
- components/ContentHubHandler.qml
+ $${QML_FILES}
#specify where the qml/js files are installed to
qml_files.path = /splitthebill
@@ -35,11 +29,13 @@ qml_files.files += $${QML_FILES}
config_files.path = /splitthebill
config_files.files += $${CONF_FILES}
-INSTALLS+=config_files qml_files
+components_files.path = /splitthebill/components
+components_files.files += $${COMPONENTS_FILES}
+
+settings_files.path = /splitthebill/components/settings
+settings_files.files += $${SETTINGS_FILES}
+
+pages_files.path = /splitthebill/pages
+pages_files.files += $${PAGES_FILES}
-DISTFILES += \
- components/queryworker.js \
- components/CurrenciesModel.qml \
- components/CurrenciesCenter.qml \
- components/CurrencyPicker.qml \
- components/settings/AppSettings.qml
+INSTALLS+=config_files qml_files components_files settings_files pages_files

0 comments on commit 11fd9cd

Please sign in to comment.