diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-13 01:05:02 +0200 |
commit | 6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch) | |
tree | 545dac994ef985cc91d92fa77da21581b6762c86 /src/widgets/widgets/qmainwindow.cpp | |
parent | d04982dc84d66bec92b4b3767538676cf925ef17 (diff) | |
parent | d9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/global/qglobal.cpp
src/corelib/io/qsettings.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/widgets/widgets/qmainwindow.cpp')
-rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index f7d4f780ac..5f7cfec5af 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -1547,7 +1547,7 @@ bool QMainWindow::event(QEvent *event) /*! \property QMainWindow::unifiedTitleAndToolBarOnMac - \brief whether the window uses the unified title and toolbar look on OS X + \brief whether the window uses the unified title and toolbar look on \macos Note that the Qt 5 implementation has several limitations compared to Qt 4: \list |