sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Qt Extras modules have been removed from Qt6

Browse Source 
https://www.qt.io/blog/qt-extras-modules-in-qt-6
This commit is contained in:
Matthias Kuhn 2022-08-27 13:40:27 +02:00 committed by Nyall Dawson
parent 5393b8b0d9
commit cb612aafe2
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -481,9 +481,6 @@ if(WITH_CORE)
find_package(${QT_VERSION_BASE} COMPONENTS 3DCore 3DRender 3DInput 3DLogic 3DExtras REQUIRED) find_package(${QT_VERSION_BASE} COMPONENTS 3DCore 3DRender 3DInput 3DLogic 3DExtras REQUIRED)
set(HAVE_3D TRUE) # used in qgsconfig.h set(HAVE_3D TRUE) # used in qgsconfig.h
endif() endif()
if (APPLE)
find_package(${QT_VERSION_BASE} COMPONENTS MacExtras REQUIRED)
endif()
# get the Qt plugins directory # get the Qt plugins directory
get_target_property(QMAKE_EXECUTABLE ${QT_VERSION_BASE}::qmake LOCATION) get_target_property(QMAKE_EXECUTABLE ${QT_VERSION_BASE}::qmake LOCATION)
@ -498,7 +495,7 @@ if(WITH_CORE)
endif() endif()
if (WITH_QUICK) if (WITH_QUICK)
find_package(${QT_VERSION_BASE} COMPONENTS Qml Quick REQUIRED) find_package(${QT_VERSION_BASE} COMPONENTS Qml Quick REQUIRED)
if(${CMAKE_SYSTEM_NAME} MATCHES "Android") if(${CMAKE_SYSTEM_NAME} MATCHES "Android" AND NOT BUILD_WITH_QT6)
find_package(${QT_VERSION_BASE} COMPONENTS AndroidExtras) find_package(${QT_VERSION_BASE} COMPONENTS AndroidExtras)
endif() endif()

4
mac/cmake/1qt.cmake.in
View File

@ -16,8 +16,8 @@ SET (QT_FWVER "5")
# build list of Qt frameworks to bundle # build list of Qt frameworks to bundle
# core list, includes dependencies and used by extra plugins # core list, includes dependencies and used by extra plugins
SET (QTLISTQG QtCore QtGui QtWidgets QtNetwork QtXml QtSvg QtConcurrent QtPrintSupport QtSerialPort QtPositioning QtTest QtSql QtMacExtras QtDBus) SET (QTLISTQG QtCore QtGui QtWidgets QtNetwork QtXml QtSvg QtConcurrent QtPrintSupport QtSerialPort QtPositioning QtTest QtSql QtDBus)
SET (PYQTLIST Qt QtCore QtGui QtWidgets QtNetwork QtXml QtSvg QtPrintSupport QtPositioning QtSerialPort QtTest QtSql QtMacExtras QtDBus) SET (PYQTLIST Qt QtCore QtGui QtWidgets QtNetwork QtXml QtSvg QtPrintSupport QtPositioning QtSerialPort QtTest QtSql QtDBus)
# QtQuickWidgets appears to be implied direct dep, it needs Quick and Qml, # QtQuickWidgets appears to be implied direct dep, it needs Quick and Qml,
# whether or not WITH_QUICK specified # whether or not WITH_QUICK specified

6
src/native/CMakeLists.txt
View File

@ -144,12 +144,6 @@ if (UNIX AND NOT APPLE AND NOT ANDROID)
target_link_libraries(qgis_native ${QT_VERSION_BASE}::DBus) target_link_libraries(qgis_native ${QT_VERSION_BASE}::DBus)
endif() endif()
if (APPLE)
find_package(${QT_VERSION_BASE}MacExtras)
target_link_libraries(qgis_native ${QT_VERSION_BASE}::MacExtras)
endif()
if (MSVC) if (MSVC)
find_package(${QT_VERSION_BASE}WinExtras) find_package(${QT_VERSION_BASE}WinExtras)

5
src/native/mac/qgsmacnative.mm
View File

@ -18,7 +18,6 @@
#include "qgsmacnative.h" #include "qgsmacnative.h"
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <QtMacExtras/QtMac>
#include <QString> #include <QString>
#include <QPixmap> #include <QPixmap>
@ -60,7 +59,7 @@ QgsMacNative::~QgsMacNative()
void QgsMacNative::setIconPath( const QString &iconPath ) void QgsMacNative::setIconPath( const QString &iconPath )
{ {
mQgsUserNotificationCenter->_qgisIcon = QtMac::toNSImage( QPixmap( iconPath ) ); mQgsUserNotificationCenter->_qgisIcon = [[NSImage alloc] initWithCGImage:QPixmap( iconPath ).toImage().toCGImage()];
} }
const char *QgsMacNative::currentAppLocalizedName() const char *QgsMacNative::currentAppLocalizedName()
@ -105,7 +104,7 @@ QgsNative::NotificationResult QgsMacNative::showDesktopNotification( const QStri
} }
else else
{ {
image = QtMac::toNSImage( px ); image = [[NSImage alloc] initWithCGImage:px.toImage().toCGImage()];
} }
notification.contentImage = image; notification.contentImage = image;