diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-01 10:27:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-02 09:24:11 +0100 |
| commit | d7e4980132057aa10e54137114bf65e06c455030 (patch) | |
| tree | 9d6ae36efa0cf84a612bfec6cf3dd2ea7f7e3446 /src/gui/kernel/qsurfaceformat.cpp | |
| parent | 44c402b4bfba44480382244b8409fb3cf34d7ac1 (diff) | |
| parent | a732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/mac/sdk.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/sdk.prf
src/angle/src/libEGL/libEGL.pro
src/platformsupport/fontdatabases/fontdatabases.pro
src/platformsupport/platformsupport.pro
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
tests/auto/widgets/widgets/qmenubar/BLACKLIST
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c
Diffstat (limited to 'src/gui/kernel/qsurfaceformat.cpp')
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index d7dc0faceb..000d727380 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -41,6 +41,8 @@ #include <QtCore/qatomic.h> #include <QtCore/QDebug> +#include <QOpenGLContext> +#include <QtGui/qguiapplication.h> #ifdef major #undef major @@ -761,6 +763,16 @@ Q_GLOBAL_STATIC(QSurfaceFormat, qt_default_surface_format) */ void QSurfaceFormat::setDefaultFormat(const QSurfaceFormat &format) { +#ifndef QT_NO_OPENGL + if (qApp) { + QOpenGLContext *globalContext = QOpenGLContext::globalShareContext(); + if (globalContext && globalContext->isValid()) { + qWarning("Warning: Setting a new default format with a different version or profile " + "after the global shared context is created may cause issues with context " + "sharing."); + } + } +#endif *qt_default_surface_format() = format; } |