Update to Qt6

Author: nostar

AboutTab.qml

@@ -15,7 +15,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.10
+import QtQuick
 
 Item {
 	id: aboutTab

DroidStar.pro

@@ -1,14 +1,8 @@
 QT += quick quickcontrols2 network multimedia
 
-equals(QT_MAJOR_VERSION, 5){
-	android:QT += androidextras
-}
-
 unix:!ios:QT += serialport
-CONFIG += c++17
-LFLAGS +=
-!win32:LIBS += -ldl
 win32:QT += serialport
+!win32:LIBS += -ldl
 win32:LIBS += -lws2_32
 win32:QMAKE_LFLAGS += -static
 QMAKE_LFLAGS_WINDOWS += --enable-stdcall-fixup
@@ -31,10 +25,76 @@ VERSION_BUILD='$(shell cd $$PWD;git rev-parse --short HEAD)'
 DEFINES += VERSION_NUMBER=\"\\\"$${VERSION_BUILD}\\\"\"
 DEFINES += QT_DEPRECATED_WARNINGS
 #DEFINES += QT_DEBUG_PLUGINS=1
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 #DEFINES += VOCODER_PLUGIN
 #DEFINES += USE_FLITE
 #DEFINES += USE_EXTERNAL_CODEC2
+#DEFINES += USE_MD380_VOCODER
+
+SOURCES += \
+        CRCenc.cpp \
+        Golay24128.cpp \
+        M17Convolution.cpp \
+        SHA256.cpp \
+        YSFConvolution.cpp \
+        YSFFICH.cpp \
+        audioengine.cpp \
+        cbptc19696.cpp \
+        cgolay2087.cpp \
+        chamming.cpp \
+        crs129.cpp \
+        dcs.cpp \
+        dmr.cpp \
+        droidstar.cpp \
+        httpmanager.cpp \
+        iax.cpp \
+        imbe_vocoder/aux_sub.cc \
+        imbe_vocoder/basicop2.cc \
+        imbe_vocoder/ch_decode.cc \
+        imbe_vocoder/ch_encode.cc \
+        imbe_vocoder/dc_rmv.cc \
+        imbe_vocoder/decode.cc \
+        imbe_vocoder/dsp_sub.cc \
+        imbe_vocoder/encode.cc \
+        imbe_vocoder/imbe_vocoder.cc \
+        imbe_vocoder/imbe_vocoder_impl.cc \
+        imbe_vocoder/math_sub.cc \
+        imbe_vocoder/pe_lpf.cc \
+        imbe_vocoder/pitch_est.cc \
+        imbe_vocoder/pitch_ref.cc \
+        imbe_vocoder/qnt_sub.cc \
+        imbe_vocoder/rand_gen.cc \
+        imbe_vocoder/sa_decode.cc \
+        imbe_vocoder/sa_encode.cc \
+        imbe_vocoder/sa_enh.cc \
+        imbe_vocoder/tbls.cc \
+        imbe_vocoder/uv_synt.cc \
+        imbe_vocoder/v_synt.cc \
+        imbe_vocoder/v_uv_det.cc \
+        m17.cpp \
+        main.cpp \
+        mode.cpp \
+        nxdn.cpp \
+        p25.cpp \
+        ref.cpp \
+        xrf.cpp \
+        ysf.cpp
+android:SOURCES += androidserialport.cpp
+!ios:SOURCES += serialambe.cpp serialmodem.cpp
+
+resources.files = main.qml AboutTab.qml HostsTab.qml LogTab.qml MainTab.qml SettingsTab.qml
+resources.prefix = /$${TARGET}
+RESOURCES += resources
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
 
 HEADERS += \
 	CRCenc.h \
@@ -93,60 +153,7 @@ HEADERS += \
 	vocoder_plugin.h \
 	xrf.h \
 	ysf.h
-android:HEADERS += androidserialport.h
-macx:HEADERS += micpermission.h
-!ios:HEADERS += serialambe.h serialmodem.h
 
-SOURCES += \
-	CRCenc.cpp \
-	Golay24128.cpp \
-	M17Convolution.cpp \
-	SHA256.cpp \
-	YSFConvolution.cpp \
-	YSFFICH.cpp \
-	audioengine.cpp \
-	cbptc19696.cpp \
-	cgolay2087.cpp \
-	chamming.cpp \
-	crs129.cpp \
-	dcs.cpp \
-	dmr.cpp \
-	droidstar.cpp \
-	httpmanager.cpp \
-	iax.cpp \
-	imbe_vocoder/aux_sub.cc \
-	imbe_vocoder/basicop2.cc \
-	imbe_vocoder/ch_decode.cc \
-	imbe_vocoder/ch_encode.cc \
-	imbe_vocoder/dc_rmv.cc \
-	imbe_vocoder/decode.cc \
-	imbe_vocoder/dsp_sub.cc \
-	imbe_vocoder/encode.cc \
-	imbe_vocoder/imbe_vocoder.cc \
-	imbe_vocoder/imbe_vocoder_impl.cc \
-	imbe_vocoder/math_sub.cc \
-	imbe_vocoder/pe_lpf.cc \
-	imbe_vocoder/pitch_est.cc \
-	imbe_vocoder/pitch_ref.cc \
-	imbe_vocoder/qnt_sub.cc \
-	imbe_vocoder/rand_gen.cc \
-	imbe_vocoder/sa_decode.cc \
-	imbe_vocoder/sa_encode.cc \
-	imbe_vocoder/sa_enh.cc \
-	imbe_vocoder/tbls.cc \
-	imbe_vocoder/uv_synt.cc \
-	imbe_vocoder/v_synt.cc \
-	imbe_vocoder/v_uv_det.cc \
-	m17.cpp \
-	main.cpp \
-	mode.cpp \
-	nxdn.cpp \
-	p25.cpp \
-	ref.cpp \
-	xrf.cpp \
-	ysf.cpp
-android:SOURCES += androidserialport.cpp
-!ios:SOURCES += serialambe.cpp serialmodem.cpp
 !contains(DEFINES, USE_EXTERNAL_CODEC2){
 HEADERS += \
 	codec2/codec2_api.h \
@@ -189,44 +196,15 @@ SOURCES += \
 	mbe/vocoder_plugin.cpp
 }
 
-macx:OBJECTIVE_SOURCES += micpermission.mm
-ios:OBJECTIVE_SOURCES += micpermission.mm
-RESOURCES += qml.qrc
-
-QML_IMPORT_PATH =
-QML_DESIGNER_IMPORT_PATH =
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-DISTFILES += \
-	android/AndroidManifest.xml \
-	android/build.gradle \
-	android/gradle/wrapper/gradle-wrapper.jar \
-	android/gradle/wrapper/gradle-wrapper.properties \
-	android/gradlew \
-	android/gradlew.bat \
-	android/res/values/libs.xml \
-	images/log.png
+android:HEADERS += androidserialport.h
+macx:HEADERS += micpermission.h
+!ios:HEADERS += serialambe.h serialmodem.h
+android:ANDROID_VERSION_CODE = 79
 
 contains(ANDROID_TARGET_ARCH,armeabi-v7a) {
-	LIBS += -L$$(HOME)/Android/local/lib
 	ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-	OTHER_FILES += android/src
 }
 
 contains(ANDROID_TARGET_ARCH,arm64-v8a) {
-	LIBS += -L$$(HOME)/Android/local/lib64
 	ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-	OTHER_FILES += android/src
-	#ANDROID_ABIS = arm64-v8a
-}
-
-#ANDROID_ABIS = armeabi-v7a arm64-v8a
-
-contains(DEFINES, USE_FLITE){
-	LIBS += -lflite_cmu_us_slt -lflite_cmu_us_kal16 -lflite_cmu_us_awb -lflite_cmu_us_rms -lflite_usenglish -lflite_cmulex -lflite -lasound
 }
-ios:HEADERS += micpermission.h

HostsTab.qml

@@ -15,8 +15,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
 Item {
 	id: hostsTab

LogTab.qml

@@ -15,8 +15,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
 Item {
 	id: logTab

MainTab.qml

@@ -15,11 +15,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.10
-//import QtQuick.Window 2.15
-import QtQuick.Controls 2.3
-//import QtQuick.Dialogs 1.3
-//import org.dudetronics.droidstar 1.0
+import QtQuick
+import QtQuick.Controls
 
 Item {
 	id: mainTab

README.md

@@ -43,7 +43,7 @@ Latitude/Longitude/Location/Description:  These are DMR config options, sent to
 
 DMR+ IPSC2 hosts:  The format for the DMR+ options string is the complete string including 'Options='.  Create your options string and check 'Send DMR+ options on connect' before connecting.  A description of the DMR+ options string can be found here: https://github.com/g4klx/MMDVMHost/blob/master/DMRplus_startup_options.md .
 
-Talkgroup:  For DMR, enter the talkgroup ID number.  A very active TG for testing functionality on Brandmeister is 91 (Brandmeister Worldwide).  You must TX with a talkgroup entered to link to that talkgroup, just like a real radio.  Any ststics you have defined in BM selfcare will work the same way they do if you were using a hotspot/radio.
+Talkgroup:  For DMR, enter the talkgroup ID number.  A very active TG for testing functionality on Brandmeister is 91 (Brandmeister Worldwide).  You must TX with a talkgroup entered to link to that talkgroup, just like a real radio.  Any statics you have defined in BM selfcare will work the same way they do if you were using a hotspot/radio.
 
 MYCALL/URCALL/RPTR1/RPTR2 are for Dstar modes REF/DCS/XRF.  These fields need to be entered correctly before attempting to TX on any DSTAR reflector.  All fields are populated with suggested values upon connect, but can still be modified for advanced users.  RPT2 is always overwritten with the current reflector upon connected.
 
@@ -63,33 +63,38 @@ Port: UDP port of node, usually 4569.
 Add DTMF commands like \*3node, \*1node, \*70, etc in the IAX DTMF box and hit send to send the DTMF string. Details on various commands can be found at the AllStar wiki and others.
 
 # General building instructions
-This software is written primarily in C++ on Linux and requires Qt5 >= Qt5.15 or Qt6 >= Qt6.3, and natually the devel packages to build.  Java, QML (Javascript based), and C# code is also used where necessary.  The preferred way to obtain Qt is to use the Qt open source online installer from the Qt website.  Run this installer as a user (not root) to keep the Qt installation separate from your system libs.  Select the option as shown in this pic https://imgur.com/i0WuFCY which will install everything under ~/Qt.
+This software is written primarily in C++ on Linux and requires Qt6 >= Qt6.4, and naturally the devel packages to build.  Java, QML (Javascript based), and C# code is also used where necessary.  The preferred way to obtain Qt is to use the Qt open source online installer from the Qt website.  Run this installer as a user (not root) to keep the Qt installation separate from your system libs.  Select the option as shown in this pic https://imgur.com/i0WuFCY which will install everything under ~/Qt.
 
-In an effort to encourage others to build from source on multiple platforms, there are no longer any external build dependencies.  In order to build DroidStar with no internal AMBE vocider, uncomment the the following line in the DroidStar.pro file:
+In an effort to encourage others to build from source on multiple platforms, there are no longer any external build dependencies.  In order to build DroidStar with no internal AMBE vocoder, uncomment the the following line in the DroidStar.pro file:
 ```
 DEFINES+=VOCODER_PLUGIN
 ```
 Building DroidStar with this line commented out will build with internal AMBE support.  If you choose to do this, it is your responsibility to determine if you will violate any patents in your area.
 
-## Note for building on Raspbian/RaspiOS
-The Qt online installer does not support RPi, but fortunately there is a great Qt 5.15.2 installer for RaspiOS:
-
-https://github.com/koendv/qt5-opengl-raspberrypi
-
-This installer puts everything in the same place as the Qt installer, so build instructions are the same for all:
+## Note for building on RaspiOS (Also applies to debian based Linux desktops)
+The following commands should install everything necessary to build and run DroidStar:
+```
+sudo apt install libqt6*
+sudo apt install qml6*
+sudo apt install qt6-*-dev
+```
+Then to build:
 
 ```
+git clone https://github.com/nostar/DroidStar.git
 cd DroidStar
 mkdir build
 cd build
-/usr/lib/qt5.15.2/bin/qmake ..
+qmake6 ../DroidStar.pro
 make
 ```
-
-And if pulseaudio is not currently installed:
+If building an an arm based platform like rpi, the md380 vocoder can be used.  In order to build with this, uncomment the following line in DroidStar.pro:
 ```
-sudo apt-get install pulseaudio
+#DEFINES += USE_MD380_VOCODER
 ```
+This requires the md380_vocoder library to be installed: https://github.com/nostar/md380_vocoder
+You must make sure that you are not in violation of any patent laws in your area if you decide to use this.
+
 My primary development platform is Fedora Linux.  With a proper build environment, the build instructions apply to all other platforms/distributions, including Windows and macOS.
 
 All of the gradle build files are provided to create an APK file ready to be installed on an Android device.  A proper Android build system including the Android NDK is required and beyond the scope of this document.

SettingsTab.qml

@@ -15,8 +15,8 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import QtQuick 2.10
-import QtQuick.Controls 2.3
+import QtQuick
+import QtQuick.Controls
 
 Item {
 	id: settingsTab