Merge pull request #5022 from mavlink/travis-linux

travis-ci linux tests

.travis.yml

@@ -177,7 +177,7 @@ script:
   - if [ "${TRAVIS_BRANCH}" != "master" ]; then
         if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "debug" ]]; then
             mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/ &&
-            ./debug/QGroundControl --unittest;
+            ./debug/qgroundcontrol-start.sh --unittest;
         elif [[ "${SPEC}" = "macx-clang" && "${CONFIG}" = "debug" ]]; then
             mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/ &&
             ./debug/qgroundcontrol.app/Contents/MacOS/QGroundControl --unittest;

QGCSetup.pri

@@ -69,98 +69,94 @@ WindowsBuild {
         QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"$$COPY_FILE\" \"$$DESTDIR_WIN\"
     }
 
-        ReleaseBuild {
+    ReleaseBuild {
         # Copy Visual Studio DLLs
         # Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
         win32-msvc2010 {
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp100.dll\"  \"$$DESTDIR_WIN\"
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr100.dll\"  \"$$DESTDIR_WIN\"
-        }
-        else:win32-msvc2012 {
+
+        } else:win32-msvc2012 {
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp110.dll\"  \"$$DESTDIR_WIN\"
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr110.dll\"  \"$$DESTDIR_WIN\"
-        }
-        else:win32-msvc2013 {
+
+        } else:win32-msvc2013 {
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp120.dll\"  \"$$DESTDIR_WIN\"
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcr120.dll\"  \"$$DESTDIR_WIN\"
-        }
-        else:win32-msvc2015 {
+
+        } else:win32-msvc2015 {
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\msvcp140.dll\"  \"$$DESTDIR_WIN\"
             QMAKE_POST_LINK += $$escape_expand(\\n) $$QMAKE_COPY \"C:\\Windows\\System32\\vcruntime140.dll\"  \"$$DESTDIR_WIN\"
-        }
-        else {
+
+        } else {
             error("Visual studio version not supported, installation cannot be completed.")
         }
     }
 
     DEPLOY_TARGET = $$shell_quote($$shell_path($$DESTDIR_WIN\\$${TARGET}.exe))
     QMAKE_POST_LINK += $$escape_expand(\\n) $$QT_BIN_DIR\\windeployqt --no-compiler-runtime --qmldir=$${BASEDIR_WIN}\\src $${DEPLOY_TARGET}
-
 }
 
 LinuxBuild {
-    installer {
-        QMAKE_POST_LINK += && mkdir -p $$DESTDIR/Qt/libs && mkdir -p $$DESTDIR/Qt/plugins
-
-        # QT_INSTALL_LIBS
-        QT_LIB_LIST = \
-            libQt5Core.so.5 \
-            libQt5DBus.so.5 \
-            libQt5Gui.so.5 \
-            libQt5Location.so.5 \
-            libQt5Multimedia.so.5 \
-            libQt5MultimediaQuick_p.so.5 \
-            libQt5Network.so.5 \
-            libQt5OpenGL.so.5 \
-            libQt5Positioning.so.5 \
-            libQt5PrintSupport.so.5 \
-            libQt5Qml.so.5 \
-            libQt5Quick.so.5 \
-            libQt5QuickWidgets.so.5 \
-            libQt5SerialPort.so.5 \
-            libQt5Sql.so.5 \
-            libQt5Svg.so.5 \
-            libQt5Test.so.5 \
-            libQt5Widgets.so.5 \
-            libQt5XcbQpa.so.5
-
-        !contains(DEFINES, __rasp_pi2__) {
-            QT_LIB_LIST += \
-                libicudata.so.56 \
-                libicui18n.so.56 \
-                libicuuc.so.56
-        }
+    QMAKE_POST_LINK += && mkdir -p $$DESTDIR/Qt/libs && mkdir -p $$DESTDIR/Qt/plugins
+
+    # QT_INSTALL_LIBS
+    QT_LIB_LIST = \
+        libQt5Core.so.5 \
+        libQt5DBus.so.5 \
+        libQt5Gui.so.5 \
+        libQt5Location.so.5 \
+        libQt5Multimedia.so.5 \
+        libQt5MultimediaQuick_p.so.5 \
+        libQt5Network.so.5 \
+        libQt5OpenGL.so.5 \
+        libQt5Positioning.so.5 \
+        libQt5PrintSupport.so.5 \
+        libQt5Qml.so.5 \
+        libQt5Quick.so.5 \
+        libQt5QuickWidgets.so.5 \
+        libQt5SerialPort.so.5 \
+        libQt5Sql.so.5 \
+        libQt5Svg.so.5 \
+        libQt5Test.so.5 \
+        libQt5Widgets.so.5 \
+        libQt5XcbQpa.so.5
+
+    !contains(DEFINES, __rasp_pi2__) {
+        QT_LIB_LIST += \
+            libicudata.so.56 \
+            libicui18n.so.56 \
+            libicuuc.so.56
+    }
 
-        for(QT_LIB, QT_LIB_LIST) {
-            QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/Qt/libs/
-        }
+    for(QT_LIB, QT_LIB_LIST) {
+        QMAKE_POST_LINK += && $$QMAKE_COPY --dereference $$[QT_INSTALL_LIBS]/$$QT_LIB $$DESTDIR/Qt/libs/
+    }
 
-        # QT_INSTALL_PLUGINS
-        QT_PLUGIN_LIST = \
-            bearer \
-            geoservices \
-            iconengines \
-            imageformats \
-            platforminputcontexts \
-            platforms \
-            position \
-            sqldrivers
-
-        !contains(DEFINES, __rasp_pi2__) {
-            QT_PLUGIN_LIST += xcbglintegrations
-        }
+    # QT_INSTALL_PLUGINS
+    QT_PLUGIN_LIST = \
+        bearer \
+        geoservices \
+        iconengines \
+        imageformats \
+        platforminputcontexts \
+        platforms \
+        position \
+        sqldrivers
+
+    !contains(DEFINES, __rasp_pi2__) {
+        QT_PLUGIN_LIST += xcbglintegrations
+    }
 
-        for(QT_PLUGIN, QT_PLUGIN_LIST) {
-            QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/Qt/plugins/
-        }
+    for(QT_PLUGIN, QT_PLUGIN_LIST) {
+        QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_PLUGINS]/$$QT_PLUGIN $$DESTDIR/Qt/plugins/
+    }
 
-        # QT_INSTALL_QML
-        QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/Qt/
+    # QT_INSTALL_QML
+    QMAKE_POST_LINK += && $$QMAKE_COPY --dereference --recursive $$[QT_INSTALL_QML] $$DESTDIR/Qt/
 
-        # QGroundControl start script
-        QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
-        QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol.desktop $$DESTDIR
-        QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/resources/icons/qgroundcontrol.png $$DESTDIR
-    }
+    # QGroundControl start script
+    QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol-start.sh $$DESTDIR
+    QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/deploy/qgroundcontrol.desktop $$DESTDIR
+    QMAKE_POST_LINK += && $$QMAKE_COPY $$BASEDIR/resources/icons/qgroundcontrol.png $$DESTDIR
 }
-