Merge pull request #85 from mnesarco/master

TheAssassin · web-flow · commit 5ade129a3131 · 2020-12-29T02:36:08.000+01:00
Added Qt6 support
diff --git a/src/deployers/PluginsDeployerFactory.cpp b/src/deployers/PluginsDeployerFactory.cpp
@@ -24,12 +24,14 @@ PluginsDeployerFactory::PluginsDeployerFactory(AppDir& appDir,
                                                bf::path qtLibexecsPath,
                                                bf::path qtInstallQmlPath,
                                                bf::path qtTranslationsPath,
-                                               bf::path qtDataPath) : appDir(appDir),
+                                               bf::path qtDataPath,
+                                               int qtMajorVersion) : appDir(appDir),
                                                                       qtPluginsPath(std::move(qtPluginsPath)),
                                                                       qtLibexecsPath(std::move(qtLibexecsPath)),
                                                                       qtInstallQmlPath(std::move(qtInstallQmlPath)),
                                                                       qtTranslationsPath(std::move(qtTranslationsPath)),
-                                                                      qtDataPath(std::move(qtDataPath)) {}
+                                                                      qtDataPath(std::move(qtDataPath)),
+                                                                      qtMajorVersion(qtMajorVersion) {}
 
 std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeployers(const std::string& moduleName) {
     if (moduleName == "gui") {
@@ -40,7 +42,7 @@ std::vector<std::shared_ptr<PluginsDeployer>> PluginsDeployerFactory::getDeploye
         return {getInstance<XcbglIntegrationPluginsDeployer>(moduleName)};
     }
 
-    if (moduleName == "network") {
+    if (moduleName == "network" && qtMajorVersion < 6) {
         return {getInstance<BearerPluginsDeployer>(moduleName)};
     }
 
diff --git a/src/deployers/PluginsDeployerFactory.h b/src/deployers/PluginsDeployerFactory.h
@@ -23,6 +23,7 @@ namespace linuxdeploy {
                 const boost::filesystem::path qtInstallQmlPath;
                 const boost::filesystem::path qtTranslationsPath;
                 const boost::filesystem::path qtDataPath;
+                const int qtMajorVersion;
 
                 template<typename T>
                 std::shared_ptr<PluginsDeployer> getInstance(const std::string& moduleName) {
@@ -45,7 +46,8 @@ namespace linuxdeploy {
                                                 boost::filesystem::path qtLibexecsPath,
                                                 boost::filesystem::path qtInstallQmlPath,
                                                 boost::filesystem::path qtTranslationsPath,
-                                                boost::filesystem::path qtDataPath);
+                                                boost::filesystem::path qtDataPath,
+                                                int qtMajorVersion);
 
                 std::vector<std::shared_ptr<PluginsDeployer>> getDeployers(const std::string& moduleName);
             };
diff --git a/src/main.cpp b/src/main.cpp
@@ -70,6 +70,53 @@ int main(const int argc, const char *const *const argv) {
         return 1;
     }
 
+    auto qmakePath = findQmake();
+
+    if (qmakePath.empty()) {
+        ldLog() << LD_ERROR << "Could not find qmake, please install or provide path using $QMAKE" << std::endl;
+        return 1;
+    }
+
+    if (!bf::exists(qmakePath)) {
+        ldLog() << LD_ERROR << "No such file or directory:" << qmakePath << std::endl;
+        return 1;
+    }
+    
+    ldLog() << "Using qmake:" << qmakePath << std::endl;
+
+    auto qmakeVars = queryQmake(qmakePath);
+
+    if (qmakeVars.empty()) {
+        ldLog() << LD_ERROR << "Failed to query Qt paths using qmake -query" << std::endl;
+        return 1;
+    }
+
+    const bf::path qtPluginsPath = qmakeVars["QT_INSTALL_PLUGINS"];
+    const bf::path qtLibexecsPath = qmakeVars["QT_INSTALL_LIBEXECS"];
+    const bf::path qtDataPath = qmakeVars["QT_INSTALL_DATA"];
+    const bf::path qtTranslationsPath = qmakeVars["QT_INSTALL_TRANSLATIONS"];
+    const bf::path qtBinsPath = qmakeVars["QT_INSTALL_BINS"];
+    const bf::path qtLibsPath = qmakeVars["QT_INSTALL_LIBS"];
+    const bf::path qtInstallQmlPath = qmakeVars["QT_INSTALL_QML"];
+    const std::string qtVersion = qmakeVars["QT_VERSION"];
+
+    if (qtVersion.empty()) {
+        ldLog() << LD_ERROR << "Failed to query QT_VERSION using qmake -query" << std::endl;
+        return 1;
+    }
+
+    int qtMajorVersion = std::stoi(qtVersion, nullptr, 10);
+    if (qtMajorVersion < 5) {
+        ldLog() << std::endl << LD_WARNING << "Minimum Qt version supported is 5" << std::endl;
+        qtMajorVersion = 5;
+    }
+    else if (qtMajorVersion > 6) {
+        ldLog() << std::endl << LD_WARNING << "Maximum Qt version supported is 6" << std::endl;
+        qtMajorVersion = 6;
+    }
+
+    ldLog() << std::endl << "Using Qt version: " << qtVersion << " (" << qtMajorVersion << ")" << std::endl;
+
     appdir::AppDir appDir(appDirPath.Get());
 
     // allow disabling copyright files deployment via environment variable
@@ -125,7 +172,9 @@ int main(const int argc, const char *const *const argv) {
         return false;
     };
 
-    std::copy_if(QtModules.begin(), QtModules.end(), std::back_inserter(foundQtModules),
+    const std::vector<QtModule>& qtModules = getQtModules(qtMajorVersion);
+
+    std::copy_if(qtModules.begin(), qtModules.end(), std::back_inserter(foundQtModules),
                  [&matchesQtModule, &libraryNames](const QtModule &module) {
                      return std::find_if(libraryNames.begin(), libraryNames.end(),
                                          [&matchesQtModule, &module](const std::string &libraryName) {
@@ -139,7 +188,7 @@ int main(const int argc, const char *const *const argv) {
         extraPluginsFromEnv = linuxdeploy::util::split(std::string(extraPluginsFromEnvData), ';');
 
     for (const auto& pluginsList : {static_cast<std::vector<std::string>>(extraPlugins.Get()), extraPluginsFromEnv}) {
-        std::copy_if(QtModules.begin(), QtModules.end(), std::back_inserter(extraQtModules),
+        std::copy_if(qtModules.begin(), qtModules.end(), std::back_inserter(extraQtModules),
             [&matchesQtModule, &libraryNames, &pluginsList](const QtModule &module) {
                 return std::find_if(pluginsList.begin(), pluginsList.end(),
                     [&matchesQtModule, &module](const std::string &libraryName) {
@@ -170,35 +219,6 @@ int main(const int argc, const char *const *const argv) {
         return 1;
     }
 
-    auto qmakePath = findQmake();
-
-    if (qmakePath.empty()) {
-        ldLog() << LD_ERROR << "Could not find qmake, please install or provide path using $QMAKE" << std::endl;
-        return 1;
-    }
-
-    if (!bf::exists(qmakePath)) {
-        ldLog() << LD_ERROR << "No such file or directory:" << qmakePath << std::endl;
-        return 1;
-    }
-
-    ldLog() << "Using qmake:" << qmakePath << std::endl;
-
-    auto qmakeVars = queryQmake(qmakePath);
-
-    if (qmakeVars.empty()) {
-        ldLog() << LD_ERROR << "Failed to query Qt paths using qmake -query" << std::endl;
-        return 1;
-    }
-
-    const bf::path qtPluginsPath = qmakeVars["QT_INSTALL_PLUGINS"];
-    const bf::path qtLibexecsPath = qmakeVars["QT_INSTALL_LIBEXECS"];
-    const bf::path qtDataPath = qmakeVars["QT_INSTALL_DATA"];
-    const bf::path qtTranslationsPath = qmakeVars["QT_INSTALL_TRANSLATIONS"];
-    const bf::path qtBinsPath = qmakeVars["QT_INSTALL_BINS"];
-    const bf::path qtLibsPath = qmakeVars["QT_INSTALL_LIBS"];
-    const bf::path qtInstallQmlPath = qmakeVars["QT_INSTALL_QML"];
-
     ldLog() << std::endl;
     ldLog() << "QT_INSTALL_LIBS:" << qtLibsPath << std::endl;
     std::ostringstream newLibraryPath;
@@ -223,7 +243,8 @@ int main(const int argc, const char *const *const argv) {
         qtLibexecsPath,
         qtInstallQmlPath,
         qtTranslationsPath,
-        qtDataPath
+        qtDataPath,
+        qtMajorVersion
     );
 
     for (const auto& module : qtModulesToDeploy) {
diff --git a/src/qt-modules.h b/src/qt-modules.h
@@ -2,6 +2,7 @@
 #include <string>
 #include <tuple>
 #include <vector>
+#include <stdexcept>
 
 #pragma once
 
@@ -17,7 +18,7 @@ class QtModule {
 };
 
 // TODO: the list of translation file prefixes is probably incomplete
-static const std::vector<QtModule> QtModules = {
+static const std::vector<QtModule> Qt5Modules = {
     {"3danimation", "libQt53DAnimation", ""},
     {"3dcore", "libQt53DCore", ""},
     {"3dextras", "libQt53DExtras", ""},
@@ -80,3 +81,99 @@ static const std::vector<QtModule> QtModules = {
     {"xmlpatterns", "libQt5XmlPatterns", "qtxmlpatterns"},
     {"xml", "libQt5Xml", "qtbase"},
 };
+
+static const std::vector<QtModule> Qt6Modules = {
+    {"concurrent", "libQt6Concurrent", "qtbase"},
+    {"core5compat", "libQt6Core5Compat", "qtbase"},
+    {"core", "libQt6Core", "qtbase"},
+    {"dbus", "libQt6DBus", ""},
+    {"designercomponents", "libQt6DesignerComponents", ""},
+    {"designer", "libQt6Designer", ""},
+    {"eglfsdeviceintegration", "libQt6EglFSDeviceIntegration", ""},
+    {"eglfskmssupport", "libQt6EglFsKmsSupport", ""},
+    {"gui", "libQt6Gui", "qtbase"},
+    {"help", "libQt6Help", "qt_help"},
+    {"network", "libQt6Network", "qtbase"},
+    {"opengl", "libQt6OpenGL", ""},
+    {"openglwidgets", "libQt6OpenGLWidgets", ""},
+    {"printsupport", "libQt6PrintSupport", ""},
+    {"qmlmodels", "libQt6QmlModels", ""},
+    {"qml", "libQt6Qml", "qtdeclarative"},
+    {"qmlworkerscript", "libQt6QmlWorkerScript", ""},
+    {"quick3dassetimport", "libQt6Quick3DAssetImport", ""},
+    {"quick3druntimerender", "libQt6Quick3DRuntimeRender", ""},
+    {"quick3d", "libQt6Quick3D", ""},
+    {"quick3dutils", "libQt6Quick3DUtils", ""},
+    {"quickcontrols2impl", "libQt6QuickControls2Impl", ""},
+    {"quickcontrols2", "libQt6QuickControls2", ""},
+    {"quickparticles", "libQt6QuickParticles", ""},
+    {"quickshapes", "libQt6QuickShapes", ""},
+    {"quick", "libQt6Quick", "qtdeclarative"},
+    {"quicktemplates2", "libQt6QuickTemplates2", ""},
+    {"quicktest", "libQt6QuickTest", ""},
+    {"quickwidgets", "libQt6QuickWidgets", ""},
+    {"shadertools", "libQt6ShaderTools", ""},
+    {"sql", "libQt6Sql", "qtbase"},
+    {"svg", "libQt6Svg", ""},
+    {"svgwidgets", "libQt6SvgWidgets", ""},
+    {"test", "libQt6Test", "qtbase"},
+    {"uitools", "libQt6UiTools", ""},
+    {"waylandclient", "libQt6WaylandClient", ""},
+    {"waylandcompositor", "libQt6WaylandCompositor", ""},
+    {"widgets", "libQt6Widgets", "qtbase"},
+    {"xcbqpa", "libQt6XcbQpa", ""},
+    {"xml", "libQt6Xml", "qtbase"},
+
+    /* Not Included in Qt6.0.0, maybe some of them will be added back in 6.1, 6.2
+
+    {"3danimation", "libQt63DAnimation", ""},
+    {"3dcore", "libQt63DCore", ""},
+    {"3dextras", "libQt63DExtras", ""},
+    {"3dinput", "libQt63DInput", ""},
+    {"3dlogic", "libQt63DLogic", ""},
+    {"3drender", "libQt63DRender", ""},
+    {"3dquickanimation", "libQt63DQuickAnimation", ""},
+    {"3dquickextras", "libQt63DQuickExtras", ""},
+    {"3dquickinput", "libQt63DQuickInput", ""},
+    {"3dquickrender", "libQt63DQuickRender", ""},
+    {"3dquickscene2d", "libQt63DQuickScene2D", ""},
+    {"3dquick", "libQt63DQuick", ""},
+    {"bluetooth", "libQt6Bluetooth", ""},
+    {"clucene", "libQt6CLucene", "qt_help"},
+    {"declarative", "libQt6Declarative", "qtquick1"},
+    {"gamepad", "libQt6Gamepad", ""},
+    {"location", "libQt6Location", ""},
+    {"multimediagsttools", "libQt6MultimediaGstTools", "qtmultimedia"},
+    {"multimediaquick", "libQt6MultimediaQuick", "qtmultimedia"},
+    {"multimedia", "libQt6Multimedia", "qtmultimedia"},
+    {"multimediawidgets", "libQt6MultimediaWidgets", "qtmultimedia"},
+    {"nfc", "libQt6Nfc", ""},
+    {"positioning", "libQt6Positioning", ""},
+    {"remoteobjects", "libQt6RemoteObjects", ""},
+    {"script", "libQt6Script", "qtscript"},
+    {"scripttools", "libQt6ScriptTools", "qtscript"},
+    {"scxml", "libQt6Scxml", ""},
+    {"sensors", "libQt6Sensors", ""},
+    {"serialbus", "libQt6SerialBus", ""},
+    {"serialport", "libQt6SerialPort", "qtserialport"},
+    {"texttospeech", "libQt6TextToSpeech", ""},
+    {"webchannel", "libQt6WebChannel", ""},
+    {"webenginecore", "libQt6WebEngineCore", ""},
+    {"webengine", "libQt6WebEngine", "qtwebengine"},
+    {"webenginewidgets", "libQt6WebEngineWidgets", ""},
+    {"websockets", "libQt6WebSockets", "qtwebsockets"},
+    {"x11extras", "libQt6X11Extras", ""},
+    {"xmlpatterns", "libQt6XmlPatterns", "qtxmlpatterns"},
+    */
+   
+};
+
+inline const std::vector<QtModule>& getQtModules(const int version) {
+    if (version == 5) {
+        return Qt5Modules;
+    }
+    else if (version == 6) {
+        return Qt6Modules;
+    }
+    throw std::runtime_error("Unknown Qt version: " + std::to_string(version));
+}
