jamulussoftware · dcorson-ticino-com · Jun 3, 2021 · Jun 3, 2021 · Jun 6, 2021 · Jun 6, 2021
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -92,45 +92,47 @@ jobs:
       fail-fast:                    false
       matrix: # Think of this like a foreach loop. Basically runs the steps with every combination of the contents of this. More info: https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
         config:
-           - config_name:           AndroidAPK (artifact+codeQL)
-             target_os:             android
-             building_on_os:        ubuntu-20.04
-             cmd1_prebuild:         "sh ./autobuild/android/autobuild_apk_1_prepare.sh" # this step needs sh instead of bash for permissions
-             cmd2_build:            "./autobuild/android/autobuild_apk_2_build.sh"
-             cmd3_postbuild:        "./autobuild/android/autobuild_apk_3_copy_files.sh"
-             uses_codeql:           true
-
-           - config_name:           Linux (artifacts+codeQL)
-             target_os:             linux
-             building_on_os:        ubuntu-18.04
-             cmd1_prebuild:         "sh ./autobuild/linux/autobuild_deb_1_prepare.sh" # this step needs sh instead of bash for permissions
-             cmd2_build:            "./autobuild/linux/autobuild_deb_2_build.sh"
-             cmd3_postbuild:        "./autobuild/linux/autobuild_deb_3_copy_files.sh"
-             uses_codeql:           true
+ #          - config_name:           AndroidAPK (artifact+codeQL)
+ #            target_os:             android
+ #            building_on_os:        ubuntu-20.04
+ #            cmd1_prebuild:         "sh ./autobuild/android/autobuild_apk_1_prepare.sh" # this step needs sh instead of bash for permissions
+ #            cmd2_build:            "./autobuild/android/autobuild_apk_2_build.sh"
+ #            cmd3_postbuild:        "./autobuild/android/autobuild_apk_3_copy_files.sh"
+ #            uses_codeql:           true
+#
+#           - config_name:           Linux (artifacts+codeQL)
+#             target_os:             linux
+#             building_on_os:        ubuntu-20.04
+#             cmd1_prebuild:         "sh ./autobuild/linux/autobuild_deb_1_prepare.sh" # this step needs sh instead of bash for permissions
+#             cmd2_build:            "./autobuild/linux/autobuild_deb_2_build.sh"
+#             cmd3_postbuild:        "./autobuild/linux/autobuild_deb_3_copy_files.sh"
+#             uses_codeql:           true
 
            - config_name:           MacOS (codeQL)
              target_os:             macos
              building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 5.15.2"
+             cmd1_prebuild:         "./autobuild/mac/codeQL/autobuild_mac_1_prepare.sh 6.1.0"
              cmd2_build:            "./autobuild/mac/codeQL/autobuild_mac_2_build.sh"
              cmd3_postbuild:        false
              uses_codeql:           true
 
            - config_name:           MacOS (artifacts)
              target_os:             macos
              building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.15.2"
-             cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh sign_if_possible"
+
+             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 6.1.0"
+             cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh"
              cmd3_postbuild:        "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh"
              uses_codeql:           false
 
-           - config_name:           MacOS Legacy (artifacts)
-             target_os:             macos
-             building_on_os:        macos-10.15
-             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.9.9"
-             cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh do_not_sign"
-             cmd3_postbuild:        "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh legacy"
-             uses_codeql:           false
+#           - config_name:           MacOS Legacy (artifacts)
+#             target_os:             macos
+#             building_on_os:        macos-10.15
+#             cmd1_prebuild:         "./autobuild/mac/artifacts/autobuild_mac_1_prepare.sh 5.9.9"
+#             cmd2_build:            "./autobuild/mac/artifacts/autobuild_mac_2_build.sh"
+#             cmd3_postbuild:        "./autobuild/mac/artifacts/autobuild_mac_3_copy_files.sh legacy"
+#             uses_codeql:           false
+
 
            - config_name:           Windows (artifact+codeQL)
              target_os:             windows
@@ -153,11 +155,11 @@ jobs:
 
       # For Qt5 on Mac, we need to ensure SDK 10.15 is used, and not SDK 11.x
       # This is done by selecting Xcode 11.7 instead of the latest default of 12.x
