Qt module project structure

.qmake.conf

@@ -0,0 +1,5 @@
+load(qt_build_config)
+
+CONFIG += warning_clean exceptions
+
+MODULE_VERSION = 0.5.0

BUILDING.md

@@ -12,10 +12,16 @@ git clone https://github.com/probonopd/linuxdeployqt.git
 # Then build in Qt Creator, or use
 export PATH=$(readlink -f /tmp/.mount_QtCreator-*-x86_64/*/gcc_64/bin/):$PATH
 cd linuxdeployqt
-qmake linuxdeployqt.pro
+qmake
 make
 ```
 
+* Optional if you want to install `linuxdeployqt` into your Qt installation, and make it a part of your Qt just like any other tool (qmake, etc.)
+
+```
+sudo make install
+```
+
 * Build and install [patchelf](https://nixos.org/patchelf.html) (a small utility to modify the dynamic linker and RPATH of ELF executables; similar to `install_name_tool` on macOS). To learn more about this, see http://blog.qt.io/blog/2011/10/28/rpath-and-runpath/
 
 ```

linuxdeployqt.pro

@@ -1,2 +1 @@
-TEMPLATE = subdirs
-SUBDIRS = linuxdeployqt
+load(qt_parts)

src/src.pro

@@ -0,0 +1 @@
+TEMPLATE = aux

sync.profile

@@ -0,0 +1,5 @@
+%modules = (
+);
+
+%moduleheaders = (
+);

tests/tests-ci.sh

@@ -10,8 +10,8 @@ mkdir -p linuxdeployqt.AppDir/usr/bin/
 cp /usr/bin/patchelf /usr/local/bin/{appimagetool,mksquashfs,zsyncmake} linuxdeployqt.AppDir/usr/bin/
 find linuxdeployqt.AppDir/
 export VERSION=continuous
-cp ./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/usr/bin/
-./linuxdeployqt/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt.desktop -verbose=3 -appimage
+cp ./bin/linuxdeployqt linuxdeployqt.AppDir/usr/bin/
+./bin/linuxdeployqt linuxdeployqt.AppDir/linuxdeployqt.desktop -verbose=3 -appimage
 ls -lh
 find *.AppDir
 xpra start :99

tests/tests.pro

@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+	QtQuickControls2Application \
+	QtWebEngineApplication \
+	QtWidgetsApplication
+
+DISTFILES += \
+	tests-ci.sh \
+	tests-environment.sh \
+	tests.sh

tools/linuxdeployqt/linuxdeployqt.pro

@@ -0,0 +1,17 @@
+option(host_build)
+
+QT = core
+CONFIG += console
+
+TARGET = linuxdeployqt
+VERSION = $$MODULE_VERSION
+
+DEFINES += BUILD_LINUXDEPLOYQT
+
+load(qt_tool)
+
+HEADERS += shared.h
+SOURCES += main.cpp \
+	shared.cpp
+
+DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled

linuxdeployqt/main.cpp → tools/linuxdeployqt/main.cpp

@@ -28,7 +28,7 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QProcessEnvironment>
-#include "../shared/shared.h"
+#include "shared.h"
 #include <QRegularExpression>
 #include <stdlib.h>
 #include <QSettings>
@@ -146,7 +146,7 @@ int main(int argc, char **argv)
     // Allow binaries next to linuxdeployqt to be found; this is useful for bundling
     // this application itself together with helper binaries such as patchelf
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    QString oldPath = env.value("PATH");    
+    QString oldPath = env.value("PATH");
     QString newPath = QCoreApplication::applicationDirPath() + ":" + oldPath;
     LogDebug() << newPath;
     setenv("PATH",newPath.toUtf8().constData(),1);
@@ -306,7 +306,7 @@ int main(int argc, char **argv)
                 qDebug() << "preExistingToplevelIcon:" << preExistingToplevelIcon;
             } else {
                 qDebug() << "iconToBeUsed:" << iconToBeUsed;
-                QString targetIconPath = appDirPath + "/" + QFileInfo(iconToBeUsed).fileName(); 
+                QString targetIconPath = appDirPath + "/" + QFileInfo(iconToBeUsed).fileName();
                 if (QFile::copy(iconToBeUsed, targetIconPath)){
                     qDebug() << "Copied" << iconToBeUsed << "to" << targetIconPath;
                     QFile::copy(targetIconPath, appDirPath + "/.DirIcon");

tools/tools.pro

@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS += linuxdeployqt