diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/activeqt/container/qaxwidget.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index a2a0d41..aefa1e7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.7.1 +MODULE_VERSION = 5.8.0 diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp index bdc6e1d..8c74159 100644 --- a/src/activeqt/container/qaxwidget.cpp +++ b/src/activeqt/container/qaxwidget.cpp @@ -1798,7 +1798,8 @@ void QAxHostWidget::paintEvent(QPaintEvent*) pm.fill(); HBITMAP hBmp = qt_pixmapToWinHBITMAP(pm); - HDC hBmp_hdc = CreateCompatibleDC(qt_win_display_dc()); + const HDC displayDc = GetDC(0); + HDC hBmp_hdc = CreateCompatibleDC(displayDc); HGDIOBJ old_hBmp = SelectObject(hBmp_hdc, hBmp); RECTL bounds; @@ -1818,6 +1819,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*) SelectObject(hBmp_hdc, old_hBmp); DeleteObject(hBmp); DeleteDC(hBmp_hdc); + ReleaseDC(0, displayDc); } /*! |