diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qaction.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index c0e3e98ae1..6713e78cfc 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -261,7 +261,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) /*! \enum QAction::MenuRole - This enum describes how an action should be moved into the application menu on Mac OS X. + This enum describes how an action should be moved into the application menu on OS X. \value NoRole This action should not be put into the application menu \value TextHeuristicRole This action should be put in the application menu based on the action's text @@ -270,7 +270,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) \value AboutQtRole This action matches handles the "About Qt" menu item. \value AboutRole This action should be placed where the "About" menu item is in the application menu. The text of the menu item will be set to "About <application name>". The application name is fetched from the - \c{Info.plist} file in the application's bundle (See \l{Qt for Mac OS X - Deployment}). + \c{Info.plist} file in the application's bundle (See \l{Qt for OS X - Deployment}). \value PreferencesRole This action should be placed where the "Preferences..." menu item is in the application menu. \value QuitRole This action should be placed where the Quit menu item is in the application menu. @@ -1247,7 +1247,7 @@ void QAction::activate(ActionEvent event) the action is added based on its text (see QMenuBar for more information). The menu role can only be changed before the actions are put into the menu - bar in Mac OS X (usually just before the first application window is + bar in OS X (usually just before the first application window is shown). */ void QAction::setMenuRole(MenuRole menuRole) diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index f523ac2777..bafce96c29 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -616,15 +616,15 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti for items in the menu bar are only shown when the \uicontrol{Alt} key is pressed. - \section1 QMenuBar on Mac OS X + \section1 QMenuBar on OS X - QMenuBar on Mac OS X is a wrapper for using the system-wide menu bar. + QMenuBar on OS X is a wrapper for using the system-wide menu bar. If you have multiple menu bars in one dialog the outermost menu bar (normally inside a widget with widget flag Qt::Window) will be used for the system-wide menu bar. - Qt for Mac OS X also provides a menu bar merging feature to make - QMenuBar conform more closely to accepted Mac OS X menu bar layout. + Qt for OS X also provides a menu bar merging feature to make + QMenuBar conform more closely to accepted OS X menu bar layout. The merging functionality is based on string matching the title of a QMenu entry. These strings are translated (using QObject::tr()) in the "QMenuBar" context. If an entry is moved its slots will still @@ -663,7 +663,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \b{Note:} The text used for the application name in the menu bar is obtained from the value set in the \c{Info.plist} file in - the application's bundle. See \l{Qt for Mac OS X - Deployment} + the application's bundle. See \l{Qt for OS X - Deployment} for more information. \section1 QMenuBar on Windows CE @@ -908,7 +908,7 @@ void QMenuBar::setActiveAction(QAction *act) /*! Removes all the actions from the menu bar. - \note On Mac OS X, menu items that have been merged to the system + \note On OS X, menu items that have been merged to the system menu bar are not removed by this function. One way to handle this would be to remove the extra actions yourself. You can set the \l{QAction::MenuRole}{menu role} on the different menus, so that @@ -1806,7 +1806,7 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const \since 4.6 This property specifies whether or not the menubar should be used as a native menubar on platforms - that support it. The currently supported platforms are Mac OS X and Windows CE. On these platforms + that support it. The currently supported platforms are OS X and Windows CE. On these platforms if this property is \c true, the menubar is used in the native menubar and is not in the window of its parent, if false the menubar remains in the window. On other platforms the value of this attribute has no effect. |