diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:01:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 03:54:56 +0200 |
| commit | cb72077e562a5a53e52f7ac94b0c3c26320c6242 (patch) | |
| tree | 24327b6aa3234e1b3d0865204a455a0ebb3e3cb8 /src/designer/src/designer/qdesigner_workbench.cpp | |
| parent | e2bb989e237da8479a2dca647e3420861ad526e2 (diff) | |
| parent | bda7ece99a8162118a91e9f475c149be39846ecd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/designer/src/designer/qdesigner.cpp
One side changed Q_OS_MAC -> Q_OS_MACOS;
the other changed it to Q_OS_OSX and combined with Q_OS_WIN.
Kept the latter.
tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result
One side added some XML next to where another made a local change.
Change-Id: I812b55fbaccc85baa9856aedf90f9258428dfcab
Diffstat (limited to 'src/designer/src/designer/qdesigner_workbench.cpp')
| -rw-r--r-- | src/designer/src/designer/qdesigner_workbench.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index 27eeb88d7..570815ec8 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -322,7 +322,7 @@ Qt::WindowFlags QDesignerWorkbench::magicalWindowFlags(const QWidget *widgetForF { switch (m_mode) { case TopLevelMode: { -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS if (qobject_cast<const QDesignerToolWindow *>(widgetForFlags)) return Qt::Tool; #else @@ -384,7 +384,7 @@ void QDesignerWorkbench::switchToNeutralMode() fw->setMaximumSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); } -#ifndef Q_OS_MAC +#ifndef Q_OS_MACOS m_globalMenuBar->setParent(0); #endif @@ -402,14 +402,14 @@ void QDesignerWorkbench::switchToDockedMode() switchToNeutralMode(); -#if !defined(Q_OS_MAC) +#if !defined(Q_OS_MACOS) # if defined(Q_OS_UNIX) QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, false); # endif // Q_OS_UNIX QDesignerToolWindow *widgetBoxWrapper = widgetBoxToolWindow(); widgetBoxWrapper->action()->setVisible(true); widgetBoxWrapper->setWindowTitle(tr("Widget Box")); -#endif // !Q_OS_MAC +#endif // !Q_OS_MACOS m_mode = DockedMode; const QDesignerSettings settings(m_core); @@ -426,7 +426,7 @@ void QDesignerWorkbench::switchToDockedMode() m_core->setTopLevel(m_dockedMainWindow); -#ifndef Q_OS_MAC +#ifndef Q_OS_MACOS m_dockedMainWindow->setMenuBar(m_globalMenuBar); m_globalMenuBar->show(); #endif @@ -475,7 +475,7 @@ void QDesignerWorkbench::switchToTopLevelMode() // The widget box is special, it gets the menubar and gets to be the main widget. m_core->setTopLevel(widgetBoxWrapper); -#if !defined(Q_OS_MAC) +#if !defined(Q_OS_MACOS) # if defined(Q_OS_UNIX) // For now the appmenu protocol does not make it possible to associate a // menubar with all application windows. This means in top level mode you @@ -489,7 +489,7 @@ void QDesignerWorkbench::switchToTopLevelMode() widgetBoxWrapper->setCloseEventPolicy(MainWindowBase::EmitCloseEventSignal); qDesigner->setMainWindow(widgetBoxWrapper); widgetBoxWrapper->setWindowTitle(MainWindowBase::mainWindowTitle()); -#endif // !Q_OS_MAC +#endif // !Q_OS_MACOS const QDesignerSettings settings(m_core); m_topLevelData.toolbars = MainWindowBase::createToolBars(m_actionManager, false); |