feat: Enable Qt6 build

QtScrcpy/CMakeLists.txt

@@ -75,18 +75,49 @@ endif()
 # Qt
 #
 
+# Find Qt version
+if (NOT QT_DESIRED_VERSION)
+    find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
+    message("   >>> Found Qt version: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH}")
+    set(QT_DESIRED_VERSION ${QT_VERSION_MAJOR})
+endif()
+
 set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets Network Multimedia REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Network Multimedia REQUIRED)
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    find_package(QT NAMES Qt6 Qt5 COMPONENTS X11Extras REQUIRED)
-    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS X11Extras REQUIRED)
+set(qt_required_components Widgets Network Multimedia)
+
+if (QT_DESIRED_VERSION MATCHES 6)
+    # list(APPEND qt_required_components Core5Compat)
+    list(APPEND qt_required_components OpenGL)
+    list(APPEND qt_required_components OpenGLWidgets)
+else()
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        list(APPEND qt_required_components X11Extras )
+    endif()
+endif()
+
+find_package(Qt${QT_DESIRED_VERSION} REQUIRED COMPONENTS ${qt_required_components})
+
+set(LINK_LIBS
+    Qt${QT_DESIRED_VERSION}::Widgets
+    Qt${QT_DESIRED_VERSION}::Network
+    Qt${QT_DESIRED_VERSION}::Multimedia
+)
+
+if (QT_DESIRED_VERSION MATCHES 6)
+    # list(APPEND LINK_LIBS Qt${QT_DESIRED_VERSION}::Core5Compat)
+    list(APPEND LINK_LIBS Qt${QT_DESIRED_VERSION}::GuiPrivate)
+    list(APPEND LINK_LIBS Qt${QT_DESIRED_VERSION}::OpenGL)
+    list(APPEND LINK_LIBS Qt${QT_DESIRED_VERSION}::OpenGLWidgets)
+else()
+    if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+        list(APPEND LINK_LIBS Qt${QT_DESIRED_VERSION}::X11Extras)
+    endif()
 endif()
 
-message(STATUS "[${PROJECT_NAME}] Qt version is: ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}")
+message(STATUS "[${PROJECT_NAME}] Qt version is: ${QT_DESIRED_VERSION}")
 
 #
 # Sources
@@ -312,8 +343,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package(Threads REQUIRED)
 
     target_link_libraries(${PROJECT_NAME} PRIVATE
-        # qx11
-        Qt${QT_VERSION_MAJOR}::X11Extras
         # xcb https://doc.qt.io/qt-5/linux-requirements.html
         xcb
         # pthread
@@ -331,8 +360,6 @@ add_subdirectory(QtScrcpyCore)
 
 # Qt
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    Qt${QT_VERSION_MAJOR}::Widgets
-    Qt${QT_VERSION_MAJOR}::Network
-    Qt${QT_VERSION_MAJOR}::Multimedia
+    ${LINK_LIBS}
     QtScrcpyCore
 )

QtScrcpy/audio/audiooutput.cpp

@@ -4,11 +4,23 @@
 #include <QTime>
 #include <QElapsedTimer>
 
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#include <QAudioSink>
+#include <QAudioDevice>
+#include <QMediaDevices>
+#endif
+
 #include "audiooutput.h"
 
 AudioOutput::AudioOutput(QObject *parent)
     : QObject(parent)
 {
+    m_running = false;
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    m_audioOutput = nullptr;
+#else
+    m_audioSink = nullptr;
+#endif
     connect(&m_sndcpy, &QProcess::readyReadStandardOutput, this, [this]() {
         qInfo() << QString("AudioOutput::") << QString(m_sndcpy.readAllStandardOutput());
     });
@@ -69,15 +81,10 @@ bool AudioOutput::runSndcpyProcess(const QString &serial, int port, bool wait)
     }
 
 #ifdef Q_OS_WIN32
-    QStringList params;
-    params << serial;
-    params << QString("%1").arg(port);
+    QStringList params{serial, QString::number(port)};
     m_sndcpy.start("sndcpy.bat", params);
 #else
-    QStringList params;
-    params << "sndcpy.sh";
-    params << serial;
-    params << QString("%1").arg(port);
+    QStringList params{"sndcpy.sh", serial, QString::number(port)};
     m_sndcpy.start("bash", params);
 #endif
 
@@ -86,11 +93,11 @@ bool AudioOutput::runSndcpyProcess(const QString &serial, int port, bool wait)
     }
 
     if (!m_sndcpy.waitForStarted()) {
-        qWarning() << "AudioOutput::start sndcpy.bat failed";
+        qWarning() << "AudioOutput::start sndcpy process failed";
         return false;
     }
     if (!m_sndcpy.waitForFinished()) {
-        qWarning() << "AudioOutput::sndcpy.bat crashed";
+        qWarning() << "AudioOutput::sndcpy process crashed";
         return false;
     }
 
@@ -99,6 +106,7 @@ bool AudioOutput::runSndcpyProcess(const QString &serial, int port, bool wait)
 
 void AudioOutput::startAudioOutput()
 {
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     if (m_audioOutput) {
         return;
     }
@@ -110,8 +118,8 @@ void AudioOutput::startAudioOutput()
     format.setCodec("audio/pcm");
     format.setByteOrder(QAudioFormat::LittleEndian);
     format.setSampleType(QAudioFormat::SignedInt);
-
     QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
+
     if (!info.isFormatSupported(format)) {
         qWarning() << "AudioOutput::audio format not supported, cannot play audio.";
         return;
@@ -123,17 +131,47 @@ void AudioOutput::startAudioOutput()
     });
     m_audioOutput->setBufferSize(48000*2*15/1000 * 20);
     m_outputDevice = m_audioOutput->start();
