diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-30 08:28:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-30 09:16:58 +0100 |
| commit | 87204c856ae3d8495c41af998ac196a12fe1c779 (patch) | |
| tree | 5af64eaa3acde506d19fe4ab1c88b028a2197adf /src/widgets/widgets | |
| parent | 498ef7f9d77fca75bcba2f657aaac38c8dc78aea (diff) | |
| parent | d0812cbdabcff4d388334c499c23992cce98d4da (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/thread/qsemaphore.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qtoolbar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 1c6d41ee2f..a00557c34e 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -1119,6 +1119,8 @@ static bool waitForPopup(QToolBar *tb, QWidget *popup) static void enableMacToolBar(QToolBar *toolbar, bool enable) { QPlatformNativeInterface *nativeInterface = QApplication::platformNativeInterface(); + if (!nativeInterface) + return; QPlatformNativeInterface::NativeResourceForIntegrationFunction function = nativeInterface->nativeResourceFunctionForIntegration("setContentBorderAreaEnabled"); if (!function) |