diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 14:51:20 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 14:51:20 (GMT) |
| commit | 1c313a529ff0893c43c3ccaabe92c4e015acf891 (patch) | |
| tree | 4e9b735c04e6579763474dd844eef13a8985ac64 /src/gui/widgets/qmainwindow.cpp | |
| parent | 7750f3821c7cd526c33bfa09378378da3980a2e6 (diff) | |
| parent | 81bc22dbd71e2dd0e25156e753afc6d94d808de9 (diff) | |
| download | Qt-1c313a529ff0893c43c3ccaabe92c4e015acf891.zip Qt-1c313a529ff0893c43c3ccaabe92c4e015acf891.tar.gz Qt-1c313a529ff0893c43c3ccaabe92c4e015acf891.tar.bz2 | |
Merge branch '4.6' into lighthouse
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qwidget.cpp
Diffstat (limited to 'src/gui/widgets/qmainwindow.cpp')
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 0947e1b..501e62f 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -119,7 +119,7 @@ void QMainWindowPrivate::init() q->setAttribute(Qt::WA_Hover); #ifdef QT_SOFTKEYS_ENABLED menuBarAction = QSoftKeyManager::createAction(QSoftKeyManager::MenuSoftKey, q); - menuBarAction->setObjectName("_q_menuSoftKeyAction"); + menuBarAction->setObjectName(QLatin1String("_q_menuSoftKeyAction")); #endif } @@ -933,7 +933,7 @@ static bool checkDockWidgetArea(Qt::DockWidgetArea area, const char *where) } #ifndef QT_NO_TABBAR -/*! +/*! \property QMainWindow::documentMode \brief whether the tab bar for tabbed dockwidgets is set to document mode. \since 4.5 @@ -954,7 +954,7 @@ void QMainWindow::setDocumentMode(bool enabled) #endif // QT_NO_TABBAR #ifndef QT_NO_TABWIDGET -/*! +/*! \property QMainWindow::tabShape \brief the tab shape used for tabbed dock widgets. \since 4.5 |