Merge branch 'dev'

matrique.appdata.xml

@@ -15,23 +15,23 @@
   </description>
   <launchable type="desktop-id">org.eu.encom.matrique</launchable>
   <screenshots>
-​    <screenshot type="default">
-​      <caption>Overview</caption>
-​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/1.png</image>
-​    </screenshot>
-​    <screenshot>
-​      <caption>Room Config</caption>
-​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/2.png</image>
-​    </screenshot>
-​    <screenshot>
-​      <caption>Create Room</caption>
-​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/3.png</image>
-​    </screenshot>
-​    <screenshot>
-​      <caption>Settings Panel</caption>
-​      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/4.png</image>
-​    </screenshot>
-​  </screenshots>
+    <screenshot type="default">
+      <caption>Overview</caption>
+      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/1.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>Room Config</caption>
+      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/2.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>Create Room</caption>
+      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/3.png</image>
+    </screenshot>
+    <screenshot>
+      <caption>Settings Panel</caption>
+      <image>https://raw.githubusercontent.com/encombhat/flathub/org.eu.encom.matrique/screenshots/4.png</image>
+    </screenshot>
+  </screenshots>
   <url type="homepage">https://gitlab.com/b0/matrique</url>
   <content_rating type="oars-1.0">
     <content_attribute id="social-chat">intense</content_attribute>

matrique.pro

@@ -1,6 +1,9 @@
 QT += quick widgets
 CONFIG += c++14
 CONFIG += object_parallel_to_source
+CONFIG += qtquickcompiler
+
+TARGET = matrique
 
 include(include/libqmatrixclient/libqmatrixclient.pri)
 include(include/SortFilterProxyModel/SortFilterProxyModel.pri)
@@ -34,8 +37,12 @@ QML_IMPORT_PATH =
 QML_DESIGNER_IMPORT_PATH =
 
 # Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
+unix:!mac:isEmpty(PREFIX) {
+    message("Install PREFIX not set; using /usr/local. You can change this with 'qmake PREFIX=...'")
+    PREFIX = /usr/local
+}
+unix:target.path = $$PREFIX/bin
+win32:target.path = $$PREFIX
 !isEmpty(target.path): INSTALLS += target
 
 DISTFILES += \
@@ -66,7 +73,7 @@ unix:!mac {
     metainfo.path = $$PREFIX/share/metainfo
     desktop.files = $$PWD/matrique.desktop
     desktop.path = $$PREFIX/share/applications
-    icons.files = $$PWD/icons/64x64.png
+    icons.files = $$PWD/icons/matrique.png
     icons.path = $$PREFIX/share/icons/hicolor/64x64/apps
     INSTALLS += metainfo desktop mime icons
 }