Issue 1077: allow overriding / extending QT_PLUGIN_PATH

.gitignore

@@ -1,5 +1,6 @@
 CMakeLists.txt.*
 build*/
+cmake-build-*/
 release*/
 .idea/
 *.iml

AppImage-Recipe.sh

@@ -73,7 +73,7 @@ cat << EOF > ./usr/bin/keepassxc_env
 #!/usr/bin/env bash
 #export QT_QPA_PLATFORMTHEME=gtk2
 export LD_LIBRARY_PATH="..$(dirname ${QT_PLUGIN_PATH})/lib:\${LD_LIBRARY_PATH}"
-export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}"
+export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}:\${KPXC_QT_PLUGIN_PATH}"
 
 # unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
 # see https://github.com/probonopd/AppImageKit/issues/351

CMakeLists.txt

@@ -52,8 +52,17 @@ set(KEEPASSXC_VERSION_MINOR "2")
 set(KEEPASSXC_VERSION_PATCH "1")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
-# Special flag for snap builds
-set(KEEPASSXC_SNAP_BUILD OFF CACHE BOOL "Set whether this is a build for snap or not")
+# Distribution info
+set(KEEPASSXC_DIST True)
+set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution type")
+set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other)
+if(KEEPASSXC_DIST_TYPE STREQUAL "Snap")
+  set(KEEPASSXC_DIST_SNAP True)
+elseif(KEEPASSXC_DIST_TYPE STREQUAL "AppImage")
+  set(KEEPASSXC_DIST_APPIMAGE True)
+elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
+  unset(KEEPASSXC_DIST)
+endif()
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)

release-tool

@@ -598,7 +598,8 @@ build() {
             # Building on Linux without Docker container
             logInfo "Configuring build..."
             cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR"
+                -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+                -DKEEPASSXC_DIST_TYPE=AppImage "$SRC_DIR"
 
             logInfo "Compiling sources..."
             make $MAKE_OPTIONS

snapcraft.yaml

@@ -24,7 +24,7 @@ parts:
     configflags:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DKEEPASSXC_SNAP_BUILD=ON
+      - -DKEEPASSXC_DIST_TYPE=Snap
       - -DWITH_TESTS=OFF
       - -DWITH_XC_AUTOTYPE=ON
       - -DWITH_XC_HTTP=ON

src/config-keepassx.h.cmake

@@ -16,7 +16,10 @@
 #cmakedefine WITH_XC_AUTOTYPE
 #cmakedefine WITH_XC_YUBIKEY
 
-#cmakedefine KEEPASSXC_SNAP_BUILD
+#cmakedefine KEEPASSXC_DIST
+#cmakedefine KEEPASSXC_DIST_TYPE "@KEEPASSXC_DIST_TYPE@"
+#cmakedefine KEEPASSXC_DIST_SNAP
+#cmakedefine KEEPASSXC_DIST_APPIMAGE
 
 #cmakedefine HAVE_PR_SET_DUMPABLE 1
 #cmakedefine HAVE_RLIMIT_CORE 1

src/core/FilePath.cpp

@@ -91,7 +91,7 @@ QString FilePath::pluginPath(const QString& name)
 
 QIcon FilePath::applicationIcon()
 {
-#ifdef KEEPASSXC_SNAP_BUILD
+#ifdef KEEPASSXC_DIST_SNAP
     return icon("apps", "keepassxc", false);
 #else
     return icon("apps", "keepassxc");
@@ -100,7 +100,7 @@ QIcon FilePath::applicationIcon()
 
 QIcon FilePath::trayIconLocked()
 {
-#ifdef KEEPASSXC_SNAP_BUILD
+#ifdef KEEPASSXC_DIST_SNAP
     return icon("apps", "keepassxc-locked", false);
 #else
     return icon("apps", "keepassxc-locked");
@@ -109,7 +109,7 @@ QIcon FilePath::trayIconLocked()
 
 QIcon FilePath::trayIconUnlocked()
 {
-#ifdef KEEPASSXC_SNAP_BUILD
+#ifdef KEEPASSXC_DIST_SNAP
     return icon("apps", "keepassxc-unlocked", false);
 #else
     return icon("apps", "keepassxc-unlocked");

src/gui/AboutDialog.cpp

@@ -55,10 +55,14 @@ AboutDialog::AboutDialog(QWidget* parent)
     QString debugInfo = "KeePassXC - ";
     debugInfo.append(tr("Version %1\n").arg(KEEPASSX_VERSION));
     if (!commitHash.isEmpty()) {
-        debugInfo.append(tr("Revision: %1").arg(commitHash).append("\n\n"));
+        debugInfo.append(tr("Revision: %1").arg(commitHash.left(7)).append("\n"));
     }
 
-    debugInfo.append(QString("%1\n- Qt %2\n- %3\n\n")
+#ifdef KEEPASSXC_DIST
+    debugInfo.append(tr("Distribution: %1").arg(KEEPASSXC_DIST_TYPE).append("\n"));
+#endif
+
+    debugInfo.append("\n").append(QString("%1\n- Qt %2\n- %3\n\n")
              .arg(tr("Libraries:"))
              .arg(QString::fromLocal8Bit(qVersion()))
              .arg(Crypto::backendVersion()));