diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c3453129..200ecb7e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -392,7 +392,7 @@ if (WIN32) COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/windeployqt_stuff COMMAND $ENV{QTDIR}/bin/windeployqt.exe ${BINARIES_TYPE} --no-translations --compiler-runtime --no-system-d3d-compiler - --no-angle --no-webkit2 --no-quick-import --dir ${CMAKE_BINARY_DIR}/windeployqt_stuff $ + --no-quick-import --dir ${CMAKE_BINARY_DIR}/windeployqt_stuff $ # copy translations manually QM_FILES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/windeployqt_stuff/translations COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/src/translations diff --git a/src/core/flameshot.cpp b/src/core/flameshot.cpp index 05827f7f..23365f9f 100644 --- a/src/core/flameshot.cpp +++ b/src/core/flameshot.cpp @@ -52,8 +52,7 @@ Flameshot::Flameshot() // permissions on the first run. Otherwise it will be hidden under the // CaptureWidget QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen(); - // TODO: Qt 6 - QApplication::desktop() not avialable - currentScreen->grabWindow(QApplication::desktop()->winId(), 0, 0, 1, 1); + currentScreen->grabWindow(0, 0, 0, 1, 1); // set global shortcuts for MacOS m_HotkeyScreenshotCapture = new QHotkey( diff --git a/src/core/globalshortcutfilter.cpp b/src/core/globalshortcutfilter.cpp index c98b18f4..0f820b23 100644 --- a/src/core/globalshortcutfilter.cpp +++ b/src/core/globalshortcutfilter.cpp @@ -20,7 +20,7 @@ GlobalShortcutFilter::GlobalShortcutFilter(QObject* parent) bool GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType, void* message, - long* result) + qintptr *result) { Q_UNUSED(eventType) Q_UNUSED(result) diff --git a/src/core/globalshortcutfilter.h b/src/core/globalshortcutfilter.h index ac1598e3..e6dbc9de 100644 --- a/src/core/globalshortcutfilter.h +++ b/src/core/globalshortcutfilter.h @@ -16,7 +16,7 @@ public: bool nativeEventFilter(const QByteArray& eventType, void* message, - long* result); + qintptr* result); signals: void printPressed(); diff --git a/src/utils/winlnkfileparse.cpp b/src/utils/winlnkfileparse.cpp index fbd79b19..0ef962a4 100644 --- a/src/utils/winlnkfileparse.cpp +++ b/src/utils/winlnkfileparse.cpp @@ -73,7 +73,7 @@ int WinLnkFileParser::processDirectory(const QDir& dir) << "Updater" << "Windows PowerShell"; const QString sMenuFilter("\\b(" + sListMenuFilter.join('|') + ")\\b"); - QRegularExpression regexfilter(sMenuFilter); + static const QRegularExpression regexfilter(sMenuFilter); bool ok; int length = m_appList.length();