-      - name:                       Select Xcode version for Mac
-        if:                         ${{ matrix.config.target_os == 'macos' }}
-        uses:                       maxim-lobanov/setup-xcode@v1
-        with:
-          xcode-version: '11.7'
+ #     - name:                       Select Xcode version for Mac
+ #       if:                         ${{ matrix.config.target_os == 'macos' }}
+ #       uses:                       maxim-lobanov/setup-xcode@v1
+ #       with:
+ #         xcode-version: '11.7'
 
       # Checkout code
       - name:                       Checkout code

diff --git a/Jamulus.pro b/Jamulus.pro
@@ -123,6 +123,52 @@ win32 {
         LIBS += "$${programfilesdir}/JACK2/lib/$${libjackname}"
     }
 
+} else:win64 {
+    DEFINES -= UNICODE # fixes issue with ASIO SDK (asiolist.cpp is not unicode compatible)
+    DEFINES += NOMINMAX # solves a compiler error in qdatetime.h (Qt5)
+    HEADERS += windows/sound.h
+    SOURCES += windows/sound.cpp \
+        windows/ASIOSDK2/common/asio.cpp \
+        windows/ASIOSDK2/host/asiodrivers.cpp \
+        windows/ASIOSDK2/host/pc/asiolist.cpp
+    RC_FILE = windows/mainicon.rc
+    INCLUDEPATH += windows/ASIOSDK2/common \
+        windows/ASIOSDK2/host \
+        windows/ASIOSDK2/host/pc
+    mingw* {
+        LIBS += -lole64 \
+            -luser64 \
+            -ladvapi64 \
+            -lwinmm \
+            -lws2_64
+    } else {
+        QMAKE_LFLAGS += /DYNAMICBASE:NO # fixes crash with libjack64.dll, see https://github.com/jamulussoftware/jamulus/issues/93
+        LIBS += ole64.lib \
+            user64.lib \
+            advapi64.lib \
+            winmm.lib \
+            ws2_64.lib
+    }
+
+    # replace ASIO with jack if requested
+    contains(CONFIG, "jackonwindows") {
+        message(Using Jack instead of ASIO.)
+
+        !exists("C:/Program Files (x86)/Jack/includes/jack/jack.h") {
+            message(Warning: jack.h was not found at the usual place, maybe jack is not installed)
+        }
+
+        HEADERS -= windows/sound.h
+        SOURCES -= windows/sound.cpp
+        HEADERS += linux/sound.h
+        SOURCES += linux/sound.cpp
+        DEFINES += WITH_JACK
+        DEFINES += JACK_REPLACES_ASIO
+        DEFINES += _STDINT_H # supposed to solve compilation error in systemdeps.h
+        INCLUDEPATH += "C:/Program Files (x86)/Jack/includes"
+        LIBS += "C:/Program Files (x86)/Jack/lib/libjack64.lib"
+    }
+
 } else:macx {
     contains(CONFIG, "server_bundle") {
         message(The generated application bundle will run a server instance.)
@@ -136,7 +182,7 @@ win32 {
         RC_FILE = mac/mainicon.icns
     }
 
-    QT += macextras
+    #QT += macextras
     HEADERS += mac/sound.h
     SOURCES += mac/sound.cpp
     HEADERS += mac/activity.h

diff --git a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1
@@ -22,11 +22,12 @@ echo "Install Qt..."
 pip install aqtinstall
 echo "Get Qt 64 bit..."
 # intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
-aqt install --outputdir C:\Qt 5.15.2 windows desktop win64_msvc2019_64
+aqt install --outputdir C:\Qt 6.1.0 windows desktop win64_msvc2019_64
 
 echo "Get Qt 32 bit..."
 # intermediate solution if the main server is down: append e.g. " -b https://mirrors.ocf.berkeley.edu/qt/" to the "aqt"-line below
-aqt install --outputdir C:\Qt 5.15.2 windows desktop win32_msvc2019
+
+aqt install --outputdir C:\Qt 6.1.0 windows desktop win32_msvc2019
 
 
 #################################
@@ -44,3 +45,4 @@ if ($BuildOption -Eq "jackonwindows")
     choco install --no-progress -y -f --forcex86 jack
 }
 
+
diff --git a/autobuild/windows/autobuild_windowsinstaller_2_build.ps1 b/autobuild/windows/autobuild_windowsinstaller_2_build.ps1
@@ -28,11 +28,6 @@ if (("$jamulus_project_path" -eq $null) -or ("$jamulus_project_path" -eq "")) {
 
 echo "Build installer..."
 # Build the installer
-if ($BuildOption -ne "")
-{
-    powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\5.15.2" -BuildOption $BuildOption
-}
-else
-{
-    powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\5.15.2"
-}
+
+powershell "$jamulus_project_path\windows\deploy_windows.ps1" "C:\Qt\6.1.0"
+
diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
@@ -706,8 +706,13 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
     // Country flag icon -------------------------------------------------------
     if ( cChanInfo.eCountry != QLocale::AnyCountry )
     {
+#if QT_VERSION >= 0x060000
+        QLocale::Country eC = CLocale::LocaleQt5toQt6 ( cChanInfo.eCountry );
+#else
+        QLocale::Country eC = cChanInfo.eCountry;
+#endif
         // try to load the country flag icon
-        QPixmap CountryFlagPixmap ( CLocale::GetCountryFlagIconsResourceReference ( cChanInfo.eCountry ) );
+        QPixmap CountryFlagPixmap ( CLocale::GetCountryFlagIconsResourceReference ( eC ) );
 
         // first check if resource reference was valid
         if ( CountryFlagPixmap.isNull() )
@@ -719,7 +724,7 @@ void CChannelFader::SetChannelInfos ( const CChannelInfo& cChanInfo )
         {
             // set correct picture
             plblCountryFlag->setPixmap ( CountryFlagPixmap );
-            eTTCountry = cChanInfo.eCountry;
+            eTTCountry = eC;
 
             // enable country flag
             plblCountryFlag->setVisible ( true );

diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
@@ -23,6 +23,7 @@
 \******************************************************************************/
 
 #include "chatdlg.h"
+#include <QRegularExpression>
 
 /* Implementation *************************************************************/
 CChatDlg::CChatDlg ( QWidget* parent ) : CBaseDlg ( parent, Qt::Window ) // use Qt::Window to get min/max window buttons
@@ -114,11 +115,11 @@ void CChatDlg::AddChatText ( QString strChatText )
     // analyze strChatText to check if hyperlink (limit ourselves to http(s)://) but do not
     // replace the hyperlinks if any HTML code for a hyperlink was found (the user has done the HTML
     // coding hisself and we should not mess with that)
-    if ( !strChatText.contains ( QRegExp ( "href\\s*=|src\\s*=" ) ) )
+    if ( !strChatText.contains ( QRegularExpression ( "href\\s*=|src\\s*=" ) ) )
     {
         // searches for all occurrences of http(s) and cuts until a space (\S matches any non-white-space
         // character and the + means that matches the previous element one or more times.)
-        strChatText.replace ( QRegExp ( "(https?://\\S+)" ), "<a href=\"\\1\">\\1</a>" );
+        strChatText.replace ( QRegularExpression ( "(https?://\\S+)" ), "<a href=\"\\1\">\\1</a>" );
     }
 
     // add new text in chat window

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -23,6 +23,7 @@
 \******************************************************************************/
 
 #include "clientdlg.h"
+#include <QActionGroup>
 
 /* Implementation *************************************************************/
 CClientDlg::CClientDlg ( CClient*         pNCliP,
@@ -918,24 +919,25 @@ void CClientDlg::SetMyWindowTitle ( const int iNumClients )
     }
 
     setWindowTitle ( strWinTitle );
-
-#if defined( Q_OS_MACX )
-    // for MacOS only we show the number of connected clients as a
-    // badge label text if more than one user is connected
-    // (only available in Qt5.2)
-#    if QT_VERSION >= QT_VERSION_CHECK( 5, 2, 0 )
-    if ( iNumClients > 1 )
-    {
-        // show the number of connected clients
-        QtMac::setBadgeLabelText ( QString ( "%1" ).arg ( iNumClients ) );
-    }
-    else
-    {
-        // clear the text (apply an empty string)
-        QtMac::setBadgeLabelText ( "" );
-    }
-#    endif
-#endif
+    /***
+    #if defined( Q_OS_MACX )
+        // for MacOS only we show the number of connected clients as a
+        // badge label text if more than one user is connected
+        // (only available in Qt5.2)
+    #    if QT_VERSION >= QT_VERSION_CHECK( 5, 2, 0 )
+        if ( iNumClients > 1 )
+        {
+            // show the number of connected clients
+            NSApp.dockTile.badgeLabel ( QString ( "%1" ).arg ( iNumClients ) );
+        }
+        else
+        {
+            // clear the text (apply an empty string)
+            NSApp.dockTile.badgeLabel ( "" );
+        }
+    #    endif
+    #endif
+    ***/
 }
 
 void CClientDlg::ShowConnectionSetupDialog()

diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -51,11 +51,6 @@
 #include "connectdlg.h"
 #include "analyzerconsole.h"
 #include "ui_clientdlgbase.h"
-#if defined( __APPLE__ ) || defined( __MACOSX )
-#    if QT_VERSION >= QT_VERSION_CHECK( 5, 2, 0 )
-#        include <QtMac>
-#    endif
-#endif
 
 /* Definitions ****************************************************************/
 // update time for GUI controls

diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
@@ -400,8 +400,11 @@ void CConnectDlg::SetServerList ( const CHostAddress& InetAddr, const CVector<CS
 
         if ( vecServerInfo[iIdx].eCountry != QLocale::AnyCountry )
         {
+#if QT_VERSION >= 0x060000
+            QString strCountryToString = QLocale::countryToString ( CLocale::LocaleQt5toQt6 ( vecServerInfo[iIdx].eCountry ) );
+#else
             QString strCountryToString = QLocale::countryToString ( vecServerInfo[iIdx].eCountry );
-
+#endif
             // Qt countryToString does not use spaces in between country name
             // parts but they use upper case letters which we can detect and
             // insert spaces as a post processing
@@ -476,8 +479,11 @@ void CConnectDlg::SetConnClientsList ( const CHostAddress& InetAddr, const CVect
             if ( vecChanInfo[i].eCountry != QLocale::AnyCountry )
             {
                 // try to load the country flag icon
+#if QT_VERSION >= 0x060000
+                QPixmap CountryFlagPixmap ( CLocale::GetCountryFlagIconsResourceReference ( CLocale::LocaleQt5toQt6 ( vecChanInfo[i].eCountry ) ) );
+#else
                 QPixmap CountryFlagPixmap ( CLocale::GetCountryFlagIconsResourceReference ( vecChanInfo[i].eCountry ) );
-
+#endif
                 // first check if resource reference was valid
                 if ( !CountryFlagPixmap.isNull() )
                 {
@@ -739,7 +745,11 @@ void CConnectDlg::OnTimerPing()
                                                  bEnableIPv6 ) )
         {
             // if address is valid, send ping message using a new thread
+#if QT_VERSION >= 0x060000
+            QtConcurrent::run ( &CConnectDlg::EmitCLServerListPingMes, this, CurServerAddress );
+#else
             QtConcurrent::run ( this, &CConnectDlg::EmitCLServerListPingMes, CurServerAddress );
+#endif
         }
     }
 }

diff --git a/src/levelmeter.cpp b/src/levelmeter.cpp
@@ -34,7 +34,7 @@ CLevelMeter::CLevelMeter ( QWidget* parent ) : QWidget ( parent ), eLevelMeterTy
     QWidget*     pLEDMeter  = new QWidget();
     QVBoxLayout* pLEDLayout = new QVBoxLayout ( pLEDMeter );
     pLEDLayout->setAlignment ( Qt::AlignHCenter );
-    pLEDLayout->setMargin ( 0 );
+    pLEDLayout->setContentsMargins ( 0, 0, 0, 0 );
     pLEDLayout->setSpacing ( 0 );
 
     // create LEDs plus the clip LED

diff --git a/src/main.cpp b/src/main.cpp
@@ -21,6 +21,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
 \******************************************************************************/
+#ifdef _MSC_VER
+#    pragma comment( linker, "/subsystem:windows /ENTRY:mainCRTStartup" )
+#endif
 
 #include <QCoreApplication>
 #include <QDir>