diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 12:52:37 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-13 21:34:03 +0100 |
| commit | 07c86351a78cff4af8d78ed232916147fd181d3f (patch) | |
| tree | 31e84146da3ce50cf51e7216a6909eb8784bb449 | |
| parent | bab48c6ea302ed05c8bb25027069d30ee2b3eb6d (diff) | |
| download | qtactiveqt-07c86351a78cff4af8d78ed232916147fd181d3f.tar.gz | |
Fix CMake Unity (Jumbo) builds
Use the new headers to get the Windows image conversion functions.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I34cc05865c1fa1305a1cbca96a0c47525288639c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 4 | ||||
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 3 | ||||
| -rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index 80a6ab4..76ac6d9 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -25,6 +25,7 @@ #include <quuid.h> #include <qwhatsthis.h> #include <qabstractnativeeventfilter.h> +#include <private/qpixmap_win_p.h> #include <windowsx.h> #include <ocidl.h> @@ -1800,9 +1801,6 @@ void QAxHostWidget::focusOutEvent(QFocusEvent *e) axhost->m_spInPlaceObject->UIDeactivate(); } -Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); -Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); - void QAxHostWidget::paintEvent(QPaintEvent*) { // QWidget having redirected paint device indicates non-regular paint, which implies diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 0800cd9..ff07664 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -28,6 +28,7 @@ #include <olectl.h> #include <private/qcoreapplication_p.h> #include <qwindow.h> +#include <private/qpixmap_win_p.h> #include <qpa/qplatformnativeinterface.h> #include <qabstractnativeeventfilter.h> @@ -3102,8 +3103,6 @@ HRESULT WINAPI QAxServerBase::Save(LPCOLESTR fileName, BOOL fRemember) return E_FAIL; } -Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); - //**** IViewObject /* Draws the widget into the provided device context. diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index 83845b9..ecf6acd 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -15,6 +15,7 @@ #include <qcursor.h> #include <qpixmap.h> #include <qpainter.h> +#include <private/qpixmap_win_p.h> #include <qobject.h> #include <qdebug.h> #ifdef QAX_SERVER @@ -94,9 +95,6 @@ static QFont IFontToQFont(IFont *f) return font; } -Q_GUI_EXPORT HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &p, int hbitmapFormat = 0); -Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); - static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap) { IPictureDisp *pic = nullptr; |