+#else
+    if (m_audioSink) {
+        return;
+    }
+
+    QAudioFormat format;
+    format.setSampleRate(48000);
+    format.setChannelCount(2);
+    format.setSampleFormat(QAudioFormat::Int16);
+    QAudioDevice defaultDevice = QMediaDevices::defaultAudioOutput();
+    if (!defaultDevice.isFormatSupported(format)) {
+        qWarning() << "AudioOutput::audio format not supported, cannot play audio.";
+        return;
+    }
+    m_audioSink = new QAudioSink(defaultDevice, format, this);
+    m_outputDevice = m_audioSink->start();
+    if (!m_outputDevice) {
+        qWarning() << "AudioOutput::audio output device not available, cannot play audio.";
+        delete m_audioSink;
+        m_audioSink = nullptr;
+        return;
+    }
+#endif
 }
 
 void AudioOutput::stopAudioOutput()
 {
-    if (!m_audioOutput) {
-        return;
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    if (m_audioOutput) {
+        m_audioOutput->stop();
+        delete m_audioOutput;
+        m_audioOutput = nullptr;
     }
-
-    m_audioOutput->stop();
-    delete m_audioOutput;
-    m_audioOutput = nullptr;
+#else
+    if (m_audioSink) {
+        m_audioSink->stop();
+        delete m_audioSink;
+        m_audioSink = nullptr;
+    }
+#endif
+    m_outputDevice = nullptr;
 }
 
 void AudioOutput::startRecvData(int port)
@@ -165,7 +203,7 @@ void AudioOutput::startRecvData(int port)
             m_buffer.reserve(recv);
         }
 
-        qint64 count = audioSocket->read(m_buffer.data(), audioSocket->bytesAvailable());
+        qint64 count = audioSocket->read(m_buffer.data(), recv);
         m_outputDevice->write(m_buffer.data(), count);
     });
     connect(audioSocket, &QTcpSocket::stateChanged, audioSocket, [](QAbstractSocket::SocketState state) {

QtScrcpy/audio/audiooutput.h

@@ -6,6 +6,7 @@
 #include <QPointer>
 #include <QVector>
 
+class QAudioSink;
 class QAudioOutput;
 class QIODevice;
 class AudioOutput : public QObject
@@ -30,12 +31,16 @@ class AudioOutput : public QObject
     void connectTo(int port);
 
 private:
-    QAudioOutput* m_audioOutput = nullptr;
     QPointer<QIODevice> m_outputDevice;
     QThread m_workerThread;
     QProcess m_sndcpy;
     QVector<char> m_buffer;
     bool m_running = false;
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    QAudioOutput* m_audioOutput = nullptr;
+#else
+    QAudioSink *m_audioSink = nullptr;
+#endif
 };
 
 #endif // AUDIOOUTPUT_H

QtScrcpy/main.cpp

@@ -55,10 +55,12 @@ int main(int argc, char *argv[])
         QApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
     }
 
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5,14,0))
     QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+#endif
 #endif
 
     QSurfaceFormat varFormat = QSurfaceFormat::defaultFormat();
@@ -142,7 +144,10 @@ void installTranslator()
         break;
     }
 
-    translator.load(languagePath);
+    auto loaded = translator.load(languagePath);
+    if (!loaded) {
+        qWarning() << "Failed to load translation file:" << languagePath;
+    }
     qApp->installTranslator(&translator);
 }
 

QtScrcpy/ui/dialog.cpp

@@ -618,9 +618,18 @@ void Dialog::on_usbConnectBtn_clicked()
 
 int Dialog::findDeviceFromeSerialBox(bool wifi)
 {
-    QRegExp regIP("\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\:([0-9]|[1-9]\\d|[1-9]\\d{2}|[1-9]\\d{3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])\\b");
+    QString regStr = "\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\:([0-9]|[1-9]\\d|[1-9]\\d{2}|[1-9]\\d{3}|[1-5]\\d{4}|6[0-4]\\d{3}|65[0-4]\\d{2}|655[0-2]\\d|6553[0-5])\\b";
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    QRegExp regIP(regStr);
+#else
+    QRegularExpression regIP(regStr);
+#endif
     for (int i = 0; i < ui->serialBox->count(); ++i) {
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         bool isWifi = regIP.exactMatch(ui->serialBox->itemText(i));
+#else
+        bool isWifi = regIP.match(ui->serialBox->itemText(i)).hasMatch();
+#endif
         bool found = wifi ? isWifi : !isWifi;
         if (found) {
             return i;

QtScrcpy/ui/toolform.cpp

@@ -68,7 +68,11 @@ void ToolForm::updateGroupControl()
 void ToolForm::mousePressEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton) {
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         m_dragPosition = event->globalPos() - frameGeometry().topLeft();
+#else
+        m_dragPosition = event->globalPosition().toPoint() - frameGeometry().topLeft();
+#endif
         event->accept();
     }
 }
@@ -81,7 +85,11 @@ void ToolForm::mouseReleaseEvent(QMouseEvent *event)
 void ToolForm::mouseMoveEvent(QMouseEvent *event)
 {
     if (event->buttons() & Qt::LeftButton) {
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         move(event->globalPos() - m_dragPosition);
+#else
+        move(event->globalPosition().toPoint() - m_dragPosition);
+#endif
         event->accept();
     }
 }