Skip to content

Instantly share code, notes, and snippets.

@torarnv

torarnv/stdin.patch

Created December 9, 2019 12:31
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save torarnv/d558710a236711eb274c03bba59704e0 to your computer and use it in GitHub Desktop.
Save torarnv/d558710a236711eb274c03bba59704e0 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
stdin.patch
diff --git i/configure w/configure
index 6657870e4b..22a7eb42fa 100755
--- i/configure
+++ w/configure
@@ -236,8 +236,8 @@ macSDKify()
if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
case "$sdk" in
- macosx*)
- version_min_flag="-mmacosx-version-min=$(getSingleQMakeVariable QMAKE_MACOSX_DEPLOYMENT_TARGET "$1")"
+ macøsx*)
+ version_min_flag="-mmacøsx-version-min=$(getSingleQMakeVariable QMAKE_MACØSX_DEPLOYMENT_TARGET "$1")"
;;
iphoneos*)
version_min_flag="-miphoneos-version-min=$(getSingleQMakeVariable QMAKE_IOS_DEPLOYMENT_TARGET "$1")"
@@ -776,7 +776,7 @@ setBootstrapVariable()
*)
cat "$in_mkfile.unix" >> "$mkfile"
if [ "$BUILD_ON_MAC" = "yes" ]; then
- cat "$in_mkfile.macos" >> "$mkfile"
+ cat "$in_mkfile.macøs" >> "$mkfile"
fi
;;
esac
diff --git i/dist/changes-4.3.0 w/dist/changes-4.3.0
index c0bcc48f06..aeb75b7c87 100644
--- i/dist/changes-4.3.0
+++ w/dist/changes-4.3.0
@@ -2000,7 +2000,7 @@ Mac OS X
* [160228] The Quartz 2D-based paint engine now respects the font style
strategy.
* Made miscellaneous changes to make wrapping non-Qt HIViews easier.
- * Qt is now built with MACOSX_DEPLOYMENT_TARGET set to 10.3 (since Qt
+ * Qt is now built with MACØSX_DEPLOYMENT_TARGET set to 10.3 (since Qt
can only be run on Mac OS X 10.3 and above).
* QSound now uses NSSound for its implementation instead of the
deprecated C QuickTime API. This means that the QtGui library is no
diff --git i/dist/changes-4.4.0 w/dist/changes-4.4.0
index 3e7d14df7a..11e10e53d7 100644
--- i/dist/changes-4.4.0
+++ w/dist/changes-4.4.0
@@ -2299,7 +2299,7 @@ Qt for Embedded Linux
- qmake
* [187938] Fix a bug that would cause Xcode projects generated by qmake to fail to link in Xcode 3.
* The pkgconfig files generated for the frameworks on Mac OS X are now correct.
- * Makefiles for Mac OS X now always set QMAKE_MACOSX_DEPLOYMENT_TARGET=10.3
+ * Makefiles for Mac OS X now always set QMAKE_MACØSX_DEPLOYMENT_TARGET=10.3
unless it is overridden in the .pro file, this will solves linking errors
on Leopard.
* [189409] The default Xcode generator format is now Xcode 2.2.
diff --git i/dist/changes-5.10.0 w/dist/changes-5.10.0
index 002b58d3b4..313df56447 100644
--- i/dist/changes-5.10.0
+++ w/dist/changes-5.10.0
@@ -349,7 +349,7 @@ QtGui
QtNetwork
---------
- - [QTBUG-56102] QSslSocket can now use a temporary keychain on macOS.
+ - [QTBUG-56102] QSslSocket can now use a temporary keychain on macØS.
- Fixed a proxy-authentication issue, after a wrong password has been used,
when supplying the right password.
diff --git i/dist/changes-5.11.0 w/dist/changes-5.11.0
index 7f3bdf4b9b..f68351ea41 100644
--- i/dist/changes-5.11.0
+++ w/dist/changes-5.11.0
@@ -37,7 +37,7 @@ Deprecation Notices
- Microsoft Visual Studio 2013 (compiler version 12.0) is no longer
supported with this Qt version.
- - macOS 10.10 is no longer supported with this Qt version.
+ - macØS 10.10 is no longer supported with this Qt version.
Third-Party Code
----------------
@@ -292,7 +292,7 @@ QtWidgets
- QStyle:
* [QTBUG-53094] Added SH_ComboBox_AllowWheelScrolling as a style hint to
enable/disable the use of the mouse wheel in a QComboBox. This
- defaults to true in all styles except the macOS one so there is no
+ defaults to true in all styles except the macØS one so there is no
change in existing behavior.
- QTextEdit/QPlainTextEdit
@@ -359,7 +359,7 @@ iOS
- [QTBUG-59042] The Apple Pencil now generates QTabletEvents, with the
complete feature set (tilt, rotation, pressure).
-macOS
+macØS
-----
- QMacStyle does no longer depend on HITheme — or Carbon for that matter.
diff --git i/dist/changes-5.11.1 w/dist/changes-5.11.1
index ed219df454..6f2c7ee145 100644
--- i/dist/changes-5.11.1
+++ w/dist/changes-5.11.1
@@ -102,7 +102,7 @@ Linux
if the file being watched did not exist. The class is documented to return
the list of files that it could not watch.
-macOS
+macØS
-----
- [QTBUG-60676] Fixed a bug in using QFileSystemWatcher to watch different
diff --git i/dist/changes-5.11.2 w/dist/changes-5.11.2
index acf8570e8e..b750156005 100644
--- i/dist/changes-5.11.2
+++ w/dist/changes-5.11.2
@@ -134,7 +134,7 @@ configure & build system
the configure command line.
- [MSVC][ICC] Fixed build with MSVC 2017 15.8.
- Fixed -L & -F being ignored by library configure tests.
- - Added support for building with Wayland on macOS.
+ - Added support for building with Wayland on macØS.
qmake
-----
diff --git i/dist/changes-5.11.3 w/dist/changes-5.11.3
index 5d13335309..12443f0e3d 100644
--- i/dist/changes-5.11.3
+++ w/dist/changes-5.11.3
@@ -87,7 +87,7 @@ information about a particular change.
headers. Currently, glibc 2.28 contains them.
****************************************************************************
-* macOS *
+* macØS *
****************************************************************************
- Offline renderers will be disabled when the application is
diff --git i/dist/changes-5.12.0 w/dist/changes-5.12.0
index 15b12b60ab..13c7edd960 100644
--- i/dist/changes-5.12.0
+++ w/dist/changes-5.12.0
@@ -221,7 +221,7 @@ information about a particular change.
* [QTBUG-59978][QTBUG-67995] Added ObjectMode coordinate mode.
- QGuiApplication:
- * [QTBUG-26413] Fixed queryKeyboardModifiers() on macOS to actually return
+ * [QTBUG-26413] Fixed queryKeyboardModifiers() on macØS to actually return
the current modifier key state.
- QImage:
@@ -280,12 +280,12 @@ information about a particular change.
* [QTBUG-17718] The OpenSSL backend can now load encrypted PKCS#8
DER-encoded keys.
* [QTBUG-59068] Added support for PKCS#8-encoded keys in the generic SSL
- back-end (used for SecureTransport on macOS and for WinRT). Note that
+ back-end (used for SecureTransport on macØS and for WinRT). Note that
it does not support keys encrypted with a PKCS#12 algorithm.
- QSslSocket:
* Enabled ALPN (and thus HTTP/2 negotiation) in SecureTransport backend
- (macOS).
+ (macØS).
* [QTBUG-69420] Implemented renegotiation for SecureTransport backend.
- SSL:
@@ -422,7 +422,7 @@ information about a particular change.
instead of trying to use Flatpak portal to select directories.
****************************************************************************
-* macOS *
+* macØS *
****************************************************************************
- QtGui:
@@ -430,7 +430,7 @@ information about a particular change.
in use.
- Text:
- * [QTBUG-69955] Fixed font weights on macOS 10.14.
+ * [QTBUG-69955] Fixed font weights on macØS 10.14.
****************************************************************************
* Windows *
diff --git i/dist/changes-5.12.1 w/dist/changes-5.12.1
index 7f1bf9dded..7001cb9471 100644
--- i/dist/changes-5.12.1
+++ w/dist/changes-5.12.1
@@ -88,7 +88,7 @@ information about a particular change.
is different from the one already contained in the model
- QSysInfo:
- * [QTBUG-72489] Now returns "Mojave" in prettyProductName() for macOS
+ * [QTBUG-72489] Now returns "Mojave" in prettyProductName() for macØS
10.14.
- QUrl:
diff --git i/dist/changes-5.12.4 w/dist/changes-5.12.4
index 781e9766b9..790f1fc3fb 100644
--- i/dist/changes-5.12.4
+++ w/dist/changes-5.12.4
@@ -71,7 +71,7 @@ information about a particular change.
- QMenu:
* Shortcuts are again shown by default in context menus, except on
- macOS. They can be forced off by setting
+ macØS. They can be forced off by setting
AA_DontShowShortcutsInContextMenus to true.
****************************************************************************
diff --git i/dist/changes-5.12.5 w/dist/changes-5.12.5
index c22839db78..378581834d 100644
--- i/dist/changes-5.12.5
+++ w/dist/changes-5.12.5
@@ -93,11 +93,11 @@ information about a particular change.
* Ignore disabled items when setting the mouse cursor.
- QSplashScreen:
- * On macOS, lower the splash screen when a modal dialog is shown to make
+ * On macØS, lower the splash screen when a modal dialog is shown to make
sure the user sees the dialog.
- QSystemTrayIcon:
- * On macOS, show the icon passed into showMessage in the notification
+ * On macØS, show the icon passed into showMessage in the notification
popup
****************************************************************************
diff --git i/dist/changes-5.13.0 w/dist/changes-5.13.0
index 2891739fa4..d47c8055c7 100644
--- i/dist/changes-5.13.0
+++ w/dist/changes-5.13.0
@@ -77,7 +77,7 @@ information about a particular change.
* [QTBUG-57180] Removed confusing DirectWrite warning when loading
bitmap fonts.
- - macOS
+ - macØS
* Accessibility: VoiceOver now reads all lines in multiline text
components when navigating by lines.
diff --git i/dist/changes-5.13.1 w/dist/changes-5.13.1
index 2021b959aa..c2a4c00936 100644
--- i/dist/changes-5.13.1
+++ w/dist/changes-5.13.1
@@ -107,7 +107,7 @@ information about a particular change.
****************************************************************************
- QSystemTrayIcon:
- * On macOS, show the icon passed into showMessage in the notification
+ * On macØS, show the icon passed into showMessage in the notification
popup
- QDateTimeEdit:
@@ -119,11 +119,11 @@ information about a particular change.
- QMenu:
* Shortcuts are again shown by default in context menus, except on
- macOS. They can be forced off by setting
+ macØS. They can be forced off by setting
AA_DontShowShortcutsInContextMenus to true.
- QSplashScreen:
- * On macOS, lower the splash screen when a modal dialog is shown to make
+ * On macØS, lower the splash screen when a modal dialog is shown to make
sure the user sees the dialog.
****************************************************************************
diff --git i/dist/changes-5.6.2 w/dist/changes-5.6.2
index af02f2a6b9..68b233e2e8 100644
--- i/dist/changes-5.6.2
+++ w/dist/changes-5.6.2
@@ -226,7 +226,7 @@ QtWidgets
without scaling.
* [QTBUG-52796] Fixed QKeySequence::MoveToStartOfLine shortcut
being ignored.
- * [QTBUG-54425] Fixed missing clear button on macOS.
+ * [QTBUG-54425] Fixed missing clear button on macØS.
- QMainWindow:
* [QTBUG-50491] Fixed a bug related to restoring dock widgets with
@@ -317,17 +317,17 @@ Linux
- Fixed the value of the 'defined' field in ATSPI GetAttributeValue
results.
-macOS
+macØS
-----
- [QTBUG-48953] Pasting text from Qt applications to Apple Mail now works.
- [QTBUG-48953] “text/vcard” is now required as the mime type when
placing vCards on the clipboard.
- - OS X => macOS rename in Q_OS_ macros/docs, qmake scopes,
+ - OS X => macØS rename in Q_OS_ macros/docs, qmake scopes,
file selectors, etc.
- Add new QSysInfo values and MAC_OS_X / __MAC_ / __IPHONE_ values for
- macOS 10.12 and iOS 9.1 through 10.0.
- - Update prettyProductName with new macOS "Sierra" codename.
+ macØS 10.12 and iOS 9.1 through 10.0.
+ - Update prettyProductName with new macØS "Sierra" codename.
Windows
-------
diff --git i/dist/changes-5.6.3 w/dist/changes-5.6.3
index 6bda3cefe4..3020a0aebd 100644
--- i/dist/changes-5.6.3
+++ w/dist/changes-5.6.3
@@ -223,7 +223,7 @@ Darwin
as well.
* [QTBUG-49893] The shortcuts bar on iPad is now hidden when showing menus.
- - macOS specific:
+ - macØS specific:
* Speech to text dictation now works for Qt text input.
* Various bug fixes to menu bar handling.
diff --git i/dist/changes-5.8.0 w/dist/changes-5.8.0
index 8d93863087..83dd67b563 100644
--- i/dist/changes-5.8.0
+++ w/dist/changes-5.8.0
@@ -377,7 +377,7 @@ iOS
dialog), the Info.plist assigned to QMAKE_INFO_PLIST will need this key
as well.
-macOS
+macØS
-----
- Speech to text dictation now works for Qt text input.
diff --git i/dist/changes-5.9.0 w/dist/changes-5.9.0
index 6d13e5c6ce..7c599e2194 100644
--- i/dist/changes-5.9.0
+++ w/dist/changes-5.9.0
@@ -30,7 +30,7 @@ information about a particular change.
anymore. That is, "[my category]" and "[mycategory]" are now two different
categories.
- [QTBUG-59849] QSysInfo::productType() and QFileSelector behavior on
- macOS was restored to match what Qt used to return in version 5.7.0 and
+ macØS was restored to match what Qt used to return in version 5.7.0 and
earlier. The behavior found in Qt 5.6.2, 5.7.1 and 5.8.0 is removed.
- [QTBUG-60771] Reverted a change that caused Qt 5.6 through 5.8 not to
connect to QSystemSemaphore and QSharedMemory created by running
@@ -59,7 +59,7 @@ Future Compatibility Notice
---------------------------
- [QTBUG-59849] The identifiers that QSysInfo::productType() and
- QFileSelector will use to identify macOS systems will change in Qt 6.0
+ QFileSelector will use to identify macØS systems will change in Qt 6.0
to match the Apple naming guidelines which will be current then.
Potentially Source-Incompatible Changes
@@ -96,7 +96,7 @@ QtCore
appropriate platform-specific value. On Windows, it defaults to the
PRODUCTVERSION parameter of the VERSIONINFO resource for classic desktop
apps, and the version attribute of the application package manifest for
- Univeral Windows Platform apps. On Apple Platforms (macOS, iOS, tvOS,
+ Univeral Windows Platform apps. On Apple Platforms (macØS, iOS, tvOS,
watchOS), it defaults to the CFBundleVersion property of the information
property list (Info.plist) file. On Android, it defaults to the
android:versionName attribute of the AndroidManifest.xml manifest
@@ -195,7 +195,7 @@ QtCore
- QSettings:
* [QTBUG-34919] Added proper support for system-wide configuration file
lookup based on XDG spec (XDG_CONFIG_DIRS) on Unix based systems.
- * [QTBUG-58531] Fixed data corruption when reading byte arrays on macOS.
+ * [QTBUG-58531] Fixed data corruption when reading byte arrays on macØS.
- QSharedPointer:
* [QTBUG-49824] Fixed undefined behavior when creating an object with
@@ -329,7 +329,7 @@ QtNetwork
* Fixed connection to international domains (IDN) by normalizing to
ASCII equivalent before comparing the host name in the certificate.
* [QTBUG-56102] Allow QSslSocket (Secure Transport back-end) to use a temporary
- keychain on macOS instead of a default one; this can be enabled via a special
+ keychain on macØS instead of a default one; this can be enabled via a special
environment variable QT_SSL_USE_TEMPORARY_KEYCHAIN (this feature is disabled
by default).
* [QTBUG-60233] QSslSocket (Secure Transport back-end) now respects CA
@@ -443,7 +443,7 @@ Linux
* [QTBUG-56306] Added experimental support for DRM dumb buffers. Enable
by setting the environment variable QT_QPA_FB_DRM to 1.
-macOS
+macØS
-----
- Extra mouse buttons are now correctly be mapped to correct Qt::MouseButton
@@ -451,7 +451,7 @@ macOS
- Accessibility:
* [QTBUG-39008][QTBUG-54776][QTBUG-56043][QTBUG-57146] A common crash in
- accessibility on macOS was fixed.
+ accessibility on macØS was fixed.
Solaris
-------
@@ -499,7 +499,7 @@ configure & build system
- [QTBUG-42937][iOS] Added support for the configure -shared flag.
- [QTBUG-56225] Re-introduced creation of config.summary.
- [QTBUG-57908][QTBUG-59062] Fixed parsing of configure --xxx options.
- - [QTBUG-57656][macOS] Fixed installation of header-only modules like
+ - [QTBUG-57656][macØS] Fixed installation of header-only modules like
QtUiPlugin in framework builds of Qt.
- [QTBUG-58321] Switching to a different qmakespec for user projects will
now properly enable C++11 support if necessary.
@@ -565,7 +565,7 @@ qmake
Suppress with CONFIG+=no_default_rpath.
- [Darwin][Xcode] QMAKE_BUNDLE_DATA now supports embedding Frameworks
and PlugIns.
- - [macOS] Support for universal binaries has been re-introduced.
+ - [macØS] Support for universal binaries has been re-introduced.
- Added the command line options -early and -late, plus -before (which is
the default) for symmetry with -after.
- The $$prompt() function will now exit qmake upon EOF on stdin.
diff --git i/dist/changes-5.9.1 w/dist/changes-5.9.1
index 4458aee89b..c33208ade0 100644
--- i/dist/changes-5.9.1
+++ w/dist/changes-5.9.1
@@ -80,7 +80,7 @@ moc
Platform Specific Changes
-------------------------
- - macOS / iOS:
+ - macØS / iOS:
* [QTBUG-41978] QCollator now respects the ignorePunctuation property on
Apple based platforms correctly.
* [QTBUG-61205] Fixed the architecture information in QSysInfo.
diff --git i/dist/changes-5.9.2 w/dist/changes-5.9.2
index 0ed88849ed..d3f6077543 100644
--- i/dist/changes-5.9.2
+++ w/dist/changes-5.9.2
@@ -136,7 +136,7 @@ QtGui
- Text:
* [QTBUG-61520] Fixed matching of non-regular font weights for
- application fonts on macOS.
+ application fonts on macØS.
QtNetwork
---------
@@ -195,7 +195,7 @@ Visual Studio
* Platform-specific Changes *
****************************************************************************
-macOS
+macØS
-----
- [QTBUG-59222] Switching focus objects inside a top level window while
diff --git i/dist/changes-5.9.4 w/dist/changes-5.9.4
index f0cc6007c2..cb450f2a1a 100644
--- i/dist/changes-5.9.4
+++ w/dist/changes-5.9.4
@@ -68,7 +68,7 @@ QtNetwork
- Bearer Management:
* [QTBUG-40332] The nativewifi (Windows) bearer plugin was determined
to be causing network interference in the form of system-wide higher
- latency and has been disabled. The CoreWlan (macOS) plugin has also
+ latency and has been disabled. The CoreWlan (macØS) plugin has also
been disabled.
- QUdpSocket:
@@ -149,13 +149,13 @@ Platform Specific Changes
* Qt will now take the safe area margins of the device into account when
computing layouts for QtWidgets.
- - macOS:
+ - macØS:
* [QTBUG-57487][QTBUG-54160] If you have changed the button mapping of
your Wacom tablet in System Preferences, it will be respected by Qt
applications now. To revert to the old behavior, set the environment
variable QT_MAC_TABLET_IGNORE_BUTTON_MAPPING.
- - macOS/iOS:
+ - macØS/iOS:
* [QTBUG-63476] Fixed an issue where text using one of the system theme
fonts would under certain circumstances display random glyphs.
diff --git i/dist/changes-5.9.6 w/dist/changes-5.9.6
index 29f5ec2d57..23adb67481 100644
--- i/dist/changes-5.9.6
+++ w/dist/changes-5.9.6
@@ -27,7 +27,7 @@ QtCore
------
- [QTBUG-61159] Fixed QStandardPaths::standardLocations() returning some
- incorrect paths on macOS.
+ incorrect paths on macØS.
- [QTBUG-57299] Fixed some issues with locking files during save using
QSaveFile if the target directory is monitored by Dropbox.
diff --git i/doc/global/config.qdocconf w/doc/global/config.qdocconf
index 16d4e5c63a..e0cdd4d032 100644
--- i/doc/global/config.qdocconf
+++ w/doc/global/config.qdocconf
@@ -13,7 +13,7 @@ navigation.hometitle = "Qt $QT_VER"
#Words to ignore for auto-linking
ignorewords += \
- macOS \
+ macØS \
WebChannel \
OpenGL
diff --git i/doc/global/includes/standardpath/functiondocs.qdocinc w/doc/global/includes/standardpath/functiondocs.qdocinc
index 4385b6446d..47297f6d2f 100644
--- i/doc/global/includes/standardpath/functiondocs.qdocinc
+++ w/doc/global/includes/standardpath/functiondocs.qdocinc
@@ -99,7 +99,7 @@
\c XDG_CONFIG_HOME is set to \c{~/.qttest/config}, and
\c XDG_CACHE_HOME is set to \c{~/.qttest/cache}.
- On macOS, data goes to \c{~/.qttest/Application Support},
+ On macØS, data goes to \c{~/.qttest/Application Support},
cache goes to \c{~/.qttest/Cache}, and config goes to
\c{~/.qttest/Preferences}.
diff --git i/doc/global/macros.qdocconf w/doc/global/macros.qdocconf
index ef3ca1dc1d..04e28764e0 100644
--- i/doc/global/macros.qdocconf
+++ w/doc/global/macros.qdocconf
@@ -10,7 +10,7 @@ macro.gui = "\\b"
macro.HR.HTML = "<hr />"
macro.iacute.HTML = "&iacute;"
macro.key = "\\b"
-macro.macos = "macOS"
+macro.macøs = "macØS"
macro.menu = "\\b"
macro.oslash.HTML = "&oslash;"
macro.ouml.HTML = "&ouml;"
diff --git i/examples/widgets/desktop/systray/doc/src/systray.qdoc w/examples/widgets/desktop/systray/doc/src/systray.qdoc
index fe397f83df..a7e6aa26a6 100644
--- i/examples/widgets/desktop/systray/doc/src/systray.qdoc
+++ w/examples/widgets/desktop/systray/doc/src/systray.qdoc
@@ -138,7 +138,7 @@
to show the message with the title, body, and icon for the time
specified in milliseconds.
- \macos users note: The Growl notification system must be
+ \macøs users note: The Growl notification system must be
installed for QSystemTrayIcon::showMessage() to display messages.
QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::}
@@ -173,7 +173,7 @@
We have reimplemented the QWidget::closeEvent() event handler to
receive widget close events, showing the above message to the
- users when they are closing the editor window. On \macos we need to
+ users when they are closing the editor window. On \macøs we need to
avoid showing the message and accepting the close event when the
user really intends to quit the application, that is, when the
user has triggered "Quit" in the menu bar or pressed the Command+Q
diff --git i/examples/widgets/doc/src/application.qdoc w/examples/widgets/doc/src/application.qdoc
index 6c37fa67bb..93fe0d4f2a 100644
--- i/examples/widgets/doc/src/application.qdoc
+++ w/examples/widgets/doc/src/application.qdoc
@@ -234,7 +234,7 @@
Just before we create the \uicontrol{Help} menu, we call
QMenuBar::addSeparator(). This has no effect for most widget
- styles (e.g., Windows and \macos styles), but for some
+ styles (e.g., Windows and \macøs styles), but for some
styles this makes sure that \uicontrol{Help} is pushed to the right
side of the menu bar.
@@ -253,7 +253,7 @@
load the user's preferences and other application settings. The
QSettings class provides a high-level interface for storing
settings permanently on disk. On Windows, it uses the (in)famous
- Windows registry; on \macos, it uses the native XML-based
+ Windows registry; on \macøs, it uses the native XML-based
CFPreferences API; on Unix/X11, it uses text files.
The QSettings constructor takes arguments that identify your
@@ -305,7 +305,7 @@
We start by opening the file in read-only mode. The QFile::Text
flag indicates that the file is a text file, not a binary file.
- On Unix and \macos, this makes no difference, but on Windows,
+ On Unix and \macøs, this makes no difference, but on Windows,
it ensures that the "\\r\\n" end-of-line sequence is converted to
"\\n" when reading.
diff --git i/examples/widgets/doc/src/classwizard.qdoc w/examples/widgets/doc/src/classwizard.qdoc
index 7f3693b65e..fa681c350b 100644
--- i/examples/widgets/doc/src/classwizard.qdoc
+++ w/examples/widgets/doc/src/classwizard.qdoc
@@ -76,7 +76,7 @@
\endlist
Although the program is just an example, if you press \uicontrol Finish
- (\uicontrol Done on \macos), actual C++ source files will actually be
+ (\uicontrol Done on \macøs), actual C++ source files will actually be
generated.
\section1 The ClassWizard Class
@@ -158,7 +158,7 @@
layouts. The \c className field is created with an asterisk (\c
*) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that
is, a field that must be filled before the user can press the
- \uicontrol Next button (\uicontrol Continue on \macos). The fields' values
+ \uicontrol Next button (\uicontrol Continue on \macøs). The fields' values
can be accessed from any other page using QWizardPage::field(),
or from the wizard code using QWizard::field().
diff --git i/examples/widgets/doc/src/findfiles.qdoc w/examples/widgets/doc/src/findfiles.qdoc
index d7428e7d16..9f241a0468 100644
--- i/examples/widgets/doc/src/findfiles.qdoc
+++ w/examples/widgets/doc/src/findfiles.qdoc
@@ -120,7 +120,7 @@
construct a \l QShortcut with \l QKeySequence::Quit, and connect it to
\l QApplication::quit(), on most platforms it will be possible to press
Control-Q to quit (or whichever standard Quit key is configured on that platform).
- (On \macos, this is redundant, because every application gets a
+ (On \macøs, this is redundant, because every application gets a
\uicontrol Quit menu item automatically; but it helps to make the application portable.)
\snippet dialogs/findfiles/window.cpp 2
diff --git i/examples/widgets/doc/src/icons.qdoc w/examples/widgets/doc/src/icons.qdoc
index 7aae0491d6..d1bec6fbab 100644
--- i/examples/widgets/doc/src/icons.qdoc
+++ w/examples/widgets/doc/src/icons.qdoc
@@ -99,7 +99,7 @@
The application allows you to manipulate the icon size with some
predefined sizes and a spin box. The predefined sizes are style
dependent, but most of the styles have the same values. Only the
- \macos style differs by using 32 pixels instead of 16 pixels
+ \macøs style differs by using 32 pixels instead of 16 pixels
for toolbar buttons. You can navigate between the available styles
using the \uicontrol View menu.
diff --git i/examples/widgets/doc/src/licensewizard.qdoc w/examples/widgets/doc/src/licensewizard.qdoc
index 30f1a876d2..da431b20d2 100644
--- i/examples/widgets/doc/src/licensewizard.qdoc
+++ w/examples/widgets/doc/src/licensewizard.qdoc
@@ -94,7 +94,7 @@
\snippet dialogs/licensewizard/licensewizard.cpp 4
We set the style to \l{QWizard::}{ModernStyle} on all platforms
- except \macos,
+ except \macøs,
\snippet dialogs/licensewizard/licensewizard.cpp 5
\snippet dialogs/licensewizard/licensewizard.cpp 6
@@ -160,7 +160,7 @@
layouts. The fields are created with an asterisk (\c
*) next to their name. This makes them \l{mandatory fields}, that
is, fields that must be filled before the user can press the
- \uicontrol Next button (\uicontrol Continue on \macos). The fields' values
+ \uicontrol Next button (\uicontrol Continue on \macøs). The fields' values
can be accessed from any other page using QWizardPage::field().
Resetting the page amounts to clearing the two text fields.
diff --git i/examples/widgets/doc/src/plugandpaint.qdoc w/examples/widgets/doc/src/plugandpaint.qdoc
index b37176da0e..c0a21e05cb 100644
--- i/examples/widgets/doc/src/plugandpaint.qdoc
+++ w/examples/widgets/doc/src/plugandpaint.qdoc
@@ -162,7 +162,7 @@
subdirectory of the Plug & Paint example. On Unix, this is just a
matter of initializing the QDir variable with
QApplication::applicationDirPath(), the path of the executable
- file, and to do a \l{QDir::cd()}{cd()}. On Windows and \macos,
+ file, and to do a \l{QDir::cd()}{cd()}. On Windows and \macøs,
this file is usually located in a subdirectory, so we need to
take this into account.
diff --git i/examples/widgets/richtext/textedit/textedit.cpp w/examples/widgets/richtext/textedit/textedit.cpp
index 85fb83ab89..0773ecf741 100644
--- i/examples/widgets/richtext/textedit/textedit.cpp
+++ w/examples/widgets/richtext/textedit/textedit.cpp
@@ -152,8 +152,8 @@ TextEdit::TextEdit(QWidget *parent)
textEdit->setFocus();
setCurrentFileName(QString());
-#ifdef Q_OS_MACOS
- // Use dark text on light background on macOS, also in dark mode.
+#ifdef Q_OS_MACØS
+ // Use dark text on light background on macØS, also in dark mode.
QPalette pal = textEdit->palette();
pal.setColor(QPalette::Base, QColor(Qt::white));
pal.setColor(QPalette::Text, QColor(Qt::black));
diff --git i/mkspecs/common/macx.conf w/mkspecs/common/macx.conf
index d16b77acb8..61143731ca 100644
--- i/mkspecs/common/macx.conf
+++ w/mkspecs/common/macx.conf
@@ -2,10 +2,10 @@
# qmake configuration for common OS X
#
-QMAKE_PLATFORM += macos osx macx
-QMAKE_MAC_SDK = macosx
+QMAKE_PLATFORM += macøs osx macx
+QMAKE_MAC_SDK = macøsx
-QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
+QMAKE_MACØSX_DEPLOYMENT_TARGET = 10.13
QMAKE_APPLE_DEVICE_ARCHS = x86_64
# Should be 10.15, but as long as the CI builds with
@@ -14,7 +14,7 @@ QT_MAC_SDK_VERSION_MIN = 10.14
QT_MAC_SDK_VERSION_MAX = 10.15
-device.sdk = macosx
+device.sdk = macøsx
device.target = device
device.dir_affix = $${device.sdk}
device.CONFIG = $${device.sdk}
diff --git i/mkspecs/darwin-g++/qmake.conf w/mkspecs/darwin-g++/qmake.conf
index 85955f7af0..99d006bc92 100644
--- i/mkspecs/darwin-g++/qmake.conf
+++ w/mkspecs/darwin-g++/qmake.conf
@@ -5,7 +5,7 @@
#
MAKEFILE_GENERATOR = UNIX
-QMAKE_PLATFORM = macos osx macx mac darwin
+QMAKE_PLATFORM = macøs osx macx mac darwin
CONFIG += native_precompiled_headers
DEFINES += __USE_WS_X11__
diff --git i/mkspecs/features/cmdline.prf w/mkspecs/features/cmdline.prf
index f9d90d3a50..a36117655a 100644
--- i/mkspecs/features/cmdline.prf
+++ w/mkspecs/features/cmdline.prf
@@ -1,2 +1,2 @@
win32: CONFIG *= console
-macos: CONFIG -= app_bundle
+macøs: CONFIG -= app_bundle
diff --git i/mkspecs/features/create_cmake.prf w/mkspecs/features/create_cmake.prf
index 346fbf2467..a335d7f9b3 100644
--- i/mkspecs/features/create_cmake.prf
+++ w/mkspecs/features/create_cmake.prf
@@ -39,13 +39,13 @@ CMAKE_INCLUDE_NAME = $$eval(QT.$${MODULE}.name)
# TARGET here is the one changed at the end of qt_module.prf,
# which already contains the Qt5 prefix and QT_LIBINFIX suffix :
# Qt5Core_{libinfix_suffix}, Qt5Network_{libinfix_suffix}, Foo_{libinfix_suffix}
-# (or QtCore_{libinfix_suffix}, Foo_{libinfix_suffix} on macos with -framework).
+# (or QtCore_{libinfix_suffix}, Foo_{libinfix_suffix} on macøs with -framework).
CMAKE_QT_STEM = $${TARGET}
# ANDROID_ABI is set by the android toolchain file, see https://developer.android.com/ndk/guides/cmake
android: CMAKE_QT_STEM = $$replace(CMAKE_QT_STEM, "_$${QT_ARCH}", '_\$\{ANDROID_ABI\}')
-# On macOS when building just a debug configuration which is not part of debug_and_release,
+# On macØS when building just a debug configuration which is not part of debug_and_release,
# $${TARGET} already contains a _debug suffix, as per the following call chain:
# qt_module.prf -> qt5LibraryTarget -> qtLibraryTarget -> qtPlatformTargetSuffix.
# Remove the _debug suffix in the stem, to keep all further uses of CMAKE_QT_STEM consistent.
@@ -149,7 +149,7 @@ if(debug_and_release:build_all)|CONFIG(release, debug|release): CMAKE_RELEASE_TY
# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
# configuration specific values. For singular builds (only release or only debug), we want the
# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
+# This would allow on Linux and macØS (and with a recent enough version of CMake on Windows) to
# build a Debug configuration of an application, even if Qt was built in a Release configuration.
#
# All IMPORTED_LOCATION_<CONFIG> paths are automatically considered by CMake if there is no
diff --git i/mkspecs/features/mac/asset_catalogs.prf w/mkspecs/features/mac/asset_catalogs.prf
index 58211c13a2..5a39bcd72a 100644
--- i/mkspecs/features/mac/asset_catalogs.prf
+++ w/mkspecs/features/mac/asset_catalogs.prf
@@ -25,7 +25,7 @@
isEmpty(QMAKE_ASSET_CATALOGS_BUILD_PATH) {
!isEmpty(QMAKE_RESOLVED_BUNDLE):equals(TEMPLATE, app):app_bundle {
- macos: \
+ macøs: \
QMAKE_ASSET_CATALOGS_BUILD_PATH = $$QMAKE_RESOLVED_BUNDLE/Contents/Resources
else: \
QMAKE_ASSET_CATALOGS_BUILD_PATH = $$QMAKE_RESOLVED_BUNDLE
@@ -50,7 +50,7 @@
}
asset_catalog_compiler.files = $$QMAKE_ASSET_CATALOGS
- macos: asset_catalog_compiler.path = Contents/Resources
+ macøs: asset_catalog_compiler.path = Contents/Resources
QMAKE_BUNDLE_DATA += asset_catalog_compiler
} else {
!isEmpty(QMAKE_ASSET_CATALOGS_APP_ICON) {
diff --git i/mkspecs/features/mac/default_post.prf w/mkspecs/features/mac/default_post.prf
index 03084c7f07..eb71f96745 100644
--- i/mkspecs/features/mac/default_post.prf
+++ w/mkspecs/features/mac/default_post.prf
@@ -163,7 +163,7 @@ macx-xcode {
QMAKE_PCH_ARCHS = $$VALID_ARCHS
- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET
+ macøs: deployment_target = $$QMAKE_MACØSX_DEPLOYMENT_TARGET
ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET
tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
diff --git i/mkspecs/features/mac/sdk.prf w/mkspecs/features/mac/sdk.prf
index 3a9c2778bb..ef637ac103 100644
--- i/mkspecs/features/mac/sdk.prf
+++ w/mkspecs/features/mac/sdk.prf
@@ -3,7 +3,7 @@ isEmpty(QMAKE_MAC_SDK): \
error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")
contains(QMAKE_MAC_SDK, .*/.*): \
- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")
+ error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macøsx, iphoneos)")
defineReplace(xcodeSDKInfo) {
info = $$1
diff --git i/mkspecs/features/moc.prf w/mkspecs/features/moc.prf
index d075183028..14d4efb1f5 100644
--- i/mkspecs/features/moc.prf
+++ w/mkspecs/features/moc.prf
@@ -27,7 +27,7 @@ win32:count(MOC_INCLUDEPATH, 40, >) {
# QNX's compiler sets "gcc" config, but does not support the -dM option;
# UIKit builds are always multi-arch due to simulator_and_device (unless
# -sdk is used) so this feature cannot possibly work.
-if(gcc|intel_icl|msvc):!rim_qcc:!uikit:!no_moc_predefs:if(!macos|count(QMAKE_APPLE_DEVICE_ARCHS, 1)) {
+if(gcc|intel_icl|msvc):!rim_qcc:!uikit:!no_moc_predefs:if(!macøs|count(QMAKE_APPLE_DEVICE_ARCHS, 1)) {
moc_predefs.name = "Generate moc_predefs.h"
moc_predefs.CONFIG = no_link
gcc: moc_predefs.commands = $$QMAKE_CXX $$QMAKE_CXXFLAGS -dM -E -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
diff --git i/mkspecs/features/qt_build_config.prf w/mkspecs/features/qt_build_config.prf
index 8273ba3fe1..f484a81f6d 100644
--- i/mkspecs/features/qt_build_config.prf
+++ w/mkspecs/features/qt_build_config.prf
@@ -89,7 +89,7 @@ android|uikit|winrt: \
CONFIG += builtin_testdata
# Prevent warnings about object files without any symbols
-macos: CONFIG += no_warn_empty_obj_files
+macøs: CONFIG += no_warn_empty_obj_files
CONFIG += \
utf8_source \
@@ -105,8 +105,8 @@ CONFIG += \
# resolved), nor functional (.res files end up in .prl files and break things).
unix: CONFIG += explicitlib
-# By default we want tests on macOS to be built as standalone executables
-macos: CONFIG += testcase_no_bundle
+# By default we want tests on macØS to be built as standalone executables
+macøs: CONFIG += testcase_no_bundle
# Override MinGW's definition in _mingw.h
mingw: DEFINES += WINVER=0x0601 _WIN32_WINNT=0x0601
diff --git i/mkspecs/features/qt_configure.prf w/mkspecs/features/qt_configure.prf
index 7ed1f7f03a..5818aa0a44 100644
--- i/mkspecs/features/qt_configure.prf
+++ w/mkspecs/features/qt_configure.prf
@@ -1213,7 +1213,7 @@ defineTest(qtConfTest_compile) {
# can work with a regular main() entry point on Windows.
qmake_configs += "console"
- # for platforms with multiple architectures (macOS, iOS, tvOS, watchOS),
+ # for platforms with multiple architectures (macØS, iOS, tvOS, watchOS),
# make sure tests are only built for a single architecture
qmake_configs += "single_arch"
diff --git i/mkspecs/features/qt_docs.prf w/mkspecs/features/qt_docs.prf
index 095bf15dac..270cd33ece 100644
--- i/mkspecs/features/qt_docs.prf
+++ w/mkspecs/features/qt_docs.prf
@@ -45,7 +45,7 @@ isEmpty(WIN_INCLUDETEMP) {
QDOC_INCLUDE_PATHS=@$$shell_quote($$WIN_INCLUDETEMP)
}
-macos: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I")
+macøs: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I")
!build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
diff --git i/mkspecs/features/spec_post.prf w/mkspecs/features/spec_post.prf
index 432bb51516..749e265c89 100644
--- i/mkspecs/features/spec_post.prf
+++ w/mkspecs/features/spec_post.prf
@@ -26,7 +26,7 @@ isEmpty(QMAKE_PLATFORM) {
equals(TARGET_PLATFORM, unix): \
QMAKE_PLATFORM = unix
else:equals(TARGET_PLATFORM, macx): \
- QMAKE_PLATFORM = macos osx macx mac darwin unix
+ QMAKE_PLATFORM = macøs osx macx mac darwin unix
else:equals(TARGET_PLATFORM, win32): \
QMAKE_PLATFORM = win32
else: \
@@ -39,9 +39,9 @@ contains(QMAKE_PLATFORM, macx) {
QMAKE_PLATFORM = osx $$QMAKE_PLATFORM
}
- !contains(QMAKE_PLATFORM, macos) {
- warning("qmake spec specifies platform macx, but not macos.")
- QMAKE_PLATFORM = macos $$QMAKE_PLATFORM
+ !contains(QMAKE_PLATFORM, macøs) {
+ warning("qmake spec specifies platform macx, but not macøs.")
+ QMAKE_PLATFORM = macøs $$QMAKE_PLATFORM
}
}
diff --git i/mkspecs/features/testcase.prf w/mkspecs/features/testcase.prf
index 7e9903d663..fdf4a5d1e5 100644
--- i/mkspecs/features/testcase.prf
+++ w/mkspecs/features/testcase.prf
@@ -14,7 +14,7 @@ cmdline: CONFIG -= app_bundle
# Allow testcases to mark themselves as not supporting high-DPI
testcase_lowdpi {
- macos {
+ macøs {
!isEmpty(QMAKE_INFO_PLIST): \
error("QMAKE_INFO_PLIST already set, can't apply testcase_lowdpi")
@@ -31,7 +31,7 @@ $${type}.files =
$${type}.path = .
# Make sure we explicitly load the debug version of the Qt libraries if needed
-macos {
+macøs {
dyld_image_suffix.name = DYLD_IMAGE_SUFFIX
dyld_image_suffix.value = $$qtPlatformTargetSuffix()
QT_TOOL_ENV += dyld_image_suffix
diff --git i/mkspecs/features/unsupported/testserver.prf w/mkspecs/features/unsupported/testserver.prf
index bca88ea2d8..e19c8f4a37 100644
--- i/mkspecs/features/unsupported/testserver.prf
+++ w/mkspecs/features/unsupported/testserver.prf
@@ -60,7 +60,7 @@ DOCKER_ENABLED = 1
equals(QMAKE_HOST.os, Darwin) {
DOCKER_ENABLED = 0
- message("Not using docker network test server on macOS, see QTQAINFRA-2717 and QTQAINFRA-2750")
+ message("Not using docker network test server on macØS, see QTQAINFRA-2717 and QTQAINFRA-2750")
}
TESTSERVER_VERSION = ""
@@ -88,7 +88,7 @@ isEmpty(TESTSERVER_VERSION) {
}
equals(QMAKE_HOST.os, Darwin) {
- # There is no docker bridge on macOS. It is impossible to ping a container.
+ # There is no docker bridge on macØS. It is impossible to ping a container.
# Docker docs recommends using port mapping to connect to a container;
# but it causes a port conflict if the user is running a service that
# binds the same port on the host. An alternative solution is to deploy
diff --git i/mkspecs/linux-icc/qmake.conf w/mkspecs/linux-icc/qmake.conf
index 75a601b1f1..d8c43e0b8c 100644
--- i/mkspecs/linux-icc/qmake.conf
+++ w/mkspecs/linux-icc/qmake.conf
@@ -27,7 +27,7 @@ QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
QMAKE_LFLAGS_VERSION_SCRIPT = -Wl,--version-script,
-# fat LTO support for Linux ICC; not available for macOS ICC, see
+# fat LTO support for Linux ICC; not available for macØS ICC, see
# https://software.intel.com/en-us/cpp-compiler-18.0-developer-guide-and-reference-ffat-lto-objects
QMAKE_CFLAGS_LTCG += -fno-fat-lto-objects
QMAKE_CXXFLAGS_LTCG += -fno-fat-lto-objects
diff --git i/mkspecs/macx-clang/Info.plist.app w/mkspecs/macx-clang/Info.plist.app
index fa592af089..a26478c12a 100644
--- i/mkspecs/macx-clang/Info.plist.app
+++ w/mkspecs/macx-clang/Info.plist.app
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<key>LSMinimumSystemVersion</key>
- <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+ <string>${MACØSX_DEPLOYMENT_TARGET}</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<key>NSPrincipalClass</key>
diff --git i/mkspecs/macx-g++/Info.plist.app w/mkspecs/macx-g++/Info.plist.app
index fa592af089..a26478c12a 100644
--- i/mkspecs/macx-g++/Info.plist.app
+++ w/mkspecs/macx-g++/Info.plist.app
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<key>LSMinimumSystemVersion</key>
- <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+ <string>${MACØSX_DEPLOYMENT_TARGET}</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<key>NSPrincipalClass</key>
diff --git i/mkspecs/macx-icc/Info.plist.app w/mkspecs/macx-icc/Info.plist.app
index fa592af089..a26478c12a 100644
--- i/mkspecs/macx-icc/Info.plist.app
+++ w/mkspecs/macx-icc/Info.plist.app
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<key>LSMinimumSystemVersion</key>
- <string>${MACOSX_DEPLOYMENT_TARGET}</string>
+ <string>${MACØSX_DEPLOYMENT_TARGET}</string>
<key>NOTE</key>
<string>This file was generated by Qt/QMake.</string>
<key>NSPrincipalClass</key>
diff --git i/mkspecs/macx-icc/qmake.conf w/mkspecs/macx-icc/qmake.conf
index 4daad497af..170f3bab92 100644
--- i/mkspecs/macx-icc/qmake.conf
+++ w/mkspecs/macx-icc/qmake.conf
@@ -1,7 +1,7 @@
#
# qmake configuration for macx-icc
#
-# Written for Intel C++ Compiler for macOS version 17.0 or higher
+# Written for Intel C++ Compiler for macØS version 17.0 or higher
#
include(../common/icc-base-unix.conf)
diff --git i/qmake/Makefile.unix w/qmake/Makefile.unix
index 4d4f05e78a..088100b8db 100644
--- i/qmake/Makefile.unix
+++ w/qmake/Makefile.unix
@@ -130,7 +130,7 @@ DEPEND_SRC = \
$(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \
$(QTSRCS) $(QTSRCS2)
# QTSRCS and QTSRCS2 come from Makefile.unix.* (concatenated with this
-# by configure); QTSRCS2 may include *.mm entries on macOS.
+# by configure); QTSRCS2 may include *.mm entries on macØS.
# See below for special handling of qlibraryinfo.cpp
CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
diff --git i/qmake/doc/src/qmake-manual.qdoc w/qmake/doc/src/qmake-manual.qdoc
index ed7fe60fdc..4ff22a823e 100644
--- i/qmake/doc/src/qmake-manual.qdoc
+++ w/qmake/doc/src/qmake-manual.qdoc
@@ -657,7 +657,7 @@
qmake knows about many of these features, which can be accessed via specific
variables that only take effect on the platforms where they are relevant.
- \section1 \macos, iOS, tvOS, and watchOS
+ \section1 \macøs, iOS, tvOS, and watchOS
Features specific to these platforms include support for creating universal
binaries, frameworks and bundles.
@@ -681,7 +681,7 @@
qmake is able to automatically generate build
rules for linking against frameworks in the standard framework directory on
- \macos, located at \c{/Library/Frameworks/}.
+ \macøs, located at \c{/Library/Frameworks/}.
Directories other than the standard framework directory need to be specified
to the build system, and this is achieved by appending linker options to the
@@ -722,13 +722,13 @@
and \l{QMAKE_FRAMEWORK_VERSION} variables. By default, the values used for
these variables are obtained from the \l{TARGET} and \l{VERSION} variables.
- See \l{Qt for macOS - Deployment} for more information about
+ See \l{Qt for macØS - Deployment} for more information about
deploying applications and libraries.
\section2 Creating and Moving Xcode Projects
- Developers on \macos can take advantage of the qmake support for Xcode
- project files, as described in \l{Qt for macOS#Additional Command-Line Options}{Qt for \macos} documentation.
+ Developers on \macøs can take advantage of the qmake support for Xcode
+ project files, as described in \l{Qt for macØS#Additional Command-Line Options}{Qt for \macøs} documentation.
by running qmake to generate an Xcode project from an existing qmake project
file. For example:
@@ -1089,7 +1089,7 @@
cross-platform applications.
\row \li cmdline \li The target is a cross-platform command line application.
On Windows, this implies \c{CONFIG += console}.
- On macOS, this implies \c{CONFIG -= app_bundle}.
+ On macØS, this implies \c{CONFIG -= app_bundle}.
\row \li shared \li{1,2} The target is a shared object/DLL. The proper
include paths, compiler flags and libraries will automatically be
added to the project. Note that \c dll can also be used on all platforms;
@@ -1123,7 +1123,7 @@
See \l{Platform Notes#Visual Studio Manifest Files}{Platform Notes}
for more information about the options for embedding manifest files.
- The following options take an effect only on \macos:
+ The following options take an effect only on \macøs:
\table
\header \li Option \li Description
@@ -1603,7 +1603,7 @@
\target QMAKE_BUNDLE_DATA
\section1 QMAKE_BUNDLE_DATA
- \note This variable is used on \macos, iOS, tvOS, and watchOS only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS only.
Specifies the data that will be installed with a library
bundle, and is often used to specify a collection of header files.
@@ -1625,7 +1625,7 @@
\section1 QMAKE_BUNDLE_EXTENSION
- \note This variable is used on \macos, iOS, tvOS, and watchOS only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS only.
Specifies the extension to be used for library bundles.
This allows frameworks to be created with custom extensions instead of the
@@ -1784,7 +1784,7 @@
\target QMAKE_DEVELOPMENT_TEAM
\section1 QMAKE_DEVELOPMENT_TEAM
- \note This variable is used on \macos, iOS, tvOS, and watchOS only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS only.
The identifier of a development team to use for signing certificates
and provisioning profiles.
@@ -1883,7 +1883,7 @@
\section1 QMAKE_FRAMEWORK_BUNDLE_NAME
- \note This variable is used on \macos, iOS, tvOS, and watchOS only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS only.
In a framework project, this variable contains the name to be used for the
framework that is built.
@@ -1897,9 +1897,9 @@
\target QMAKE_FRAMEWORK_VERSION
\section1 QMAKE_FRAMEWORK_VERSION
- \note This variable is used on \macos, iOS, tvOS, and watchOS only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS only.
- For projects where the build target is a \macos, iOS, tvOS, or watchOS
+ For projects where the build target is a \macøs, iOS, tvOS, or watchOS
framework, this variable is used to specify the version number that will be
applied to the framework that is built.
@@ -1992,10 +1992,10 @@
\target QMAKE_INFO_PLIST
\section1 QMAKE_INFO_PLIST
- \note This variable is used on \macos, iOS, tvOS, and watchOS platforms only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS platforms only.
Specifies the name of the property list file, \c{.plist}, you
- would like to include in your \macos, iOS, tvOS, and watchOS application bundle.
+ would like to include in your \macøs, iOS, tvOS, and watchOS application bundle.
In the \c{.plist} file, you can define some variables which
qmake will replace with the relevant values:
@@ -2029,8 +2029,8 @@
\li \c ${QMAKE_SHORT_VERSION}, \c @SHORT_VERSION@
\li Expands to the value of VERSION expressed with two version components.
\row
- \li \c ${MACOSX_DEPLOYMENT_TARGET}
- \li Expands to the value of QMAKE_MACOSX_DEPLOYMENT_TARGET.
+ \li \c ${MACØSX_DEPLOYMENT_TARGET}
+ \li Expands to the value of QMAKE_MACØSX_DEPLOYMENT_TARGET.
\row
\li \c ${IPHONEOS_DEPLOYMENT_TARGET}
\li Expands to the value of QMAKE_IPHONEOS_DEPLOYMENT_TARGET.
@@ -2377,7 +2377,7 @@
\target QMAKE_PROVISIONING_PROFILE
\section1 QMAKE_PROVISIONING_PROFILE
- \note This variable is used on \macos, iOS, tvOS, and watchOS only.
+ \note This variable is used on \macøs, iOS, tvOS, and watchOS only.
The UUID of a valid provisioning profile. Use in conjunction with
\l{QMAKE_DEVELOPMENT_TEAM} to specify the provisioning profile.
@@ -2387,15 +2387,15 @@
\section1 QMAKE_MAC_SDK
- This variable is used on \macos when building universal binaries.
+ This variable is used on \macøs when building universal binaries.
- \section1 QMAKE_MACOSX_DEPLOYMENT_TARGET
+ \section1 QMAKE_MACØSX_DEPLOYMENT_TARGET
- \note This variable is used on the \macos platform only.
+ \note This variable is used on the \macøs platform only.
- Specifies the hard minimum version of \macos that the application supports.
+ Specifies the hard minimum version of \macøs that the application supports.
- For more information, see \l{macOS Version Dependencies}.
+ For more information, see \l{macØS Version Dependencies}.
\section1 QMAKE_MAKEFILE
@@ -2473,7 +2473,7 @@
If defined, the value of this variable is used as a path to be prepended to
the built shared library's \c SONAME identifier. The \c SONAME is the
identifier that the dynamic linker will later use to reference the library.
- In general, this reference may be a library name or full library path. On \macos,
+ In general, this reference may be a library name or full library path. On \macøs,
iOS, tvOS, and watchOS, the path may be specified relatively using the following
placeholders:
@@ -4914,7 +4914,7 @@
\li nmake
\li Visual Studio projects (VS 2008 and later)
\endlist
- \li \macos, iOS, tvOS, and watchOS
+ \li \macøs, iOS, tvOS, and watchOS
\list
\li Makefile
\li Xcode
@@ -5290,7 +5290,7 @@
them uses project-specific variables to customize output files.
Platform-specific variables are not described here. For more information,
- see \l{Qt for Windows - Deployment} and \l{Qt for macOS}.
+ see \l{Qt for Windows - Deployment} and \l{Qt for macØS}.
\target Application
\section1 Building an Application
@@ -5438,7 +5438,7 @@
\endlist
The target file name for the library is platform-dependent. For example, on
- X11, \macos, and iOS, the library name will be prefixed by \c lib. On Windows,
+ X11, \macøs, and iOS, the library name will be prefixed by \c lib. On Windows,
no prefix is added to the file name.
\target Plugin
diff --git i/qmake/generators/mac/pbuilder_pbx.cpp w/qmake/generators/mac/pbuilder_pbx.cpp
index 24e69444c9..75447d9279 100644
--- i/qmake/generators/mac/pbuilder_pbx.cpp
+++ w/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1662,8 +1662,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
if (!project->isEmpty("COMPAT_VERSION"))
t << "\t\t\t\t" << writeSettings("DYLIB_COMPATIBILITY_VERSION", project->first("COMPAT_VERSION")) << ";\n";
- if (!project->isEmpty("QMAKE_MACOSX_DEPLOYMENT_TARGET"))
- t << "\t\t\t\t" << writeSettings("MACOSX_DEPLOYMENT_TARGET", project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET")) << ";\n";
+ if (!project->isEmpty("QMAKE_MACØSX_DEPLOYMENT_TARGET"))
+ t << "\t\t\t\t" << writeSettings("MACØSX_DEPLOYMENT_TARGET", project->first("QMAKE_MACØSX_DEPLOYMENT_TARGET")) << ";\n";
if (!project->isEmpty("QMAKE_IOS_DEPLOYMENT_TARGET"))
t << "\t\t\t\t" << writeSettings("IPHONEOS_DEPLOYMENT_TARGET", project->first("QMAKE_IOS_DEPLOYMENT_TARGET")) << ";\n";
if (!project->isEmpty("QMAKE_TVOS_DEPLOYMENT_TARGET"))
diff --git i/qmake/generators/unix/unixmake2.cpp w/qmake/generators/unix/unixmake2.cpp
index 550fa9d834..f4d8e29b31 100644
--- i/qmake/generators/unix/unixmake2.cpp
+++ w/qmake/generators/unix/unixmake2.cpp
@@ -792,8 +792,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
commonSedArgs << "-e \"s,@BUNDLEIDENTIFIER@," << bundleIdentifier << ",g\" ";
commonSedArgs << "-e \"s,\\$${PRODUCT_BUNDLE_IDENTIFIER}," << bundleIdentifier << ",g\" ";
- commonSedArgs << "-e \"s,\\$${MACOSX_DEPLOYMENT_TARGET},"
- << project->first("QMAKE_MACOSX_DEPLOYMENT_TARGET").toQString() << ",g\" ";
+ commonSedArgs << "-e \"s,\\$${MACØSX_DEPLOYMENT_TARGET},"
+ << project->first("QMAKE_MACØSX_DEPLOYMENT_TARGET").toQString() << ",g\" ";
commonSedArgs << "-e \"s,\\$${IPHONEOS_DEPLOYMENT_TARGET},"
<< project->first("QMAKE_IPHONEOS_DEPLOYMENT_TARGET").toQString() << ",g\" ";
commonSedArgs << "-e \"s,\\$${TVOS_DEPLOYMENT_TARGET},"
diff --git i/qmake/qmake.pro w/qmake/qmake.pro
index a9d8b58da8..04e92ab24f 100644
--- i/qmake/qmake.pro
+++ w/qmake/qmake.pro
@@ -222,7 +222,7 @@ unix {
qfilesystemiterator_unix.cpp \
qfsfileengine_unix.cpp \
qlocale_unix.cpp
- macos {
+ macøs {
SOURCES += \
qcore_foundation.mm \
qcore_mac.cpp \
diff --git i/src/3rdparty/angle/src/gpu_info_util/SystemInfo.h w/src/3rdparty/angle/src/gpu_info_util/SystemInfo.h
index ada43f0a15..0c970b2ad2 100644
--- i/src/3rdparty/angle/src/gpu_info_util/SystemInfo.h
+++ w/src/3rdparty/angle/src/gpu_info_util/SystemInfo.h
@@ -53,7 +53,7 @@ struct SystemInfo
bool isOptimus = false;
bool isAMDSwitchable = false;
- // Only available on macOS
+ // Only available on macØS
std::string machineModelName;
std::string machineModelVersion;
diff --git i/src/3rdparty/angle/src/gpu_info_util/SystemInfo_mac.mm w/src/3rdparty/angle/src/gpu_info_util/SystemInfo_mac.mm
index 7a7a62d170..e4f2a4a34c 100644
--- i/src/3rdparty/angle/src/gpu_info_util/SystemInfo_mac.mm
+++ w/src/3rdparty/angle/src/gpu_info_util/SystemInfo_mac.mm
@@ -70,7 +70,7 @@ bool GetEntryProperty(io_registry_entry_t entry, CFStringRef name, uint32_t *val
return true;
}
-// CGDisplayIOServicePort is deprecated as of macOS 10.9, but has no replacement, see
+// CGDisplayIOServicePort is deprecated as of macØS 10.9, but has no replacement, see
// https://crbug.com/650837
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
diff --git i/src/3rdparty/freetype/src/base/Jamfile w/src/3rdparty/freetype/src/base/Jamfile
index 8e1ec42756..12115e09d9 100644
--- i/src/3rdparty/freetype/src/base/Jamfile
+++ w/src/3rdparty/freetype/src/base/Jamfile
@@ -79,7 +79,7 @@ if $(MAC)
{
Library $(FT2_LIB) : ftmac.c ;
}
-else if $(OS) = MACOSX
+else if $(OS) = MACØSX
{
if $(FT2_MULTI)
{
diff --git i/src/3rdparty/freetype/src/gzip/ftzconf.h w/src/3rdparty/freetype/src/gzip/ftzconf.h
index 3abf0ba03b..1dfdf6faf6 100644
--- i/src/3rdparty/freetype/src/gzip/ftzconf.h
+++ w/src/3rdparty/freetype/src/gzip/ftzconf.h
@@ -215,7 +215,7 @@
# define FAR
#endif
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
+#if !defined(MACØS) && !defined(TARGET_OS_MAC)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
diff --git i/src/3rdparty/freetype/src/gzip/zconf.h w/src/3rdparty/freetype/src/gzip/zconf.h
index 3abf0ba03b..1dfdf6faf6 100644
--- i/src/3rdparty/freetype/src/gzip/zconf.h
+++ w/src/3rdparty/freetype/src/gzip/zconf.h
@@ -215,7 +215,7 @@
# define FAR
#endif
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
+#if !defined(MACØS) && !defined(TARGET_OS_MAC)
typedef unsigned char Byte; /* 8 bits */
#endif
typedef unsigned int uInt; /* 16 bits or more */
diff --git i/src/3rdparty/freetype/src/gzip/zutil.h w/src/3rdparty/freetype/src/gzip/zutil.h
index c9688cd9c0..d4ae21bf37 100644
--- i/src/3rdparty/freetype/src/gzip/zutil.h
+++ w/src/3rdparty/freetype/src/gzip/zutil.h
@@ -105,7 +105,7 @@ typedef unsigned long ulg;
# define OS_CODE 0x05
#endif
-#if defined(MACOS) || defined(TARGET_OS_MAC)
+#if defined(MACØS) || defined(TARGET_OS_MAC)
# define OS_CODE 0x07
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
# include <unix.h> /* for fdopen */
diff --git i/src/3rdparty/libjpeg/src/ChangeLog.md w/src/3rdparty/libjpeg/src/ChangeLog.md
index 3667d120b1..a4dd60b3d3 100644
--- i/src/3rdparty/libjpeg/src/ChangeLog.md
+++ w/src/3rdparty/libjpeg/src/ChangeLog.md
@@ -43,7 +43,7 @@ to decompress a progressive JPEG image.
1. Fixed a regression introduced by 2.0.1[5] that prevented a runtime search
path (rpath) from being embedded in the libjpeg-turbo shared libraries and
-executables for macOS and iOS. This caused a fatal error of the form
+executables for macØS and iOS. This caused a fatal error of the form
"dyld: Library not loaded" when attempting to use one of the executables,
unless `DYLD_LIBRARY_PATH` was explicitly set to the location of the
libjpeg-turbo shared libraries.
@@ -277,7 +277,7 @@ actual security issues, should they arise in the future.
algorithm that caused incorrect dithering in the output image. This algorithm
now produces bitwise-identical results to the unmerged algorithms.
-12. The SIMD function symbols for x86[-64]/ELF, MIPS/ELF, macOS/x86[-64] (if
+12. The SIMD function symbols for x86[-64]/ELF, MIPS/ELF, macØS/x86[-64] (if
libjpeg-turbo is built with YASM), and iOS/ARM[64] builds are now private.
This prevents those symbols from being exposed in applications or shared
libraries that link statically with libjpeg-turbo.
diff --git i/src/3rdparty/libpng/CHANGES w/src/3rdparty/libpng/CHANGES
index f0b0a9342c..cd779ec77a 100644
--- i/src/3rdparty/libpng/CHANGES
+++ w/src/3rdparty/libpng/CHANGES
@@ -151,7 +151,7 @@ Version 0.95 [March, 1997]
Fixed bug in PNG file signature compares when start != 0
Changed parameter type of png_set_filler(...filler...) from png_byte
to png_uint_32
- Added test for MACOS to ensure that both math.h and fp.h are not #included
+ Added test for MACØS to ensure that both math.h and fp.h are not #included
Added macros for libpng to be compiled as a Windows DLL (Andreas Kupries)
Added "packswap" transformation, which changes the endianness of
packed-pixel bytes (Kevin Bracey)
@@ -167,7 +167,7 @@ Version 0.95 [March, 1997]
obsolete for about 2 years now (use png_set_filler() instead)
Added macros to read 16- and 32-bit ints directly from buffer, to be
used only on those systems that support it (namely PowerPC and 680x0)
- With some testing, this may become the default for MACOS/PPC systems.
+ With some testing, this may become the default for MACØS/PPC systems.
Only calculate CRC on data if we are going to use it
Added macros for zTXt compression type PNG_zTXt_COMPRESSION_???
Added macros for simple libpng debugging output selectable at compile time
@@ -239,7 +239,7 @@ Version 0.99 [January 30, 1998]
example.c and libpng.txt, and changed file_gamma for sRGB images to .45
Added a number of functions to access information from the png structure
png_get_image_height(), etc. (Glenn R-P, suggestion by Brad Pettit)
- Added TARGET_MACOS similar to zlib-1.0.8
+ Added TARGET_MACØS similar to zlib-1.0.8
Define PNG_ALWAYS_EXTERN when __MWERKS__ && WIN32 are defined
Added type casting to all png_malloc() function calls
@@ -969,7 +969,7 @@ Version 1.0.9beta3 [November 23, 2000]
Revised PNG_LIBPNG_BUILD_TYPE macro in png.h, used in the msvc project.
Removed the png_flush() in pngwrite.c that crashes some applications
that don't set png_output_flush_fn.
- Added makefile.macosx and makefile.aix to scripts directory.
+ Added makefile.macøsx and makefile.aix to scripts directory.
Version 1.0.9beta4 [December 1, 2000]
Change png_chunk_warning to png_warning in png_check_keyword().
@@ -1127,7 +1127,7 @@ Version 1.2.0 [September 1, 2001]
Version 1.2.1beta1 [October 19, 2001]
Revised makefile.std in contrib/pngminus
Include background_1 in png_struct regardless of gamma support.
- Revised makefile.netbsd and makefile.macosx, added makefile.darwin.
+ Revised makefile.netbsd and makefile.macøsx, added makefile.darwin.
Revised example.c to provide more details about using row_callback().
Version 1.2.1beta2 [October 25, 2001]
@@ -1234,7 +1234,7 @@ Version 1.0.13patch01 [April 17, 2002]
Version 1.2.2patch01 [April 17, 2002]
Changed ${PNGMAJ}.${PNGVER} bug to ${PNGVER} in makefile.sgi and
makefile.sggcc
- Fixed VER -> PNGVER typo in makefile.macosx and added install-static to
+ Fixed VER -> PNGVER typo in makefile.macøsx and added install-static to
install
Added install: target to makefile.32sunu and makefile.64sunu
@@ -1320,7 +1320,7 @@ Version 1.2.4beta3 [June 28, 2002]
Plugged memory leak of row_buf in pngtest.c when there is a png_error().
Detect buffer overflow in pngpread.c when IDAT is corrupted with extra data.
Added "test-installed" target to makefile.32sunu, makefile.64sunu,
- makefile.beos, makefile.darwin, makefile.dec, makefile.macosx,
+ makefile.beos, makefile.darwin, makefile.dec, makefile.macøsx,
makefile.solaris, makefile.hpux, makefile.hpgcc, and makefile.so9.
Version 1.2.4rc1 and 1.0.14rc1 [July 2, 2002]
@@ -1361,7 +1361,7 @@ Version 1.2.5rc3 and 1.0.15rc3 [September 18, 2002]
Revised libpng-config script.
Version 1.2.5 and 1.0.15 [October 3, 2002]
- Revised makefile.macosx, makefile.darwin, makefile.hpgcc, and makefile.hpux,
+ Revised makefile.macøsx, makefile.darwin, makefile.hpgcc, and makefile.hpux,
and makefile.aix.
Relocated two misplaced PNGAPI lines in pngtest.c
@@ -1371,7 +1371,7 @@ Version 1.2.6beta1 [October 22, 2002]
Relocated two more misplaced PNGAPI lines in pngtest.c
Fixed memory overrun bug in png_do_read_filler() with 16-bit datastreams,
introduced in version 1.0.2.
- Revised makefile.macosx, makefile.dec, makefile.aix, and makefile.32sunu.
+ Revised makefile.macøsx, makefile.dec, makefile.aix, and makefile.32sunu.
Version 1.2.6beta2 [November 1, 2002]
Added libpng-config "--ldopts" output.
@@ -1464,7 +1464,7 @@ Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
Fixed some timestamps in the -config version
Rearranged order of processing of color types in png_handle_tRNS().
Added ROWBYTES macro to calculate rowbytes without integer overflow.
- Updated makefile.darwin and removed makefile.macosx from scripts directory.
+ Updated makefile.darwin and removed makefile.macøsx from scripts directory.
Imposed default one million column, one-million row limits on the image
dimensions, and added png_set_user_limits() function to override them.
Revised use of PNG_SET_USER_LIMITS_SUPPORTED macro.
@@ -1473,7 +1473,7 @@ Version 1.0.16rc1 and 1.2.6rc1 [August 4, 2004]
Revised libpng.txt to remove 1.2.x stuff from the 1.0.x distribution
Version 1.0.16rc2 and 1.2.6rc2 [August 7, 2004]
- Revised makefile.darwin and makefile.solaris. Removed makefile.macosx.
+ Revised makefile.darwin and makefile.solaris. Removed makefile.macøsx.
Revised pngtest's png_debug_malloc() to use png_malloc() instead of
png_malloc_default() which is not supposed to be exported.
Fixed off-by-one error in one of the conversions to PNG_ROWBYTES() in
diff --git i/src/3rdparty/pcre2/src/sljit/sljitExecAllocator.c w/src/3rdparty/pcre2/src/sljit/sljitExecAllocator.c
index 3b37a9751f..c873d46718 100644
--- i/src/3rdparty/pcre2/src/sljit/sljitExecAllocator.c
+++ w/src/3rdparty/pcre2/src/sljit/sljitExecAllocator.c
@@ -107,8 +107,8 @@ static SLJIT_INLINE void free_chunk(void *chunk, sljit_uw size)
static SLJIT_INLINE int get_map_jit_flag()
{
#if TARGET_OS_OSX
- /* On macOS systems, returns MAP_JIT if it is defined _and_ we're running on a version
- of macOS where it's OK to have more than one JIT block. On non-macOS systems, returns
+ /* On macØS systems, returns MAP_JIT if it is defined _and_ we're running on a version
+ of macØS where it's OK to have more than one JIT block. On non-macØS systems, returns
MAP_JIT if it is defined. */
static int map_jit_flag = -1;
diff --git i/src/3rdparty/zlib/src/ChangeLog w/src/3rdparty/zlib/src/ChangeLog
index 251a32262f..c86cd1a5d0 100644
--- i/src/3rdparty/zlib/src/ChangeLog
+++ w/src/3rdparty/zlib/src/ChangeLog
@@ -1175,7 +1175,7 @@ Changes in 1.0.8 (27 Jan 1998)
- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
- fix test for shared library support to avoid compiler warnings
- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- check for TARGET_OS_MAC in addition to MACØS (Brad Pettit)
- do not use fdopen for Metrowerks on Mac (Brad Pettit))
- add checks for gzputc and gzputc in example.c
- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
diff --git i/src/3rdparty/zlib/src/zutil.h w/src/3rdparty/zlib/src/zutil.h
index 38066137fc..9588fc6671 100644
--- i/src/3rdparty/zlib/src/zutil.h
+++ w/src/3rdparty/zlib/src/zutil.h
@@ -139,7 +139,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# endif
#endif
-#if defined(MACOS) || defined(TARGET_OS_MAC)
+#if defined(MACØS) || defined(TARGET_OS_MAC)
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
diff --git i/src/corelib/doc/snippets/code/src_corelib_global_qoperatingsystemversion.cpp w/src/corelib/doc/snippets/code/src_corelib_global_qoperatingsystemversion.cpp
index c712dfa432..d0600fffb3 100644
--- i/src/corelib/doc/snippets/code/src_corelib_global_qoperatingsystemversion.cpp
+++ w/src/corelib/doc/snippets/code/src_corelib_global_qoperatingsystemversion.cpp
@@ -56,6 +56,6 @@
auto current = QOperatingSystemVersion::current();
if (current >= QOperatingSystemVersion::OSXYosemite ||
current >= QOperatingSystemVersion(QOperatingSystemVersion::IOS, 8)) {
- // returns true on macOS >= 10.10 and iOS >= 8.0, but false on macOS < 10.10 and iOS < 8.0
+ // returns true on macØS >= 10.10 and iOS >= 8.0, but false on macØS < 10.10 and iOS < 8.0
}
//! [1]
diff --git i/src/corelib/doc/src/resource-system.qdoc w/src/corelib/doc/src/resource-system.qdoc
index 69ec5e556b..b67c406481 100644
--- i/src/corelib/doc/src/resource-system.qdoc
+++ w/src/corelib/doc/src/resource-system.qdoc
@@ -140,7 +140,7 @@
\image resources.png Building resources into an application
Currently, Qt always stores the data directly in the executable,
- even on Windows, \macos, and iOS, where the operating system provides
+ even on Windows, \macøs, and iOS, where the operating system provides
native support for resources. This might change in a future Qt
release.
diff --git i/src/corelib/global/qglobal.cpp w/src/corelib/global/qglobal.cpp
index b662233d4e..3b7fceace0 100644
--- i/src/corelib/global/qglobal.cpp
+++ w/src/corelib/global/qglobal.cpp
@@ -1187,8 +1187,8 @@ bool qSharedBuild() noexcept
\endlist
Some constants are defined only on certain platforms. You can use
- the preprocessor symbols Q_OS_WIN and Q_OS_MACOS to test that
- the application is compiled under Windows or \macos.
+ the preprocessor symbols Q_OS_WIN and Q_OS_MACØS to test that
+ the application is compiled under Windows or \macøs.
\sa QLibraryInfo
*/
@@ -1231,7 +1231,7 @@ bool qSharedBuild() noexcept
\deprecated
\fn QSysInfo::MacVersion QSysInfo::macVersion()
- Returns the version of Darwin (\macos or iOS) on which the
+ Returns the version of Darwin (\macøs or iOS) on which the
application is run, or MV_None if the operating system
is not a version of Darwin.
*/
@@ -1307,24 +1307,24 @@ bool qSharedBuild() noexcept
\enum QSysInfo::MacVersion
This enum provides symbolic names for the various versions of the
- Darwin operating system, covering both \macos and iOS. The
+ Darwin operating system, covering both \macøs and iOS. The
QSysInfo::MacintoshVersion variable gives the version of the
system on which the application is run.
- \value MV_9 \macos 9
- \value MV_10_0 \macos 10.0
- \value MV_10_1 \macos 10.1
- \value MV_10_2 \macos 10.2
- \value MV_10_3 \macos 10.3
- \value MV_10_4 \macos 10.4
- \value MV_10_5 \macos 10.5
- \value MV_10_6 \macos 10.6
- \value MV_10_7 \macos 10.7
- \value MV_10_8 \macos 10.8
- \value MV_10_9 \macos 10.9
- \value MV_10_10 \macos 10.10
- \value MV_10_11 \macos 10.11
- \value MV_10_12 \macos 10.12
+ \value MV_9 \macøs 9
+ \value MV_10_0 \macøs 10.0
+ \value MV_10_1 \macøs 10.1
+ \value MV_10_2 \macøs 10.2
+ \value MV_10_3 \macøs 10.3
+ \value MV_10_4 \macøs 10.4
+ \value MV_10_5 \macøs 10.5
+ \value MV_10_6 \macøs 10.6
+ \value MV_10_7 \macøs 10.7
+ \value MV_10_8 \macøs 10.8
+ \value MV_10_9 \macøs 10.9
+ \value MV_10_10 \macøs 10.10
+ \value MV_10_11 \macøs 10.11
+ \value MV_10_12 \macøs 10.12
\value MV_Unknown An unknown and currently unsupported platform
\value MV_CHEETAH Apple codename for MV_10_0
@@ -1381,7 +1381,7 @@ bool qSharedBuild() noexcept
\macro Q_OS_DARWIN
\relates <QtGlobal>
- Defined on Darwin-based operating systems such as \macos, iOS, watchOS, and tvOS.
+ Defined on Darwin-based operating systems such as \macøs, iOS, watchOS, and tvOS.
*/
/*!
@@ -1395,14 +1395,14 @@ bool qSharedBuild() noexcept
\macro Q_OS_OSX
\relates <QtGlobal>
- Deprecated synonym for \c Q_OS_MACOS. Do not use.
+ Deprecated synonym for \c Q_OS_MACØS. Do not use.
*/
/*!
- \macro Q_OS_MACOS
+ \macro Q_OS_MACØS
\relates <QtGlobal>
- Defined on \macos.
+ Defined on \macøs.
*/
/*!
@@ -2108,7 +2108,7 @@ QT_WARNING_POP
#ifdef Q_OS_DARWIN
static const char *osVer_helper(QOperatingSystemVersion version = QOperatingSystemVersion::current())
{
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
if (version.majorVersion() == 10) {
switch (version.minorVersion()) {
case 9:
@@ -2596,7 +2596,7 @@ QString QSysInfo::currentCpuArchitecture()
case PROCESSOR_ARCHITECTURE_IA64:
return QStringLiteral("ia64");
}
-#elif defined(Q_OS_DARWIN) && !defined(Q_OS_MACOS)
+#elif defined(Q_OS_DARWIN) && !defined(Q_OS_MACØS)
// iOS-based OSes do not return the architecture on uname(2)'s result.
return buildCpuArchitecture();
#elif defined(Q_OS_UNIX)
@@ -2727,7 +2727,7 @@ static QString unknownText()
\note This function may return surprising values: it returns "linux"
for all operating systems running Linux (including Android), "qnx" for all
operating systems running QNX, "freebsd" for
- Debian/kFreeBSD, and "darwin" for \macos and iOS. For information on the type
+ Debian/kFreeBSD, and "darwin" for \macøs and iOS. For information on the type
of product the application is running on, see productType().
\sa QFileSelector, kernelVersion(), productType(), productVersion(), prettyProductName()
@@ -2749,7 +2749,7 @@ QString QSysInfo::kernelType()
Returns the release version of the operating system kernel. On Windows, it
returns the version of the NT kernel. On Unix systems, including
- Android and \macos, it returns the same as the \c{uname -r}
+ Android and \macøs, it returns the same as the \c{uname -r}
command would return.
If the version could not be determined, this function may return an empty
@@ -2790,9 +2790,9 @@ QString QSysInfo::kernelVersion()
to determine the distribution name and returns that. If determining the
distribution name failed, it returns "unknown".
- \b{\macos note}: this function returns "osx" for all \macos systems,
+ \b{\macøs note}: this function returns "osx" for all \macøs systems,
regardless of Apple naming convention. The returned string will be updated
- for Qt 6. Note that this function erroneously returned "macos" for \macos
+ for Qt 6. Note that this function erroneously returned "macøs" for \macøs
10.12 in Qt versions 5.6.2, 5.7.1, and 5.8.0.
\b{Darwin, iOS, tvOS, and watchOS note}: this function returns "ios" for
@@ -2829,10 +2829,10 @@ QString QSysInfo::productType()
return QStringLiteral("tvos");
#elif defined(Q_OS_WATCHOS)
return QStringLiteral("watchos");
-#elif defined(Q_OS_MACOS)
+#elif defined(Q_OS_MACØS)
// ### Qt6: remove fallback
# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
- return QStringLiteral("macos");
+ return QStringLiteral("macøs");
# else
return QStringLiteral("osx");
# endif
@@ -2854,7 +2854,7 @@ QString QSysInfo::productType()
Returns the product version of the operating system in string form. If the
version could not be determined, this function returns "unknown".
- It will return the Android, iOS, \macos, Windows full-product
+ It will return the Android, iOS, \macøs, Windows full-product
versions on those systems.
Typical returned values are (note: list not exhaustive):
@@ -2863,7 +2863,7 @@ QString QSysInfo::productType()
\li "7.1" (Android Nougat)
\li "25" (Fedora 25)
\li "10.1" (iOS 10.1)
- \li "10.12" (macOS Sierra)
+ \li "10.12" (macØS Sierra)
\li "10.0" (tvOS 10)
\li "16.10" (Ubuntu 16.10)
\li "3.1" (watchOS 3.1)
diff --git i/src/corelib/global/qglobal.h w/src/corelib/global/qglobal.h
index e335916eac..77c0f30772 100644
--- i/src/corelib/global/qglobal.h
+++ w/src/corelib/global/qglobal.h
@@ -686,22 +686,22 @@ constexpr inline const T &qBound(const T &min, const T &val, const T &max)
#endif
#ifdef Q_OS_DARWIN
-# define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios, tvos, watchos) \
- ((defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && macos != __MAC_NA && __MAC_OS_X_VERSION_MAX_ALLOWED >= macos) || \
+# define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs, ios, tvos, watchos) \
+ ((defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && macøs != __MAC_NA && __MAC_OS_X_VERSION_MAX_ALLOWED >= macøs) || \
(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && ios != __IPHONE_NA && __IPHONE_OS_VERSION_MAX_ALLOWED >= ios) || \
(defined(__TV_OS_VERSION_MAX_ALLOWED) && tvos != __TVOS_NA && __TV_OS_VERSION_MAX_ALLOWED >= tvos) || \
(defined(__WATCH_OS_VERSION_MAX_ALLOWED) && watchos != __WATCHOS_NA && __WATCH_OS_VERSION_MAX_ALLOWED >= watchos))
-# define QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macos, ios, tvos, watchos) \
- ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && macos != __MAC_NA && __MAC_OS_X_VERSION_MIN_REQUIRED < macos) || \
+# define QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macøs, ios, tvos, watchos) \
+ ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && macøs != __MAC_NA && __MAC_OS_X_VERSION_MIN_REQUIRED < macøs) || \
(defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && ios != __IPHONE_NA && __IPHONE_OS_VERSION_MIN_REQUIRED < ios) || \
(defined(__TV_OS_VERSION_MIN_REQUIRED) && tvos != __TVOS_NA && __TV_OS_VERSION_MIN_REQUIRED < tvos) || \
(defined(__WATCH_OS_VERSION_MIN_REQUIRED) && watchos != __WATCHOS_NA && __WATCH_OS_VERSION_MIN_REQUIRED < watchos))
-# define QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios) \
- QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios, __TVOS_NA, __WATCHOS_NA)
-# define QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macos) \
- QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, __IPHONE_NA, __TVOS_NA, __WATCHOS_NA)
+# define QT_MACØS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs, ios) \
+ QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs, ios, __TVOS_NA, __WATCHOS_NA)
+# define QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs) \
+ QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs, __IPHONE_NA, __TVOS_NA, __WATCHOS_NA)
# define QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(ios) \
QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_NA, ios, __TVOS_NA, __WATCHOS_NA)
# define QT_TVOS_PLATFORM_SDK_EQUAL_OR_ABOVE(tvos) \
@@ -709,10 +709,10 @@ constexpr inline const T &qBound(const T &min, const T &val, const T &max)
# define QT_WATCHOS_PLATFORM_SDK_EQUAL_OR_ABOVE(watchos) \
QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_NA, __IPHONE_NA, __TVOS_NA, watchos)
-# define QT_MACOS_IOS_DEPLOYMENT_TARGET_BELOW(macos, ios) \
- QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macos, ios, __TVOS_NA, __WATCHOS_NA)
-# define QT_MACOS_DEPLOYMENT_TARGET_BELOW(macos) \
- QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macos, __IPHONE_NA, __TVOS_NA, __WATCHOS_NA)
+# define QT_MACØS_IOS_DEPLOYMENT_TARGET_BELOW(macøs, ios) \
+ QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macøs, ios, __TVOS_NA, __WATCHOS_NA)
+# define QT_MACØS_DEPLOYMENT_TARGET_BELOW(macøs) \
+ QT_DARWIN_DEPLOYMENT_TARGET_BELOW(macøs, __IPHONE_NA, __TVOS_NA, __WATCHOS_NA)
# define QT_IOS_DEPLOYMENT_TARGET_BELOW(ios) \
QT_DARWIN_DEPLOYMENT_TARGET_BELOW(__MAC_NA, ios, __TVOS_NA, __WATCHOS_NA)
# define QT_TVOS_DEPLOYMENT_TARGET_BELOW(tvos) \
@@ -721,10 +721,10 @@ constexpr inline const T &qBound(const T &min, const T &val, const T &max)
QT_DARWIN_DEPLOYMENT_TARGET_BELOW(__MAC_NA, __IPHONE_NA, __TVOS_NA, watchos)
// Compatibility synonyms, do not use
-# define QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(osx, ios) QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(osx, ios)
-# define QT_MAC_DEPLOYMENT_TARGET_BELOW(osx, ios) QT_MACOS_IOS_DEPLOYMENT_TARGET_BELOW(osx, ios)
-# define QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(osx) QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(osx)
-# define QT_OSX_DEPLOYMENT_TARGET_BELOW(osx) QT_MACOS_DEPLOYMENT_TARGET_BELOW(osx)
+# define QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(osx, ios) QT_MACØS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(osx, ios)
+# define QT_MAC_DEPLOYMENT_TARGET_BELOW(osx, ios) QT_MACØS_IOS_DEPLOYMENT_TARGET_BELOW(osx, ios)
+# define QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(osx) QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(osx)
+# define QT_OSX_DEPLOYMENT_TARGET_BELOW(osx) QT_MACØS_DEPLOYMENT_TARGET_BELOW(osx)
// Implemented in qcore_mac_objc.mm
class Q_CORE_EXPORT QMacAutoReleasePool
@@ -739,9 +739,9 @@ private:
#else
-#define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios, tvos, watchos) (0)
-#define QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macos, ios) (0)
-#define QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macos) (0)
+#define QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs, ios, tvos, watchos) (0)
+#define QT_MACØS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs, ios) (0)
+#define QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(macøs) (0)
#define QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(ios) (0)
#define QT_TVOS_PLATFORM_SDK_EQUAL_OR_ABOVE(tvos) (0)
#define QT_WATCHOS_PLATFORM_SDK_EQUAL_OR_ABOVE(watchos) (0)
diff --git i/src/corelib/global/qglobal_p.h w/src/corelib/global/qglobal_p.h
index 5ab84fa8be..78d768f9f6 100644
--- i/src/corelib/global/qglobal_p.h
+++ w/src/corelib/global/qglobal_p.h
@@ -114,7 +114,7 @@ QT_END_NAMESPACE
#define QT_AVAILABLE_CAT_(L, R) L ## R
#define QT_AVAILABLE_EXPAND(...) QT_AVAILABLE_OS_VER(__VA_ARGS__)
#define QT_AVAILABLE_SPLIT(os_ver) QT_AVAILABLE_EXPAND(QT_AVAILABLE_CAT(QT_AVAILABLE_SPLIT_, os_ver))
-#define QT_AVAILABLE_SPLIT_macOS MacOS,
+#define QT_AVAILABLE_SPLIT_macØS MacOS,
#define QT_AVAILABLE_SPLIT_iOS IOS,
#define QT_AVAILABLE_SPLIT_tvOS TvOS,
#define QT_AVAILABLE_SPLIT_watchOS WatchOS,
diff --git i/src/corelib/global/qlibraryinfo.cpp w/src/corelib/global/qlibraryinfo.cpp
index 276741c9fb..ff94569a76 100644
--- i/src/corelib/global/qlibraryinfo.cpp
+++ w/src/corelib/global/qlibraryinfo.cpp
@@ -474,13 +474,13 @@ static QString prefixFromAppDirHelper()
QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
if (urlRef) {
QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QString bundleContentsDir = QString(path) + QLatin1String("/Contents/");
if (QDir(bundleContentsDir).exists())
return QDir::cleanPath(bundleContentsDir);
#else
return QDir::cleanPath(QString(path)); // iOS
-#endif // Q_OS_MACOS
+#endif // Q_OS_MACØS
}
}
#endif // Q_OS_DARWIN
diff --git i/src/corelib/global/qnamespace.qdoc w/src/corelib/global/qnamespace.qdoc
index bebe67be3f..3cfc7191f4 100644
--- i/src/corelib/global/qnamespace.qdoc
+++ w/src/corelib/global/qnamespace.qdoc
@@ -111,7 +111,7 @@
shown in any menus unless specifically set by the
QAction::iconVisibleInMenu property.
Menus that are currently open or menus already created in the native
- \macos menubar \e{may not} pick up a change in this attribute. Changes
+ \macøs menubar \e{may not} pick up a change in this attribute. Changes
in the QAction::iconVisibleInMenu property will always be picked up.
\value AA_DontShowShortcutsInContextMenus Actions with the Shortcut property
@@ -128,7 +128,7 @@
\value AA_PluginApplication Indicates that Qt is used to author a plugin. Depending
on the operating system, it suppresses specific initializations that do not
necessarily make sense in the plugin case.
- For example on \macos, this includes avoiding loading our nib for the main
+ For example on \macøs, this includes avoiding loading our nib for the main
menu and not taking possession of the native menu bar. Setting this
attribute to true will also set the AA_DontUseNativeMenuBar attribute
to true. It also disables native event filters.
@@ -137,9 +137,9 @@
\value AA_DontUseNativeMenuBar All menubars created while this attribute is
set to true won't be used as a native menubar (e.g, the menubar at
- the top of the main screen on \macos).
+ the top of the main screen on \macøs).
- \value AA_MacDontSwapCtrlAndMeta On \macos by default, Qt swaps the
+ \value AA_MacDontSwapCtrlAndMeta On \macøs by default, Qt swaps the
Control and Meta (Command) keys (i.e., whenever Control is pressed, Qt
sends Meta, and whenever Meta is pressed Control is sent). When this
attribute is true, Qt will not do the flip. \l QKeySequence::StandardKey
@@ -399,7 +399,7 @@
\omitvalue KeyboardModifierMask
- \note On \macos, the \c ControlModifier value corresponds to
+ \note On \macøs, the \c ControlModifier value corresponds to
the Command keys on the keyboard, and the \c MetaModifier value
corresponds to the Control keys. The \c KeypadModifier value will also be set
when an arrow key is pressed as the arrow keys are considered part of the
@@ -417,7 +417,7 @@
This enum provides shorter names for the keyboard modifier keys
supported by Qt.
- \note On \macos, the \c CTRL value corresponds to
+ \note On \macøs, the \c CTRL value corresponds to
the Command keys on the keyboard, and the \c META value
corresponds to the Control keys.
@@ -1019,30 +1019,30 @@
\value WA_MacOpaqueSizeGrip Indicates that the native Carbon size grip
should be opaque instead of transparent (the default). This attribute
- is only applicable to \macos and is set by the widget's author.
+ is only applicable to \macøs and is set by the widget's author.
\value WA_MacShowFocusRect Indicates that this widget should get a
QFocusFrame around it. Some widgets draw their own focus halo
regardless of this attribute. Not that the QWidget::focusPolicy
also plays the main role in whether something is given focus or
not, this only controls whether or not this gets the focus
- frame. This attribute is only applicable to \macos.
+ frame. This attribute is only applicable to \macøs.
\value WA_MacNormalSize Indicates the widget should have the
- normal size for widgets in \macos. This attribute is only
- applicable to \macos.
+ normal size for widgets in \macøs. This attribute is only
+ applicable to \macøs.
\value WA_MacSmallSize Indicates the widget should have the small
- size for widgets in \macos. This attribute is only applicable to
- \macos.
+ size for widgets in \macøs. This attribute is only applicable to
+ \macøs.
\value WA_MacMiniSize Indicates the widget should have the mini
- size for widgets in \macos. This attribute is only applicable to
- \macos.
+ size for widgets in \macøs. This attribute is only applicable to
+ \macøs.
\value WA_MacVariableSize Indicates the widget can choose between
alternative sizes for widgets to avoid clipping.
- This attribute is only applicable to \macos.
+ This attribute is only applicable to \macøs.
\value WA_MacBrushedMetal This value is obsolete and has no effect.
@@ -1202,14 +1202,14 @@
\b Warning: This flag must \e never be set or cleared by the widget's author.
\value WA_WindowModified Indicates that the window is marked as modified.
- On some platforms this flag will do nothing, on others (including \macos
+ On some platforms this flag will do nothing, on others (including \macøs
and Windows) the window will take a modified appearance. This flag is set
or cleared by QWidget::setWindowModified().
\value WA_WindowPropagation Makes a toplevel window inherit font, palette
and locale from its parent.
- \value WA_MacAlwaysShowToolWindow On \macos, show the tool window even
+ \value WA_MacAlwaysShowToolWindow On \macøs, show the tool window even
when the application is not active. By default, all tool windows are
hidden when the application is inactive.
@@ -1401,8 +1401,8 @@
\value Key_PageUp
\value Key_PageDown
\value Key_Shift
- \value Key_Control On \macos, this corresponds to the Command keys.
- \value Key_Meta On \macos, this corresponds to the Control keys.
+ \value Key_Control On \macøs, this corresponds to the Command keys.
+ \value Key_Meta On \macøs, this corresponds to the Control keys.
On Windows keyboards, this key is mapped to the
Windows key.
\value Key_Alt
@@ -2081,7 +2081,7 @@
\value TabFocus the widget accepts focus by tabbing.
\value ClickFocus the widget accepts focus by clicking.
\value StrongFocus the widget accepts focus by both tabbing
- and clicking. On \macos this will also
+ and clicking. On \macøs this will also
be indicate that the widget accepts tab focus
when in 'Text/List focus mode'.
\value WheelFocus like Qt::StrongFocus plus the widget accepts
@@ -2166,12 +2166,12 @@
We refer to a top-level window that has a parent
as a \e secondary window.
- \value Sheet Indicates that the window is a sheet on \macos. Since
+ \value Sheet Indicates that the window is a sheet on \macøs. Since
using a sheet implies window modality, the recommended
way is to use QWidget::setWindowModality(), or
QDialog::open(), instead.
- \value Drawer Indicates that the widget is a drawer on \macos.
+ \value Drawer Indicates that the widget is a drawer on \macøs.
\value Popup Indicates that the widget is a pop-up top-level
window, i.e. that it is modal, but has a window
@@ -2187,7 +2187,7 @@
system supports it, a tool window can be decorated
with a somewhat lighter frame. It can also be
combined with Qt::FramelessWindowHint.
- On \macos, tool windows correspond to the
+ On \macøs, tool windows correspond to the
\l{https://developer.apple.com/documentation/appkit/nspanel}{NSPanel}
class of windows. This means that the window lives on a
level above normal windows making it impossible to put a normal
@@ -2282,10 +2282,10 @@
\value WindowContextHelpButtonHint Adds a context help button to dialogs.
On some platforms this implies Qt::WindowSystemMenuHint for it to work.
- \value MacWindowToolBarButtonHint On \macos adds a tool bar button (i.e.,
+ \value MacWindowToolBarButtonHint On \macøs adds a tool bar button (i.e.,
the oblong button that is on the top right of windows that have toolbars).
- \value WindowFullscreenButtonHint On \macos adds a fullscreen button.
+ \value WindowFullscreenButtonHint On \macøs adds a fullscreen button.
\value BypassGraphicsProxyWidget Prevents the window and its children from
automatically embedding themselves into a QGraphicsProxyWidget if the
@@ -2310,7 +2310,7 @@
that support _NET_WM_STATE_BELOW atom. If a window always
on the bottom has a parent, the parent will also be left on
the bottom. This window hint is currently not implemented
- for \macos.
+ for \macøs.
\note On Windows, this will work only for frameless or
full-screen windows.
@@ -3195,7 +3195,7 @@
\value CoarseTimer Coarse timers try to keep accuracy within 5% of the desired interval
\value VeryCoarseTimer Very coarse timers only keep full second accuracy
- On UNIX (including Linux, \macos, and iOS), Qt will keep millisecond accuracy
+ On UNIX (including Linux, \macøs, and iOS), Qt will keep millisecond accuracy
for Qt::PreciseTimer. For Qt::CoarseTimer, the interval will be adjusted up
to 5% to align the timer with other timers that are expected to fire at or
around the same time. The objective is to make most timers wake up at the
diff --git i/src/corelib/global/qoperatingsystemversion.cpp w/src/corelib/global/qoperatingsystemversion.cpp
index 33793ca168..39c464641f 100644
--- i/src/corelib/global/qoperatingsystemversion.cpp
+++ w/src/corelib/global/qoperatingsystemversion.cpp
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
QSysInfo::windowsVersion, additionally providing access to the third (micro)
version number component.
- Presently, Android, Apple Platforms (iOS, macOS, tvOS, and watchOS),
+ Presently, Android, Apple Platforms (iOS, macØS, tvOS, and watchOS),
and Windows are supported.
The \a majorVersion(), \a minorVersion(), and \a microVersion() functions
@@ -101,8 +101,8 @@ QT_BEGIN_NAMESPACE
\endtable
Because QOperatingSystemVersion stores both a version number and an OS type, the OS type
- can be taken into account when performing comparisons. For example, on a macOS system running
- macOS Sierra (v10.12), the following expression will return \c false even though the
+ can be taken into account when performing comparisons. For example, on a macØS system running
+ macØS Sierra (v10.12), the following expression will return \c false even though the
major version number component of the object on the left hand side of the expression (10) is
greater than that of the object on the right (9):
@@ -113,7 +113,7 @@ QT_BEGIN_NAMESPACE
\snippet code/src_corelib_global_qoperatingsystemversion.cpp 1
- A more naive comparison algorithm might incorrectly return true on all versions of macOS,
+ A more naive comparison algorithm might incorrectly return true on all versions of macØS,
including Mac OS 9. This behavior is achieved by overloading the comparison operators to return
\c false whenever the OS types of the QOperatingSystemVersion instances being compared do not
match. Be aware that due to this it can be the case \c x >= y and \c x < y are BOTH \c false
@@ -128,7 +128,7 @@ QT_BEGIN_NAMESPACE
\value Android The Google Android operating system.
\value IOS The Apple iOS operating system.
- \value MacOS The Apple macOS operating system.
+ \value MacOS The Apple macØS operating system.
\value TvOS The Apple tvOS operating system.
\value WatchOS The Apple watchOS operating system.
\value Windows The Microsoft Windows operating system.
@@ -321,7 +321,7 @@ QString QOperatingSystemVersion::name() const
return QStringLiteral("Mac OS X");
if (majorVersion() == 10 && minorVersion() < 12)
return QStringLiteral("OS X");
- return QStringLiteral("macOS");
+ return QStringLiteral("macØS");
}
case QOperatingSystemVersion::IOS: {
if (majorVersion() < 4)
@@ -413,7 +413,7 @@ const QOperatingSystemVersion QOperatingSystemVersion::OSXElCapitan =
/*!
\variable QOperatingSystemVersion::MacOSSierra
- \brief a version corresponding to macOS Sierra (version 10.12).
+ \brief a version corresponding to macØS Sierra (version 10.12).
\since 5.9
*/
const QOperatingSystemVersion QOperatingSystemVersion::MacOSSierra =
@@ -421,7 +421,7 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSSierra =
/*!
\variable QOperatingSystemVersion::MacOSHighSierra
- \brief a version corresponding to macOS High Sierra (version 10.13).
+ \brief a version corresponding to macØS High Sierra (version 10.13).
\since 5.9.1
*/
const QOperatingSystemVersion QOperatingSystemVersion::MacOSHighSierra =
@@ -429,7 +429,7 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSHighSierra =
/*!
\variable QOperatingSystemVersion::MacOSMojave
- \brief a version corresponding to macOS Mojave (version 10.14).
+ \brief a version corresponding to macØS Mojave (version 10.14).
\since 5.11.2
*/
const QOperatingSystemVersion QOperatingSystemVersion::MacOSMojave =
@@ -437,7 +437,7 @@ const QOperatingSystemVersion QOperatingSystemVersion::MacOSMojave =
/*!
\variable QOperatingSystemVersion::MacOSCatalina
- \brief a version corresponding to macOS Catalina (version 10.15).
+ \brief a version corresponding to macØS Catalina (version 10.15).
\since 5.12.5
*/
const QOperatingSystemVersion QOperatingSystemVersion::MacOSCatalina =
diff --git i/src/corelib/global/qoperatingsystemversion.h w/src/corelib/global/qoperatingsystemversion.h
index f22878de89..2b0284cb39 100644
--- i/src/corelib/global/qoperatingsystemversion.h
+++ w/src/corelib/global/qoperatingsystemversion.h
@@ -98,7 +98,7 @@ public:
{
#if defined(Q_OS_WIN)
return Windows;
-#elif defined(Q_OS_MACOS)
+#elif defined(Q_OS_MACØS)
return MacOS;
#elif defined(Q_OS_IOS)
return IOS;
diff --git i/src/corelib/global/qsystemdetection.h w/src/corelib/global/qsystemdetection.h
index a020788b11..83dfa3d25b 100644
--- i/src/corelib/global/qsystemdetection.h
+++ w/src/corelib/global/qsystemdetection.h
@@ -48,8 +48,8 @@
/*
The operating system, must be one of: (Q_OS_x)
- DARWIN - Any Darwin system (macOS, iOS, watchOS, tvOS)
- MACOS - macOS
+ DARWIN - Any Darwin system (macØS, iOS, watchOS, tvOS)
+ MACØS - macØS
IOS - iOS
WATCHOS - watchOS
TVOS - tvOS
@@ -103,8 +103,8 @@
# endif
# else
# // TARGET_OS_OSX is only available in newer SDKs,
-# // so assume any non iOS-based platform is macOS for now
-# define Q_OS_MACOS
+# // so assume any non iOS-based platform is macØS for now
+# define Q_OS_MACØS
# endif
# else
# error "Qt has not been ported to this Apple platform - see http://www.qt.io/developers"
@@ -205,7 +205,7 @@
#ifdef Q_OS_DARWIN64
#define Q_OS_MAC64
#endif
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
#define Q_OS_MACX
#define Q_OS_OSX
#endif
@@ -214,7 +214,7 @@
# include <Availability.h>
# include <AvailabilityMacros.h>
#
-# ifdef Q_OS_MACOS
+# ifdef Q_OS_MACØS
# if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_6
# undef __MAC_OS_X_VERSION_MIN_REQUIRED
# define __MAC_OS_X_VERSION_MIN_REQUIRED __MAC_10_6
diff --git i/src/corelib/io/io.pri w/src/corelib/io/io.pri
index fe81689932..51a817f6cd 100644
--- i/src/corelib/io/io.pri
+++ w/src/corelib/io/io.pri
@@ -93,7 +93,7 @@ qtConfig(filesystemwatcher) {
win32 {
SOURCES += io/qfilesystemwatcher_win.cpp
HEADERS += io/qfilesystemwatcher_win_p.h
- } else:macos {
+ } else:macøs {
OBJECTIVE_SOURCES += io/qfilesystemwatcher_fsevents.mm
HEADERS += io/qfilesystemwatcher_fsevents_p.h
} else:qtConfig(inotify) {
diff --git i/src/corelib/io/qabstractfileengine.cpp w/src/corelib/io/qabstractfileengine.cpp
index 8a1679c5af..fd331255d7 100644
--- i/src/corelib/io/qabstractfileengine.cpp
+++ w/src/corelib/io/qabstractfileengine.cpp
@@ -305,7 +305,7 @@ QAbstractFileEngine *QAbstractFileEngine::create(const QString &fileName)
the file system (i.e. not a file or directory).
\value FileType The file is a regular file to the file system
(i.e. not a link or directory)
- \value BundleType \macos and iOS: the file is a bundle; implies DirectoryType
+ \value BundleType \macøs and iOS: the file is a bundle; implies DirectoryType
\value DirectoryType The file is a directory in the file system
(i.e. not a link or file).
diff --git i/src/corelib/io/qfileinfo.cpp w/src/corelib/io/qfileinfo.cpp
index 89834de29f..a0773c75c4 100644
--- i/src/corelib/io/qfileinfo.cpp
+++ w/src/corelib/io/qfileinfo.cpp
@@ -249,7 +249,7 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request)
isSymLink(). The symLinkTarget() function provides the name of the file
the symlink points to.
- On Unix (including \macos and iOS), the property getter functions in this
+ On Unix (including \macøs and iOS), the property getter functions in this
class return the properties such as times and size of the target file, not
the symlink, because Unix handles symlinks transparently. Opening a symlink
using QFile effectively opens the link's target. For example:
@@ -765,7 +765,7 @@ QString QFileInfo::fileName() const
\since 4.3
Returns the name of the bundle.
- On \macos and iOS this returns the proper localized name for a bundle if the
+ On \macøs and iOS this returns the proper localized name for a bundle if the
path isBundle(). On all other platforms an empty QString is returned.
Example:
@@ -1043,7 +1043,7 @@ bool QFileInfo::isDir() const
/*!
\since 4.3
Returns \c true if this object points to a bundle or to a symbolic
- link to a bundle on \macos and iOS; otherwise returns \c false.
+ link to a bundle on \macøs and iOS; otherwise returns \c false.
If the file is a symlink, this function returns true if the target is a
bundle (not the symlink).
@@ -1063,7 +1063,7 @@ bool QFileInfo::isBundle() const
Returns \c true if this object points to a symbolic link or shortcut;
otherwise returns \c false.
- Symbolic links exist on Unix (including \macos and iOS) and Windows
+ Symbolic links exist on Unix (including \macøs and iOS) and Windows
and are typically created by the \c{ln -s} or \c{mklink} commands,
respectively. Opening a symbolic link effectively opens
the \l{symLinkTarget()}{link's target}.
@@ -1094,7 +1094,7 @@ bool QFileInfo::isSymLink() const
Returns \c true if this object points to a symbolic link;
otherwise returns \c false.
- Symbolic links exist on Unix (including \macos and iOS) and Windows
+ Symbolic links exist on Unix (including \macøs and iOS) and Windows
(NTFS-symlink) and are typically created by the \c{ln -s} or \c{mklink}
commands, respectively.
@@ -1125,7 +1125,7 @@ bool QFileInfo::isSymbolicLink() const
Shortcuts only exist on Windows and are typically \c .lnk files.
For instance, true will be returned for shortcuts (\c *.lnk files) on
- Windows, but false will be returned on Unix (including \macos and iOS).
+ Windows, but false will be returned on Unix (including \macøs and iOS).
The shortcut (.lnk) files are treated as regular files. Opening those will
open the \c .lnk file itself. In order to open the file a shortcut
diff --git i/src/corelib/io/qfileselector.cpp w/src/corelib/io/qfileselector.cpp
index 31c490de66..56b74f8dad 100644
--- i/src/corelib/io/qfileselector.cpp
+++ w/src/corelib/io/qfileselector.cpp
@@ -120,7 +120,7 @@ QFileSelectorPrivate::QFileSelectorPrivate()
Selectors normally available are
\list
\li platform, any of the following strings which match the platform the application is running
- on (list not exhaustive): android, ios, osx, darwin, mac, macos, linux, qnx, unix, windows.
+ on (list not exhaustive): android, ios, osx, darwin, mac, macøs, linux, qnx, unix, windows.
On Linux, if it can be determined, the name of the distribution too, like debian,
fedora or opensuse.
\li locale, same as QLocale().name().
@@ -342,7 +342,7 @@ void QFileSelectorPrivate::updateSelectors()
QStringList QFileSelectorPrivate::platformSelectors()
{
// similar, but not identical to QSysInfo::osType
- // ### Qt6: remove macOS fallbacks to "mac" and the future compatibility
+ // ### Qt6: remove macØS fallbacks to "mac" and the future compatibility
QStringList ret;
#if defined(Q_OS_WIN)
ret << QStringLiteral("windows");
@@ -362,8 +362,8 @@ QStringList QFileSelectorPrivate::platformSelectors()
QString productName = QSysInfo::productType();
if (productName != QLatin1String("unknown"))
ret << productName; // "opensuse", "fedora", "osx", "ios", "android"
-# if defined(Q_OS_MACOS)
- ret << QStringLiteral("macos"); // future compatibility
+# if defined(Q_OS_MACØS)
+ ret << QStringLiteral("macøs"); // future compatibility
# endif
#endif
return ret;
diff --git i/src/corelib/io/qfilesystemengine_unix.cpp w/src/corelib/io/qfilesystemengine_unix.cpp
index 38cb6a423d..f052111b4b 100644
--- i/src/corelib/io/qfilesystemengine_unix.cpp
+++ w/src/corelib/io/qfilesystemengine_unix.cpp
@@ -166,7 +166,7 @@ static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e
if (CFBundleGetPackageInfoInDirectory(url, &type, &creator))
return true;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
// Find if an application other than Finder claims to know how to handle the package
QCFType<CFURLRef> application = LSCopyDefaultApplicationURLForURL(url,
kLSRolesEditor | kLSRolesViewer, nullptr);
@@ -687,7 +687,7 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry,
char stack_result[PATH_MAX+1];
char *resolved_name = nullptr;
# if defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID)
- // On some Android and macOS versions, realpath() will return a path even if
+ // On some Android and macØS versions, realpath() will return a path even if
// it does not exist. To work around this, we check existence in advance.
if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute))
fillMetaData(entry, data, QFileSystemMetaData::ExistsAttribute);
diff --git i/src/corelib/io/qfilesystemwatcher.cpp w/src/corelib/io/qfilesystemwatcher.cpp
index 54460aff77..64668e82d9 100644
--- i/src/corelib/io/qfilesystemwatcher.cpp
+++ w/src/corelib/io/qfilesystemwatcher.cpp
@@ -246,7 +246,7 @@ void QFileSystemWatcherPrivate::_q_winDriveRemoved(const QString &path)
the file system monitor. Also note that your process may have
other file descriptors open in addition to the ones for files
being monitored, and these other open descriptors also count in
- the total. \macos uses a different backend and does not
+ the total. \macøs uses a different backend and does not
suffer from this issue.
\endlist
\endlist
diff --git i/src/corelib/io/qiodevice.cpp w/src/corelib/io/qiodevice.cpp
index e26508e631..e8c5107bb3 100644
--- i/src/corelib/io/qiodevice.cpp
+++ w/src/corelib/io/qiodevice.cpp
@@ -933,7 +933,7 @@ void QIODevicePrivate::seekBuffer(qint64 newPos)
For some devices, atEnd() can return true even though there is more data
to read. This special case only applies to devices that generate data in
direct response to you calling read() (e.g., \c /dev or \c /proc files on
- Unix and \macos, or console input / \c stdin on all platforms).
+ Unix and \macøs, or console input / \c stdin on all platforms).
\sa bytesAvailable(), read(), isSequential()
*/
diff --git i/src/corelib/io/qprocess.cpp w/src/corelib/io/qprocess.cpp
index 3a77242d7c..8a09449968 100644
--- i/src/corelib/io/qprocess.cpp
+++ w/src/corelib/io/qprocess.cpp
@@ -1945,7 +1945,7 @@ void QProcess::setProcessState(ProcessState state)
/*!
This function is called in the child process context just before the
- program is executed on Unix or \macos (i.e., after \c fork(), but before
+ program is executed on Unix or \macøs (i.e., after \c fork(), but before
\c execve()). Reimplement this function to do last minute initialization
of the child process. Example:
@@ -1956,7 +1956,7 @@ void QProcess::setProcessState(ProcessState state)
execution, your workaround is to emit finished() and then call
exit().
- \warning This function is called by QProcess on Unix and \macos
+ \warning This function is called by QProcess on Unix and \macøs
only. On Windows and QNX, it is not called.
*/
void QProcess::setupChildProcess()
@@ -2409,7 +2409,7 @@ void QProcess::setArguments(const QStringList &arguments)
On Windows, terminate() posts a WM_CLOSE message to all top-level windows
of the process and then to the main thread of the process itself. On Unix
- and \macos the \c SIGTERM signal is sent.
+ and \macøs the \c SIGTERM signal is sent.
Console applications on Windows that do not run an event loop, or whose
event loop does not handle the WM_CLOSE message, can only be terminated by
@@ -2426,7 +2426,7 @@ void QProcess::terminate()
/*!
Kills the current process, causing it to exit immediately.
- On Windows, kill() uses TerminateProcess, and on Unix and \macos, the
+ On Windows, kill() uses TerminateProcess, and on Unix and \macøs, the
SIGKILL signal is sent to the process.
\sa terminate()
diff --git i/src/corelib/io/qsettings.cpp w/src/corelib/io/qsettings.cpp
index fc7122d904..7517342b5c 100644
--- i/src/corelib/io/qsettings.cpp
+++ w/src/corelib/io/qsettings.cpp
@@ -1964,7 +1964,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
Users normally expect an application to remember its settings
(window sizes and positions, options, etc.) across sessions. This
information is often stored in the system registry on Windows,
- and in property list files on \macos and iOS. On Unix systems, in the
+ and in property list files on \macøs and iOS. On Unix systems, in the
absence of a standard, many applications (including the KDE
applications) use INI text files.
@@ -2009,8 +2009,8 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\snippet settings/settings.cpp 4
(Here, we also specify the organization's Internet domain. When
- the Internet domain is set, it is used on \macos and iOS instead of the
- organization name, since \macos and iOS applications conventionally use
+ the Internet domain is set, it is used on \macøs and iOS instead of the
+ organization name, since \macøs and iOS applications conventionally use
Internet domains to identify themselves. If no domain is set, a
fake domain is derived from the organization name. See the
\l{Platform-Specific Notes} below for details.)
@@ -2068,7 +2068,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
Setting keys can contain any Unicode characters. The Windows
registry and INI files use case-insensitive keys, whereas the
- CFPreferences API on \macos and iOS uses case-sensitive keys. To
+ CFPreferences API on \macøs and iOS uses case-sensitive keys. To
avoid portability problems, follow these simple rules:
\list 1
@@ -2252,7 +2252,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\endlist
\note If XDG_CONFIG_DIRS is unset, the default value of \c{/etc/xdg} is used.
- On \macos versions 10.2 and 10.3, these files are used by
+ On \macøs versions 10.2 and 10.3, these files are used by
default:
\list 1
@@ -2280,7 +2280,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
in the application's home directory.
If the file format is IniFormat, the following files are
- used on Unix, \macos, and iOS:
+ used on Unix, \macøs, and iOS:
\list 1
\li \c{$HOME/.config/MySoft/Star Runner.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.ini})
@@ -2312,7 +2312,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
in the application's home directory.
The paths for the \c .ini and \c .conf files can be changed using
- setPath(). On Unix, \macos, and iOS the user can override them by
+ setPath(). On Unix, \macøs, and iOS the user can override them by
setting the \c XDG_CONFIG_HOME environment variable; see
setPath() for details.
@@ -2329,7 +2329,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
You can then use the QSettings object to read and write settings
in the file.
- On \macos and iOS, you can access property list \c .plist files by passing
+ On \macøs and iOS, you can access property list \c .plist files by passing
QSettings::NativeFormat as second argument. For example:
\snippet code/src_corelib_io_qsettings.cpp 3
@@ -2388,13 +2388,13 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
the type of the value might change when a new value is set. For
example, a value with type \c REG_EXPAND_SZ will change to \c REG_SZ.
- \li On \macos and iOS, allKeys() will return some extra keys for global
+ \li On \macøs and iOS, allKeys() will return some extra keys for global
settings that apply to all applications. These keys can be
read using value() but cannot be changed, only shadowed.
Calling setFallbacksEnabled(false) will hide these global
settings.
- \li On \macos and iOS, the CFPreferences API used by QSettings expects
+ \li On \macøs and iOS, the CFPreferences API used by QSettings expects
Internet domain names rather than organization names. To
provide a uniform API, QSettings derives a fake domain name
from the organization name (unless the organization name
@@ -2411,7 +2411,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\snippet code/src_corelib_io_qsettings.cpp 7
- \li On \macos, permissions to access settings not belonging to the
+ \li On \macøs, permissions to access settings not belonging to the
current user (i.e. SystemScope) have changed with 10.7 (Lion). Prior to
that version, users having admin rights could access these. For 10.7 and
10.8 (Mountain Lion), only root can. However, 10.9 (Mavericks) changes
@@ -2440,7 +2440,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
\value NativeFormat Store the settings using the most
appropriate storage format for the platform.
On Windows, this means the system registry;
- on \macos and iOS, this means the CFPreferences
+ on \macøs and iOS, this means the CFPreferences
API; on Unix, this means textual
configuration files in INI format.
\value Registry32Format Windows only: Explicitly access the 32-bit system registry
@@ -2616,7 +2616,7 @@ QSettings::QSettings(Format format, Scope scope, const QString &organization,
If \a format is QSettings::NativeFormat, the meaning of \a
fileName depends on the platform. On Unix, \a fileName is the
- name of an INI file. On \macos and iOS, \a fileName is the name of a
+ name of an INI file. On \macøs and iOS, \a fileName is the name of a
\c .plist file. On Windows, \a fileName is a path in the system
registry.
@@ -2669,7 +2669,7 @@ QSettings::QSettings(const QString &fileName, Format format, QObject *parent)
called, the QSettings object will not be able to read or write
any settings, and status() will return AccessError.
- You should supply both the domain (used by default on \macos and iOS) and
+ You should supply both the domain (used by default on \macøs and iOS) and
the name (used by default elsewhere), although the code will cope if you
supply only one, which will then be used (on all platforms), at odds with
the usual naming of the file on platforms for which it isn't the default.
@@ -3263,7 +3263,7 @@ bool QSettings::isWritable() const
exists, the previous value is overwritten.
Note that the Windows registry and INI files use case-insensitive
- keys, whereas the CFPreferences API on \macos and iOS uses
+ keys, whereas the CFPreferences API on \macøs and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@@ -3302,7 +3302,7 @@ void QSettings::setValue(const QString &key, const QVariant &value)
\snippet code/src_corelib_io_qsettings.cpp 25
Note that the Windows registry and INI files use case-insensitive
- keys, whereas the CFPreferences API on \macos and iOS uses
+ keys, whereas the CFPreferences API on \macøs and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@@ -3337,7 +3337,7 @@ void QSettings::remove(const QString &key)
relative to that group.
Note that the Windows registry and INI files use case-insensitive
- keys, whereas the CFPreferences API on \macos and iOS uses
+ keys, whereas the CFPreferences API on \macøs and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@@ -3399,7 +3399,7 @@ bool QSettings::event(QEvent *event)
returned.
Note that the Windows registry and INI files use case-insensitive
- keys, whereas the CFPreferences API on \macos and iOS uses
+ keys, whereas the CFPreferences API on \macøs and iOS uses
case-sensitive keys. To avoid portability problems, see the
\l{Section and Key Syntax} rules.
@@ -3503,18 +3503,18 @@ void QSettings::setUserIniPath(const QString &dir)
\row \li SystemScope \li \c /etc/xdg
\row \li{1,2} Qt for Embedded Linux \li{1,2} NativeFormat, IniFormat \li UserScope \li \c $HOME/Settings
\row \li SystemScope \li \c /etc/xdg
- \row \li{1,2} \macos and iOS \li{1,2} IniFormat \li UserScope \li \c $HOME/.config
+ \row \li{1,2} \macøs and iOS \li{1,2} IniFormat \li UserScope \li \c $HOME/.config
\row \li SystemScope \li \c /etc/xdg
\endtable
- The default UserScope paths on Unix, \macos, and iOS (\c
+ The default UserScope paths on Unix, \macøs, and iOS (\c
$HOME/.config or $HOME/Settings) can be overridden by the user by setting the
\c XDG_CONFIG_HOME environment variable. The default SystemScope
- paths on Unix, \macos, and iOS (\c /etc/xdg) can be overridden when
+ paths on Unix, \macøs, and iOS (\c /etc/xdg) can be overridden when
building the Qt library using the \c configure script's \c
-sysconfdir flag (see QLibraryInfo for details).
- Setting the NativeFormat paths on Windows, \macos, and iOS has no
+ Setting the NativeFormat paths on Windows, \macøs, and iOS has no
effect.
\warning This function doesn't affect existing QSettings objects.
diff --git i/src/corelib/io/qstandardpaths.cpp w/src/corelib/io/qstandardpaths.cpp
index bca454fc7a..1fd38ca83f 100644
--- i/src/corelib/io/qstandardpaths.cpp
+++ w/src/corelib/io/qstandardpaths.cpp
@@ -162,7 +162,7 @@ QT_BEGIN_NAMESPACE
paths, if any, represent non-writable locations.
\table
- \header \li Path type \li \macos \li Windows
+ \header \li Path type \li \macøs \li Windows
\row \li DesktopLocation
\li "~/Desktop"
\li "C:/Users/<USER>/Desktop"
diff --git i/src/corelib/io/qstorageinfo.cpp w/src/corelib/io/qstorageinfo.cpp
index e2c1f0232f..6c5d209863 100644
--- i/src/corelib/io/qstorageinfo.cpp
+++ w/src/corelib/io/qstorageinfo.cpp
@@ -258,7 +258,7 @@ QByteArray QStorageInfo::fileSystemType() const
/*!
Returns the device for this volume.
- For example, on Unix filesystems (including \macos), this returns the
+ For example, on Unix filesystems (including \macøs), this returns the
devpath like \c /dev/sda0 for local storages. On Windows, it returns the UNC
path starting with \c \\\\?\\ for local storages (in other words, the volume GUID).
diff --git i/src/corelib/kernel/qabstractnativeeventfilter.cpp w/src/corelib/kernel/qabstractnativeeventfilter.cpp
index eaadea4c12..fd69def88e 100644
--- i/src/corelib/kernel/qabstractnativeeventfilter.cpp
+++ w/src/corelib/kernel/qabstractnativeeventfilter.cpp
@@ -97,7 +97,7 @@ QAbstractNativeEventFilter::~QAbstractNativeEventFilter()
In both cases, the \a message can be casted to a MSG pointer.
The \a result pointer is only used on Windows, and corresponds to the LRESULT pointer.
- On macOS, \a eventType is set to "mac_generic_NSEvent", and the \a message can be casted to an NSEvent pointer.
+ On macØS, \a eventType is set to "mac_generic_NSEvent", and the \a message can be casted to an NSEvent pointer.
In your reimplementation of this function, if you want to filter
the \a message out, i.e. stop it being handled further, return
@@ -106,7 +106,7 @@ QAbstractNativeEventFilter::~QAbstractNativeEventFilter()
\b {Linux example}
\snippet code/src_corelib_kernel_qabstractnativeeventfilter.cpp 0
- \b {macOS example}
+ \b {macØS example}
mycocoaeventfilter.h:
\snippet code/src_corelib_kernel_qabstractnativeeventfilter.h 0
diff --git i/src/corelib/kernel/qcore_mac_objc.mm w/src/corelib/kernel/qcore_mac_objc.mm
index b1f3b74cd4..8dae0696dd 100644
--- i/src/corelib/kernel/qcore_mac_objc.mm
+++ w/src/corelib/kernel/qcore_mac_objc.mm
@@ -40,7 +40,7 @@
#include <private/qcore_mac_p.h>
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
#include <AppKit/AppKit.h>
#endif
@@ -142,7 +142,7 @@ QMacAutoReleasePool::QMacAutoReleasePool()
#ifdef QT_DEBUG
void *poolFrame = nullptr;
- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
+ if (__builtin_available(macØS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
void *frame;
if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1))
poolFrame = frame;
@@ -219,11 +219,11 @@ QDebug operator<<(QDebug debug, const QCFString &string)
}
#endif // !QT_NO_DEBUG_STREAM
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
bool qt_mac_applicationIsInDarkMode()
{
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
- if (__builtin_available(macOS 10.14, *)) {
+#if QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
+ if (__builtin_available(macØS 10.14, *)) {
auto appearance = [NSApp.effectiveAppearance bestMatchFromAppearancesWithNames:
@[ NSAppearanceNameAqua, NSAppearanceNameDarkAqua ]];
return [appearance isEqualToString:NSAppearanceNameDarkAqua];
@@ -261,7 +261,7 @@ AppleApplication *qt_apple_sharedApplication()
}
#endif
-#if defined(Q_OS_MACOS) && !defined(QT_BOOTSTRAPPED)
+#if defined(Q_OS_MACØS) && !defined(QT_BOOTSTRAPPED)
bool qt_apple_isSandboxed()
{
static bool isSandboxed = []() {
@@ -298,7 +298,7 @@ QT_END_NAMESPACE
QT_BEGIN_NAMESPACE
#endif
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
/*
Ensure that Objective-C objects auto-released in main(), directly or indirectly,
after QCoreApplication construction, are released when the app goes out of scope.
@@ -493,7 +493,7 @@ void qt_apple_check_os_version()
const char *os = "iOS";
const int version = __IPHONE_OS_VERSION_MIN_REQUIRED;
#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
- const char *os = "macOS";
+ const char *os = "macØS";
const int version = __MAC_OS_X_VERSION_MIN_REQUIRED;
#endif
const NSOperatingSystemVersion required = (NSOperatingSystemVersion){
diff --git i/src/corelib/kernel/qcore_mac_p.h w/src/corelib/kernel/qcore_mac_p.h
index 535d3579b2..95437efd6d 100644
--- i/src/corelib/kernel/qcore_mac_p.h
+++ w/src/corelib/kernel/qcore_mac_p.h
@@ -111,7 +111,7 @@ protected:
};
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
class QMacRootLevelAutoReleasePool
{
public:
@@ -164,7 +164,7 @@ private:
QString string;
};
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
Q_CORE_EXPORT QChar qt_mac_qtKey2CocoaKey(Qt::Key key);
Q_CORE_EXPORT Qt::Key qt_mac_cocoaKey2QtKey(QChar keyCode);
Q_CORE_EXPORT bool qt_mac_applicationIsInDarkMode();
@@ -177,7 +177,7 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QCFString &string);
Q_CORE_EXPORT bool qt_apple_isApplicationExtension();
-#if defined(Q_OS_MACOS) && !defined(QT_BOOTSTRAPPED)
+#if defined(Q_OS_MACØS) && !defined(QT_BOOTSTRAPPED)
Q_CORE_EXPORT bool qt_apple_isSandboxed();
# ifdef __OBJC__
QT_END_NAMESPACE
@@ -190,7 +190,7 @@ QT_BEGIN_NAMESPACE
#if !defined(QT_BOOTSTRAPPED) && !defined(Q_OS_WATCHOS)
QT_END_NAMESPACE
-# if defined(Q_OS_MACOS)
+# if defined(Q_OS_MACØS)
Q_FORWARD_DECLARE_OBJC_CLASS(NSApplication);
using AppleApplication = NSApplication;
# else
diff --git i/src/corelib/kernel/qcoreapplication.cpp w/src/corelib/kernel/qcoreapplication.cpp
index e25049f821..f5c349be50 100644
--- i/src/corelib/kernel/qcoreapplication.cpp
+++ w/src/corelib/kernel/qcoreapplication.cpp
@@ -784,7 +784,7 @@ void QCoreApplicationPrivate::init()
{
Q_TRACE_SCOPE(QCoreApplicationPrivate_init);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
QMacAutoReleasePool pool;
#endif
@@ -2269,7 +2269,7 @@ void QCoreApplicationPrivate::setApplicationFilePath(const QString &path)
directory, and you run the \c{regexp} example, this function will
return "C:/Qt/examples/tools/regexp".
- On \macos and iOS this will point to the directory actually containing
+ On \macøs and iOS this will point to the directory actually containing
the executable, which may be inside an application bundle (if the
application is bundled).
@@ -2615,7 +2615,7 @@ Q_CORE_EXPORT QString qt_applicationName_noFallback()
\li Universal Windows Platform
\li version attribute of the application package manifest
\row
- \li macOS, iOS, tvOS, watchOS
+ \li macØS, iOS, tvOS, watchOS
\li CFBundleVersion property of the information property list
\row
\li Android
diff --git i/src/corelib/kernel/qcoreapplication_p.h w/src/corelib/kernel/qcoreapplication_p.h
index 3bad42d076..3fbe9d6bbe 100644
--- i/src/corelib/kernel/qcoreapplication_p.h
+++ w/src/corelib/kernel/qcoreapplication_p.h
@@ -63,7 +63,7 @@
#include "private/qobject_p.h"
#endif
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
#include "private/qcore_mac_p.h"
#endif
diff --git i/src/corelib/kernel/qcoreevent.cpp w/src/corelib/kernel/qcoreevent.cpp
index 4cfc749386..afa176c257 100644
--- i/src/corelib/kernel/qcoreevent.cpp
+++ w/src/corelib/kernel/qcoreevent.cpp
@@ -176,7 +176,7 @@ QT_BEGIN_NAMESPACE
\value NonClientAreaMouseButtonPress A mouse button press occurred outside the client area (QMouseEvent).
\value NonClientAreaMouseButtonRelease A mouse button release occurred outside the client area (QMouseEvent).
\value NonClientAreaMouseMove A mouse move occurred outside the client area (QMouseEvent).
- \value MacSizeChange The user changed his widget sizes (\macos only).
+ \value MacSizeChange The user changed his widget sizes (\macøs only).
\value MetaCall An asynchronous method invocation via QMetaObject::invokeMethod().
\value ModifiedChange Widgets modification state has been changed.
\value MouseButtonDblClick Mouse press again (QMouseEvent).
@@ -228,7 +228,7 @@ QT_BEGIN_NAMESPACE
\omitvalue ThemeChange
\value ThreadChange The object is moved to another thread. This is the last event sent to this object in the previous thread. See QObject::moveToThread().
\value Timer Regular timer events (QTimerEvent).
- \value ToolBarChange The toolbar button is toggled on \macos.
+ \value ToolBarChange The toolbar button is toggled on \macøs.
\value ToolTip A tooltip was requested (QHelpEvent).
\value ToolTipChange The widget's tooltip has changed.
\value TouchBegin Beginning of a sequence of touch-screen or track-pad events (QTouchEvent).
diff --git i/src/corelib/kernel/qelapsedtimer.cpp w/src/corelib/kernel/qelapsedtimer.cpp
index 57825583dd..8da21d0710 100644
--- i/src/corelib/kernel/qelapsedtimer.cpp
+++ w/src/corelib/kernel/qelapsedtimer.cpp
@@ -140,7 +140,7 @@ QT_BEGIN_NAMESPACE
\value SystemTime The human-readable system time. This clock is not monotonic.
\value MonotonicClock The system's monotonic clock, usually found in Unix systems. This clock is monotonic and does not overflow.
\value TickCounter The system's tick counter, used on Windows systems. This clock may overflow.
- \value MachAbsoluteTime The Mach kernel's absolute time (\macos and iOS). This clock is monotonic and does not overflow.
+ \value MachAbsoluteTime The Mach kernel's absolute time (\macøs and iOS). This clock is monotonic and does not overflow.
\value PerformanceCounter The high-resolution performance counter provided by Windows. This clock is monotonic and does not overflow.
\section2 SystemTime
@@ -182,8 +182,8 @@ QT_BEGIN_NAMESPACE
\section2 MachAbsoluteTime
This clock type is based on the absolute time presented by Mach kernels,
- such as that found on \macos. This clock type is presented separately
- from MonotonicClock since \macos and iOS are also Unix systems and may support
+ such as that found on \macøs. This clock type is presented separately
+ from MonotonicClock since \macøs and iOS are also Unix systems and may support
a POSIX monotonic clock with values differing from the Mach absolute
time.
diff --git i/src/corelib/kernel/qt_attribution.json w/src/corelib/kernel/qt_attribution.json
index 6d8f4f2abc..3462ddfcfd 100644
--- i/src/corelib/kernel/qt_attribution.json
+++ w/src/corelib/kernel/qt_attribution.json
@@ -1,12 +1,12 @@
{
"Id": "qeventdispatcher_cf",
- "Name": "QEventDispatcher on macOS",
+ "Name": "QEventDispatcher on macØS",
"QDocModule": "qtcore",
- "QtUsage": "Used in Qt Core on macOS.",
+ "QtUsage": "Used in Qt Core on macØS.",
"Path": "qeventdispatcher_cf_p.h",
"Description": "Treat as final version; no upstream known",
- "Description": "Implementation of QAbstractEventDispatcher for macOS.",
+ "Description": "Implementation of QAbstractEventDispatcher for macØS.",
"License": "BSD 3-clause \"New\" or \"Revised\" License",
"LicenseId": "BSD-3-Clause",
"LicenseFile": "QEVENTDISPATCHER_CF_LICENSE.txt",
diff --git i/src/corelib/mimetypes/qmimedatabase.cpp w/src/corelib/mimetypes/qmimedatabase.cpp
index 24a7a35ea5..96e82c370b 100644
--- i/src/corelib/mimetypes/qmimedatabase.cpp
+++ w/src/corelib/mimetypes/qmimedatabase.cpp
@@ -436,7 +436,7 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent)
The MIME type database is provided by the freedesktop.org shared-mime-info
project. If the MIME type database cannot be found on the system, as is the case
- on most Windows, \macos, and iOS systems, Qt will use its own copy of it.
+ on most Windows, \macøs, and iOS systems, Qt will use its own copy of it.
Applications which want to define custom MIME types need to install an
XML file into the locations searched for MIME definitions.
diff --git i/src/corelib/plugin/qlibrary.cpp w/src/corelib/plugin/qlibrary.cpp
index eeaa3c18ec..5192a434d3 100644
--- i/src/corelib/plugin/qlibrary.cpp
+++ w/src/corelib/plugin/qlibrary.cpp
@@ -625,7 +625,7 @@ bool QLibraryPrivate::loadPlugin()
\row \li Unix/Linux \li \c .so
\row \li AIX \li \c .a
\row \li HP-UX \li \c .sl, \c .so (HP-UXi)
- \row \li \macos and iOS \li \c .dylib, \c .bundle, \c .so
+ \row \li \macøs and iOS \li \c .dylib, \c .bundle, \c .so
\endtable
Trailing versioning numbers on Unix are ignored.
@@ -859,7 +859,7 @@ QLibrary::QLibrary(QObject *parent)
We recommend omitting the file's suffix in \a fileName, since
QLibrary will automatically look for the file with the appropriate
suffix in accordance with the platform, e.g. ".so" on Unix,
- ".dylib" on \macos and iOS, and ".dll" on Windows. (See \l{fileName}.)
+ ".dylib" on \macøs and iOS, and ".dll" on Windows. (See \l{fileName}.)
*/
QLibrary::QLibrary(const QString& fileName, QObject *parent)
:QObject(parent), d(0), did_load(false)
@@ -876,7 +876,7 @@ QLibrary::QLibrary(const QString& fileName, QObject *parent)
We recommend omitting the file's suffix in \a fileName, since
QLibrary will automatically look for the file with the appropriate
suffix in accordance with the platform, e.g. ".so" on Unix,
- ".dylib" on \macos and iOS, and ".dll" on Windows. (See \l{fileName}.)
+ ".dylib" on \macøs and iOS, and ".dll" on Windows. (See \l{fileName}.)
*/
QLibrary::QLibrary(const QString& fileName, int verNum, QObject *parent)
:QObject(parent), d(0), did_load(false)
@@ -892,7 +892,7 @@ QLibrary::QLibrary(const QString& fileName, int verNum, QObject *parent)
We recommend omitting the file's suffix in \a fileName, since
QLibrary will automatically look for the file with the appropriate
suffix in accordance with the platform, e.g. ".so" on Unix,
- ".dylib" on \macos and iOS, and ".dll" on Windows. (See \l{fileName}.)
+ ".dylib" on \macøs and iOS, and ".dll" on Windows. (See \l{fileName}.)
*/
QLibrary::QLibrary(const QString& fileName, const QString &version, QObject *parent)
:QObject(parent), d(0), did_load(false)
diff --git i/src/corelib/plugin/qpluginloader.cpp w/src/corelib/plugin/qpluginloader.cpp
index c2443dbdda..48251e1efb 100644
--- i/src/corelib/plugin/qpluginloader.cpp
+++ w/src/corelib/plugin/qpluginloader.cpp
@@ -146,7 +146,7 @@ QPluginLoader::QPluginLoader(QObject *parent)
To be loadable, the file's suffix must be a valid suffix for a
loadable library in accordance with the platform, e.g. \c .so on
- Unix, - \c .dylib on \macos and iOS, and \c .dll on Windows. The suffix
+ Unix, - \c .dylib on \macøs and iOS, and \c .dll on Windows. The suffix
can be verified with QLibrary::isLibrary().
\sa setFileName()
diff --git i/src/corelib/text/qstring.cpp w/src/corelib/text/qstring.cpp
index 4d83f19db7..3012d200ab 100644
--- i/src/corelib/text/qstring.cpp
+++ w/src/corelib/text/qstring.cpp
@@ -6353,7 +6353,7 @@ int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2,
platform-dependent manner. Use this function to present sorted
lists of strings to the user.
- On \macos and iOS this function compares according the
+ On \macøs and iOS this function compares according the
"Order for sorted lists" setting in the International preferences panel.
\sa compare(), QLocale
@@ -10936,7 +10936,7 @@ QStringRef QStringRef::appendTo(QString *string) const
platform-dependent manner. Use this function to present sorted
lists of strings to the user.
- On \macos and iOS, this function compares according the
+ On \macøs and iOS, this function compares according the
"Order for sorted lists" setting in the International prefereces panel.
\sa compare(), QLocale
diff --git i/src/corelib/text/text.pri w/src/corelib/text/text.pri
index 25e281f37a..aabad7d4a1 100644
--- i/src/corelib/text/text.pri
+++ w/src/corelib/text/text.pri
@@ -48,7 +48,7 @@ SOURCES += \
NO_PCH_SOURCES += text/qstring_compat.cpp
false: SOURCES += $$NO_PCH_SOURCES # Hack for QtCreator
-!nacl:macos: {
+!nacl:macøs: {
SOURCES += text/qlocale_mac.mm
}
else:unix {
@@ -67,7 +67,7 @@ qtConfig(icu) {
text/qcollator_icu.cpp
} else: win32 {
SOURCES += text/qcollator_win.cpp
-} else: macos {
+} else: macøs {
SOURCES += text/qcollator_macx.cpp
} else {
SOURCES += text/qcollator_posix.cpp
diff --git i/src/corelib/time/qtimezoneprivate_mac.mm w/src/corelib/time/qtimezoneprivate_mac.mm
index 1fb48a31d3..6dc8af2923 100644
--- i/src/corelib/time/qtimezoneprivate_mac.mm
+++ w/src/corelib/time/qtimezoneprivate_mac.mm
@@ -98,7 +98,7 @@ void QMacTimeZonePrivate::init(const QByteArray &ianaId)
m_id = ianaId;
}
if (!m_nstz) {
- // macOS has been seen returning a systemTimeZone which reports its name
+ // macØS has been seen returning a systemTimeZone which reports its name
// as Asia/Kolkata, which doesn't appear in knownTimeZoneNames (which
// calls the zone Asia/Calcutta). So explicitly check for the name
// systemTimeZoneId() returns, and use systemTimeZone if we get it:
diff --git i/src/corelib/tools/qsimd_p.h w/src/corelib/tools/qsimd_p.h
index 26e98c4542..67ade18b42 100644
--- i/src/corelib/tools/qsimd_p.h
+++ w/src/corelib/tools/qsimd_p.h
@@ -248,7 +248,7 @@
// sub-target for us. The first AMD processor with AVX2 support (Zen) has the
// same features.
//
-// macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc
+// macØS's fat binaries support the "x86_64h" sub-architecture and the GNU libc
// ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell).
# define QT_FUNCTION_TARGET_STRING_ARCH_HASWELL "arch=haswell"
# if defined(__AVX2__) && defined(__BMI__) && defined(__BMI2__) && defined(__F16C__) && \
diff --git i/src/gui/accessible/qaccessible.cpp w/src/gui/accessible/qaccessible.cpp
index db47a3abc1..8dfde82ee5 100644
--- i/src/gui/accessible/qaccessible.cpp
+++ w/src/gui/accessible/qaccessible.cpp
@@ -94,7 +94,7 @@ Q_LOGGING_CATEGORY(lcAccessibilityCore, "qt.accessibility.core");
to replace or extend the default behavior of the static functions
in QAccessible.
- Qt supports Microsoft Active Accessibility (MSAA), \macos
+ Qt supports Microsoft Active Accessibility (MSAA), \macøs
Accessibility, and the Unix/X11 AT-SPI standard. Other backends
can be supported using QAccessibleBridge.
diff --git i/src/gui/accessible/qaccessiblebridge.cpp w/src/gui/accessible/qaccessiblebridge.cpp
index c6a417e063..e71290083b 100644
--- i/src/gui/accessible/qaccessiblebridge.cpp
+++ w/src/gui/accessible/qaccessiblebridge.cpp
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
\ingroup accessibility
\inmodule QtWidgets
- Qt supports Microsoft Active Accessibility (MSAA), \macos
+ Qt supports Microsoft Active Accessibility (MSAA), \macøs
Accessibility, and the Unix/X11 AT-SPI standard. By subclassing
QAccessibleBridge, you can support other backends than the
predefined ones.
diff --git i/src/gui/configure.json w/src/gui/configure.json
index 19312d245d..571b987c7c 100644
--- i/src/gui/configure.json
+++ w/src/gui/configure.json
@@ -1839,7 +1839,7 @@
{
"type": "note",
"condition": "features.xcb && config.darwin",
- "message": "XCB support on macOS is minimal and untested. Some features will
+ "message": "XCB support on macØS is minimal and untested. Some features will
not work properly or at all (e.g. OpenGL, desktop services or accessibility),
or may depend on your system and XQuartz setup."
},
diff --git i/src/gui/configure.pri w/src/gui/configure.pri
index 490ef0df28..42941bbf89 100644
--- i/src/gui/configure.pri
+++ w/src/gui/configure.pri
@@ -63,7 +63,7 @@ defineTest(qtConfTest_qpaDefaultPlatform) {
else: winrt: name = winrt
else: win32: name = windows
else: android: name = android
- else: macos: name = cocoa
+ else: macøs: name = cocoa
else: if(ios|tvos): name = ios
else: watchos: name = minimal
else: qnx: name = qnx
diff --git i/src/gui/doc/src/dnd.qdoc w/src/gui/doc/src/dnd.qdoc
index 945c485705..2d85b083fc 100644
--- i/src/gui/doc/src/dnd.qdoc
+++ w/src/gui/doc/src/dnd.qdoc
@@ -397,7 +397,7 @@
On X11, the public \l{http://www.newplanetsoftware.com/xdnd/}{XDND
protocol} is used, while on Windows Qt uses the OLE standard, and
- Qt for \macos uses the Cocoa Drag Manager. On X11, XDND uses MIME,
+ Qt for \macøs uses the Cocoa Drag Manager. On X11, XDND uses MIME,
so no translation is necessary. The Qt API is the same regardless of
the platform. On Windows, MIME-aware applications can communicate by
using clipboard format names that are MIME types. Already some
@@ -406,6 +406,6 @@
Custom classes for translating proprietary clipboard formats can be
registered by reimplementing QWinMime on Windows or
- QMacPasteboardMime on \macos.
+ QMacPasteboardMime on \macøs.
*/
diff --git i/src/gui/image/qicon.cpp w/src/gui/image/qicon.cpp
index 84e387e317..a1b1234521 100644
--- i/src/gui/image/qicon.cpp
+++ w/src/gui/image/qicon.cpp
@@ -1374,7 +1374,7 @@ void QIcon::setIsMask(bool isMask)
Returns \c true if this icon has been marked as a mask image.
Certain platforms render mask icons differently (for example,
- menu icons on \macos).
+ menu icons on \macøs).
\sa setIsMask()
*/
diff --git i/src/gui/kernel/qclipboard.cpp w/src/gui/kernel/qclipboard.cpp
index 267c079ad9..606e469384 100644
--- i/src/gui/kernel/qclipboard.cpp
+++ w/src/gui/kernel/qclipboard.cpp
@@ -118,22 +118,22 @@ QT_BEGIN_NAMESPACE
\endlist
- \section1 Notes for \macos Users
+ \section1 Notes for \macøs Users
- \macos supports a separate find buffer that holds the current
+ \macøs supports a separate find buffer that holds the current
search string in Find operations. This find clipboard can be accessed
by specifying the FindBuffer mode.
- \section1 Notes for Windows and \macos Users
+ \section1 Notes for Windows and \macøs Users
\list
- \li Windows and \macos do not support the global mouse
+ \li Windows and \macøs do not support the global mouse
selection; they only supports the global clipboard, i.e. they
only add text to the clipboard when an explicit copy or cut is
made.
- \li Windows and \macos does not have the concept of ownership;
+ \li Windows and \macøs does not have the concept of ownership;
the clipboard is a fully global resource so all applications are
notified of changes.
@@ -200,7 +200,7 @@ QClipboard::~QClipboard()
This signal is emitted when the clipboard data is changed.
- On \macos and with Qt version 4.3 or higher, clipboard
+ On \macøs and with Qt version 4.3 or higher, clipboard
changes made by other applications will only be detected
when the application is activated.
@@ -212,7 +212,7 @@ QClipboard::~QClipboard()
This signal is emitted when the selection is changed. This only
applies to windowing systems that support selections, e.g. X11.
- Windows and \macos don't support selections.
+ Windows and \macøs don't support selections.
\sa dataChanged(), findBufferChanged(), changed()
*/
@@ -222,7 +222,7 @@ QClipboard::~QClipboard()
\since 4.2
This signal is emitted when the find buffer is changed. This only
- applies to \macos.
+ applies to \macøs.
With Qt version 4.3 or higher, clipboard changes made by other
applications will only be detected when the application is activated.
@@ -245,7 +245,7 @@ QClipboard::~QClipboard()
systems with a global mouse selection (e.g. X11).
\value FindBuffer indicates that data should be stored and retrieved from
- the Find buffer. This mode is used for holding search strings on \macos.
+ the Find buffer. This mode is used for holding search strings on \macøs.
\omitvalue LastMode
diff --git i/src/gui/kernel/qdrag.cpp w/src/gui/kernel/qdrag.cpp
index 8e2f7be23e..07a5b0f323 100644
--- i/src/gui/kernel/qdrag.cpp
+++ w/src/gui/kernel/qdrag.cpp
@@ -224,7 +224,7 @@ QObject *QDrag::target() const
from are specified in \a supportedActions. The default proposed action will be selected
among the allowed actions in the following order: Move, Copy and Link.
- \b{Note:} On Linux and \macos, the drag and drop operation
+ \b{Note:} On Linux and \macøs, the drag and drop operation
can take some time, but this function does not block the event
loop. Other events are still delivered to the application while
the operation is performed. On Windows, the Qt event loop is
@@ -248,7 +248,7 @@ Qt::DropAction QDrag::exec(Qt::DropActions supportedActions)
The \a defaultDropAction determines which action will be proposed when the user performs a
drag without using modifier keys.
- \b{Note:} On Linux and \macos, the drag and drop operation
+ \b{Note:} On Linux and \macøs, the drag and drop operation
can take some time, but this function does not block the event
loop. Other events are still delivered to the application while
the operation is performed. On Windows, the Qt event loop is
@@ -323,7 +323,7 @@ Qt::DropAction QDrag::start(Qt::DropActions request)
native cursor for \a action pass in a null QPixmap as \a cursor.
Note: setting the drag cursor for IgnoreAction may not work on
- all platforms. X11 and macOS has been tested to work. Windows
+ all platforms. X11 and macØS has been tested to work. Windows
does not support it.
*/
void QDrag::setDragCursor(const QPixmap &cursor, Qt::DropAction action)
diff --git i/src/gui/kernel/qevent.cpp w/src/gui/kernel/qevent.cpp
index f555f4dc05..1301d09948 100644
--- i/src/gui/kernel/qevent.cpp
+++ w/src/gui/kernel/qevent.cpp
@@ -670,7 +670,7 @@ QHoverEvent::~QHoverEvent()
wheel event delta: angleDelta() returns the delta in wheel
degrees. This value is always provided. pixelDelta() returns
the delta in screen pixels and is available on platforms that
- have high-resolution trackpads, such as \macos. If that is the
+ have high-resolution trackpads, such as \macøs. If that is the
case, source() will return Qt::MouseEventSynthesizedBySystem.
The functions pos() and globalPos() return the mouse cursor's
@@ -868,7 +868,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
to Qt::MouseEventSynthesizedByQt.
If the system is configured to invert the delta values delivered with the
- event (such as natural scrolling of the touchpad on macOS), \a inverted
+ event (such as natural scrolling of the touchpad on macØS), \a inverted
should be \c true. Otherwise, \a inverted is \c false
\sa position(), globalPosition(), angleDelta(), pixelDelta(), phase(), inverted(), source()
@@ -896,7 +896,7 @@ QWheelEvent::~QWheelEvent()
Returns the scrolling distance in pixels on screen. This value is
provided on platforms that support high-resolution pixel-based
- delta values, such as \macos. The value should be used directly
+ delta values, such as \macøs. The value should be used directly
to scroll content on screen.
Example:
@@ -1036,7 +1036,7 @@ QWheelEvent::~QWheelEvent()
Returns the scrolling phase of this wheel event.
\note The Qt::ScrollBegin and Qt::ScrollEnd phases are currently
- supported only on \macos.
+ supported only on \macøs.
*/
@@ -1648,7 +1648,7 @@ QCloseEvent::~QCloseEvent()
\ingroup events
Icon drag events are sent to widgets when the main icon of a window
- has been dragged away. On \macos, this happens when the proxy
+ has been dragged away. On \macøs, this happens when the proxy
icon of a window is dragged off the title bar.
It is normal to begin using drag and drop in response to this
@@ -2660,15 +2660,15 @@ Qt::MouseButtons QTabletEvent::buttons() const
\row
\li Qt::ZoomNativeGesture
\li Magnification delta in percent.
- \li \macos: Two-finger pinch.
+ \li \macøs: Two-finger pinch.
\row
\li Qt::SmartZoomNativeGesture
\li Boolean magnification state.
- \li \macos: Two-finger douple tap (trackpad) / One-finger douple tap (magic mouse).
+ \li \macøs: Two-finger douple tap (trackpad) / One-finger douple tap (magic mouse).
\row
\li Qt::RotateNativeGesture
\li Rotation delta in degrees.
- \li \macos: Two-finger rotate.
+ \li \macøs: Two-finger rotate.
\endtable
@@ -2707,7 +2707,7 @@ Q_GLOBAL_STATIC(NativeGestureEventDataHash, g_nativeGestureEventDataHash)
gesture position relative to the receiving widget or item,
window, and screen, respectively.
- \a realValue is the \macos event parameter, \a sequenceId and \a intValue are the Windows event parameters.
+ \a realValue is the \macøs event parameter, \a sequenceId and \a intValue are the Windows event parameters.
\since 5.10
*/
QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QTouchDevice *device, const QPointF &localPos, const QPointF &windowPos,
@@ -3464,16 +3464,16 @@ QShowEvent::~QShowEvent()
when the operating system requests that a file or URL should be opened.
This is a high-level event that can be caused by different user actions
depending on the user's desktop environment; for example, double
- clicking on an file icon in the Finder on \macos.
+ clicking on an file icon in the Finder on \macøs.
This event is only used to notify the application of a request.
It may be safely ignored.
- \note This class is currently supported for \macos only.
+ \note This class is currently supported for \macøs only.
- \section1 \macos Example
+ \section1 \macøs Example
- In order to trigger the event on \macos, the application must be configured
+ In order to trigger the event on \macøs, the application must be configured
to let the OS know what kind of file(s) it should react on.
For example, the following \c Info.plist file declares that the application
@@ -3550,13 +3550,13 @@ bool QFileOpenEvent::openFile(QFile &file, QIODevice::OpenMode flags) const
\internal
\class QToolBarChangeEvent
\brief The QToolBarChangeEvent class provides an event that is
- sent whenever a the toolbar button is clicked on \macos.
+ sent whenever a the toolbar button is clicked on \macøs.
\ingroup events
\inmodule QtGui
The QToolBarChangeEvent is sent when the toolbar button is clicked. On
- \macos, this is the long oblong button on the right side of the window
+ \macøs, this is the long oblong button on the right side of the window
title bar. The default implementation is to toggle the appearance (hidden or
shown) of the associated toolbars for the window.
*/
diff --git i/src/gui/kernel/qguiapplication.cpp w/src/gui/kernel/qguiapplication.cpp
index 54f3996b6e..99288a39fb 100644
--- i/src/gui/kernel/qguiapplication.cpp
+++ w/src/gui/kernel/qguiapplication.cpp
@@ -617,7 +617,7 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
Qt::GroupSwitchModifier.
\endlist
- The following parameter is available for \c {-platform cocoa} (on macOS):
+ The following parameter is available for \c {-platform cocoa} (on macØS):
\list
\li \c {fontengine=freetype}, uses the FreeType font engine.
@@ -1144,7 +1144,7 @@ QWindow *QGuiApplication::topLevelAt(const QPoint &pos)
\list
\li \c android
- \li \c cocoa is a platform plugin for \macos.
+ \li \c cocoa is a platform plugin for \macøs.
\li \c directfb
\li \c eglfs is a platform plugin for running Qt5 applications on top of
EGL and OpenGL ES 2.0 without an actual windowing system (like X11
@@ -1494,7 +1494,7 @@ void QGuiApplicationPrivate::init()
{
Q_TRACE_SCOPE(QGuiApplicationPrivate_init);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
QMacAutoReleasePool pool;
#endif
diff --git i/src/gui/kernel/qhighdpiscaling.cpp w/src/gui/kernel/qhighdpiscaling.cpp
index fde6bb0180..bfae0f88bc 100644
--- i/src/gui/kernel/qhighdpiscaling.cpp
+++ w/src/gui/kernel/qhighdpiscaling.cpp
@@ -154,7 +154,7 @@ static inline qreal initialGlobalScaleFactor()
The devicePixelRatio seen by applications is the product of the Qt scale
factor and the OS scale factor. The value of the scale factors may be 1,
in which case two or more of the coordinate systems are equivalent. Platforms
- that (may) have an OS scale factor include \macos, iOS and Wayland.
+ that (may) have an OS scale factor include \macøs, iOS and Wayland.
Note that the functions in this file do not work with the OS scale factor
directly and are limited to converting between device independent and native
diff --git i/src/gui/kernel/qkeysequence.cpp w/src/gui/kernel/qkeysequence.cpp
index e1244e1006..35badc6606 100644
--- i/src/gui/kernel/qkeysequence.cpp
+++ w/src/gui/kernel/qkeysequence.cpp
@@ -59,7 +59,7 @@
QT_BEGIN_NAMESPACE
-#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC)
+#if defined(Q_OS_MACØS) || defined(Q_CLANG_QDOC)
static bool qt_sequence_no_mnemonics = true;
struct MacSpecialKey {
int key;
@@ -156,7 +156,7 @@ static bool qt_sequence_no_mnemonics = false;
Specifies whether mnemonics for menu items, labels, etc., should
be honored or not. On Windows and X11, this feature is
- on by default; on \macos, it is off. When this feature is off
+ on by default; on \macøs, it is off. When this feature is off
(that is, when \a b is false), QKeySequence::mnemonic() always
returns an empty string.
@@ -220,7 +220,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
QKeySequence objects can be cast to a QString to obtain a human-readable
translated version of the sequence. Similarly, the toString() function
- produces human-readable strings for use in menus. On \macos, the
+ produces human-readable strings for use in menus. On \macøs, the
appropriate symbols are used to describe keyboard shortcuts using special
keys on the Macintosh keyboard.
@@ -228,12 +228,12 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
code point of the character; for example, 'A' gives the same key sequence
as Qt::Key_A.
- \note On \macos, references to "Ctrl", Qt::CTRL, Qt::Key_Control
+ \note On \macøs, references to "Ctrl", Qt::CTRL, Qt::Key_Control
and Qt::ControlModifier correspond to the \uicontrol Command keys on the
Macintosh keyboard, and references to "Meta", Qt::META, Qt::Key_Meta and
Qt::MetaModifier correspond to the \uicontrol Control keys. Developers on
- \macos can use the same shortcut descriptions across all platforms,
- and their applications will automatically work as expected on \macos.
+ \macøs can use the same shortcut descriptions across all platforms,
+ and their applications will automatically work as expected on \macøs.
\section1 Standard Shortcuts
@@ -242,12 +242,12 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
setting up actions in a typical application. The table below shows
some common key sequences that are often used for these standard
shortcuts by applications on four widely-used platforms. Note
- that on \macos, the \uicontrol Ctrl value corresponds to the \uicontrol
+ that on \macøs, the \uicontrol Ctrl value corresponds to the \uicontrol
Command keys on the Macintosh keyboard, and the \uicontrol Meta value
corresponds to the \uicontrol Control keys.
\table
- \header \li StandardKey \li Windows \li \macos \li KDE Plasma \li GNOME
+ \header \li StandardKey \li Windows \li \macøs \li KDE Plasma \li GNOME
\row \li HelpContents \li F1 \li Ctrl+? \li F1 \li F1
\row \li WhatsThis \li Shift+F1 \li Shift+F1 \li Shift+F1 \li Shift+F1
\row \li Open \li Ctrl+O \li Ctrl+O \li Ctrl+O \li Ctrl+O
@@ -735,7 +735,7 @@ static Q_CONSTEXPR int numKeyNames = sizeof keyname / sizeof *keyname;
\value InsertLineSeparator Insert a new line.
\value InsertParagraphSeparator Insert a new paragraph.
\value Italic Italic text.
- \value MoveToEndOfBlock Move cursor to end of block. This shortcut is only used on the \macos.
+ \value MoveToEndOfBlock Move cursor to end of block. This shortcut is only used on the \macøs.
\value MoveToEndOfDocument Move cursor to end of document.
\value MoveToEndOfLine Move cursor to end of line.
\value MoveToNextChar Move cursor to next character.
@@ -746,7 +746,7 @@ static Q_CONSTEXPR int numKeyNames = sizeof keyname / sizeof *keyname;
\value MoveToPreviousLine Move cursor to previous line.
\value MoveToPreviousPage Move cursor to previous page.
\value MoveToPreviousWord Move cursor to previous word.
- \value MoveToStartOfBlock Move cursor to start of a block. This shortcut is only used on \macos.
+ \value MoveToStartOfBlock Move cursor to start of a block. This shortcut is only used on \macøs.
\value MoveToStartOfDocument Move cursor to start of document.
\value MoveToStartOfLine Move cursor to start of line.
\value New Create new document.
@@ -764,7 +764,7 @@ static Q_CONSTEXPR int numKeyNames = sizeof keyname / sizeof *keyname;
\value Save Save document.
\value SelectAll Select all text.
\value Deselect Deselect text. Since 5.1
- \value SelectEndOfBlock Extend selection to the end of a text block. This shortcut is only used on \macos.
+ \value SelectEndOfBlock Extend selection to the end of a text block. This shortcut is only used on \macøs.
\value SelectEndOfDocument Extend selection to end of document.
\value SelectEndOfLine Extend selection to end of line.
\value SelectNextChar Extend selection to next character.
@@ -775,7 +775,7 @@ static Q_CONSTEXPR int numKeyNames = sizeof keyname / sizeof *keyname;
\value SelectPreviousLine Extend selection to previous line.
\value SelectPreviousPage Extend selection to previous page.
\value SelectPreviousWord Extend selection to previous word.
- \value SelectStartOfBlock Extend selection to the start of a text block. This shortcut is only used on \macos.
+ \value SelectStartOfBlock Extend selection to the start of a text block. This shortcut is only used on \macøs.
\value SelectStartOfDocument Extend selection to start of document.
\value SelectStartOfLine Extend selection to start of line.
\value Underline Underline text.
@@ -1541,7 +1541,7 @@ bool QKeySequence::isDetached() const
If the key sequence has no keys, an empty string is returned.
- On \macos, the string returned resembles the sequence that is
+ On \macøs, the string returned resembles the sequence that is
shown in the menu bar if \a format is
QKeySequence::NativeText; otherwise, the string uses the
"portable" format, suitable for writing to a file.
diff --git i/src/gui/kernel/qpalette.cpp w/src/gui/kernel/qpalette.cpp
index 61dccd77ac..a2743dd541 100644
--- i/src/gui/kernel/qpalette.cpp
+++ w/src/gui/kernel/qpalette.cpp
@@ -403,7 +403,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
\warning Some styles do not use the palette for all drawing, for
instance, if they make use of native theme engines. This is the
- case for both the Windows Vista and the \macos
+ case for both the Windows Vista and the \macøs
styles.
\sa QApplication::setPalette(), QWidget::setPalette(), QColor
diff --git i/src/gui/kernel/qsurface.cpp w/src/gui/kernel/qsurface.cpp
index 709f28d431..151838609f 100644
--- i/src/gui/kernel/qsurface.cpp
+++ w/src/gui/kernel/qsurface.cpp
@@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE
in conjunction with the Vulkan graphics API.
\value MetalSurface The surface is a Metal compatible surface and can be used
in conjunction with Apple's Metal graphics API. This surface type is supported
- on macOS only.
+ on macØS only.
*/
diff --git i/src/gui/kernel/qwindow.cpp w/src/gui/kernel/qwindow.cpp
index b71a0c54aa..98ba274c8d 100644
--- i/src/gui/kernel/qwindow.cpp
+++ w/src/gui/kernel/qwindow.cpp
@@ -992,7 +992,7 @@ QString QWindow::filePath() const
The window icon might be used by the windowing system for example to
decorate the window, and/or in the task switcher.
- \note On \macos, the window title bar icon is meant for windows representing
+ \note On \macøs, the window title bar icon is meant for windows representing
documents, and will only show up if a file path is also set.
\sa setFilePath()
diff --git i/src/gui/kernel/qwindowsysteminterface.cpp w/src/gui/kernel/qwindowsysteminterface.cpp
index ba04f8701d..794c6a21a5 100644
--- i/src/gui/kernel/qwindowsysteminterface.cpp
+++ w/src/gui/kernel/qwindowsysteminterface.cpp
@@ -337,7 +337,7 @@ QWindowSystemInterfacePrivate::ExposeEvent::ExposeEvent(QWindow *window, const Q
completely covered by other windows or otherwise not visible. Expose
event consumers can then use this to disable updates for such windows.
This is required behavior on platforms where OpenGL swapbuffers stops
- blocking for obscured windows (like macOS).
+ blocking for obscured windows (like macØS).
*/
QT_DEFINE_QPA_EVENT_HANDLER(void, handleExposeEvent, QWindow *window, const QRegion &region)
{
diff --git i/src/gui/opengl/qopengl.cpp w/src/gui/opengl/qopengl.cpp
index 667d16317f..fb8abd33fa 100644
--- i/src/gui/opengl/qopengl.cpp
+++ w/src/gui/opengl/qopengl.cpp
@@ -296,7 +296,7 @@ QString OsTypeTerm::hostOs()
#elif defined(Q_OS_LINUX)
return QStringLiteral("linux");
#elif defined(Q_OS_OSX)
- return QStringLiteral("macosx");
+ return QStringLiteral("macøsx");
#elif defined(Q_OS_ANDROID)
return QStringLiteral("android");
#else
diff --git i/src/gui/opengl/qopenglversionfunctions.cpp w/src/gui/opengl/qopenglversionfunctions.cpp
index a3d3bb6bd1..351ae155c2 100644
--- i/src/gui/opengl/qopenglversionfunctions.cpp
+++ w/src/gui/opengl/qopenglversionfunctions.cpp
@@ -200,7 +200,7 @@ void QAbstractOpenGLFunctionsPrivate::removeExternalFunctions(QOpenGLContext *co
Please note that some vendors, notably Apple, do not implement the
Compatibility profile. Therefore if you wish to target new OpenGL features
- on \macos then you should ensure that you request a Core profile context via
+ on \macøs then you should ensure that you request a Core profile context via
QSurfaceFormat::setProfile().
Qt provides classes for all version and Core and Compatibility profile
diff --git i/src/gui/painting/qcoregraphics.mm w/src/gui/painting/qcoregraphics.mm
index e2497eaadb..e3b2ca85cb 100644
--- i/src/gui/painting/qcoregraphics.mm
+++ w/src/gui/painting/qcoregraphics.mm
@@ -122,7 +122,7 @@ QImage qt_mac_toQImage(CGImageRef image)
return ret;
}
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
static NSImage *qt_mac_cgimage_to_nsimage(CGImageRef image)
{
@@ -185,7 +185,7 @@ QPixmap qt_mac_toQPixmap(const NSImage *image, const QSizeF &size)
return pixmap;
}
-#endif // Q_OS_MACOS
+#endif // Q_OS_MACØS
// ---------------------- Colors and Brushes ----------------------
@@ -208,7 +208,7 @@ QColor qt_mac_toQColor(CGColorRef color)
return qtColor;
}
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QColor qt_mac_toQColor(const NSColor *color)
{
QColor qtColor;
@@ -243,7 +243,7 @@ QBrush qt_mac_toQBrush(CGColorRef color)
return qtBrush;
}
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
static bool qt_mac_isSystemColorOrInstance(const NSColor *color, NSString *colorNameComponent, NSString *className)
{
// We specifically do not want isKindOfClass: here
diff --git i/src/gui/painting/qcoregraphics_p.h w/src/gui/painting/qcoregraphics_p.h
index ba2cde8325..94853c9f79 100644
--- i/src/gui/painting/qcoregraphics_p.h
+++ w/src/gui/painting/qcoregraphics_p.h
@@ -59,7 +59,7 @@
#include <CoreGraphics/CoreGraphics.h>
-#if defined(__OBJC__) && defined(Q_OS_MACOS)
+#if defined(__OBJC__) && defined(Q_OS_MACØS)
#include <AppKit/AppKit.h>
#define HAVE_APPKIT
#endif
diff --git i/src/gui/painting/qpaintengine.cpp w/src/gui/painting/qpaintengine.cpp
index bfe1c9cadf..d84496562a 100644
--- i/src/gui/painting/qpaintengine.cpp
+++ w/src/gui/painting/qpaintengine.cpp
@@ -155,7 +155,7 @@ QFont QTextItem::font() const
provided is the raster paint engine, which contains a software
rasterizer which supports the full feature set on all supported platforms.
This is the default for painting on QWidget-based classes in e.g. on Windows,
- X11 and \macos, it is the backend for painting on QImage and it is
+ X11 and \macøs, it is the backend for painting on QImage and it is
used as a fallback for paint engines that do not support a certain
capability. In addition we provide QPaintEngine implementations for
OpenGL (accessible through QGLWidget) and printing (which allows using
@@ -372,8 +372,8 @@ void QPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDraw
\value X11
\value Windows
\value MacPrinter
- \value CoreGraphics \macos's Quartz2D (CoreGraphics)
- \value QuickDraw \macos's QuickDraw
+ \value CoreGraphics \macøs's Quartz2D (CoreGraphics)
+ \value QuickDraw \macøs's QuickDraw
\value QWindowSystem Qt for Embedded Linux
\value PostScript (No longer supported)
\value OpenGL
diff --git i/src/gui/painting/qregion.cpp w/src/gui/painting/qregion.cpp
index 82f5be2b65..5081b3b426 100644
--- i/src/gui/painting/qregion.cpp
+++ w/src/gui/painting/qregion.cpp
@@ -999,7 +999,7 @@ QRegion QRegion::intersect(const QRect &r) const
sort key and X as the minor sort key.
\endlist
\omit
- Only some platforms have these restrictions (Qt for Embedded Linux, X11 and \macos).
+ Only some platforms have these restrictions (Qt for Embedded Linux, X11 and \macøs).
\endomit
*/
diff --git i/src/gui/rhi/qrhi.cpp w/src/gui/rhi/qrhi.cpp
index 8ef98d2e42..9300be736a 100644
--- i/src/gui/rhi/qrhi.cpp
+++ w/src/gui/rhi/qrhi.cpp
@@ -49,7 +49,7 @@
#include "qrhid3d11_p_p.h"
#endif
//#ifdef Q_OS_DARWIN
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
#include "qrhimetal_p_p.h"
#endif
@@ -99,7 +99,7 @@ Q_LOGGING_CATEGORY(QRHI_LOG_INFO, "qt.rhi.general")
or library that creates the QRhi instance. Some backends are available on
multiple platforms (OpenGL, Vulkan, Null), while APIs specific to a given
platform are only available when running on the platform in question (Metal
- on macOS/iOS/tvOS, Direct3D on Windows).
+ on macØS/iOS/tvOS, Direct3D on Windows).
The available backends currently are:
@@ -3421,7 +3421,7 @@ QRhiResource::Type QRhiGraphicsPipeline::resourceType() const
Once the rendering has started, a simple way to request a new frame is
QWindow::requestUpdate(). While on some platforms this is merely a small
- timer, on others it has a specific implementation: for instance on macOS or
+ timer, on others it has a specific implementation: for instance on macØS or
iOS it may be backed by
\l{https://developer.apple.com/documentation/corevideo/cvdisplaylink?language=objc}{CVDisplayLink}.
The example above is already prepared for update requests by handling
@@ -4050,7 +4050,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
#endif
case Metal:
//#ifdef Q_OS_DARWIN
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
static_cast<QRhiMetalNativeHandles *>(importDevice));
break;
diff --git i/src/gui/rhi/qrhimetal.mm w/src/gui/rhi/qrhimetal.mm
index 131b2da802..44378c581e 100644
--- i/src/gui/rhi/qrhimetal.mm
+++ w/src/gui/rhi/qrhimetal.mm
@@ -39,7 +39,7 @@
#include <QWindow>
#include <qmath.h>
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
#include <AppKit/AppKit.h>
#endif
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
/*
Metal backend. Double buffers and throttles to vsync. "Dynamic" buffers are
Shared (host visible) and duplicated (to help having 2 frames in flight),
- "static" and "immutable" are Managed on macOS and Shared on iOS/tvOS.
+ "static" and "immutable" are Managed on macØS and Shared on iOS/tvOS.
Textures are Private (device local) and a host visible staging buffer is
used to upload data to them. Does not rely on strong objects refs from
command buffers but does rely on the automatic resource tracking of the
@@ -216,8 +216,8 @@ struct QRhiMetalData
};
QVector<TextureReadback> activeTextureReadbacks;
- API_AVAILABLE(macos(10.13), ios(11.0)) MTLCaptureManager *captureMgr;
- API_AVAILABLE(macos(10.13), ios(11.0)) id<MTLCaptureScope> captureScope = nil;
+ API_AVAILABLE(macøs(10.13), ios(11.0)) MTLCaptureManager *captureMgr;
+ API_AVAILABLE(macøs(10.13), ios(11.0)) id<MTLCaptureScope> captureScope = nil;
static const int TEXBUF_ALIGN = 256; // probably not accurate
@@ -379,7 +379,7 @@ bool QRhiMetal::create(QRhi::Flags flags)
else
d->cmdQueue = [d->dev newCommandQueue];
- if (@available(macOS 10.13, iOS 11.0, *)) {
+ if (@available(macØS 10.13, iOS 11.0, *)) {
d->captureMgr = [MTLCaptureManager sharedCaptureManager];
// Have a custom capture scope as well which then shows up in XCode as
// an option when capturing, and becomes especially useful when having
@@ -389,7 +389,7 @@ bool QRhiMetal::create(QRhi::Flags flags)
d->captureScope.label = label.toNSString();
}
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
caps.maxTextureSize = 16384;
#elif defined(Q_OS_TVOS)
if ([d->dev supportsFeatureSet: MTLFeatureSet(30003)]) // MTLFeatureSet_tvOS_GPUFamily2_v1
@@ -427,7 +427,7 @@ void QRhiMetal::destroy()
s.release();
d->shaderCache.clear();
- if (@available(macOS 10.13, iOS 11.0, *)) {
+ if (@available(macØS 10.13, iOS 11.0, *)) {
[d->captureScope release];
d->captureScope = nil;
}
@@ -505,7 +505,7 @@ bool QRhiMetal::isTextureFormatSupported(QRhiTexture::Format format, QRhiTexture
{
Q_UNUSED(flags);
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
if (format >= QRhiTexture::ETC2_RGB8 && format <= QRhiTexture::ETC2_RGBA8)
return false;
if (format >= QRhiTexture::ASTC_4x4 && format <= QRhiTexture::ASTC_12x12)
@@ -1193,7 +1193,7 @@ void QRhiMetal::debugMarkBegin(QRhiCommandBuffer *cb, const QByteArray &name)
if (cbD->recordingPass != QMetalCommandBuffer::NoPass) {
[cbD->d->currentRenderPassEncoder pushDebugGroup: str];
} else {
- if (@available(macOS 10.13, iOS 11.0, *))
+ if (@available(macØS 10.13, iOS 11.0, *))
[cbD->d->cb pushDebugGroup: str];
}
}
@@ -1207,7 +1207,7 @@ void QRhiMetal::debugMarkEnd(QRhiCommandBuffer *cb)
if (cbD->recordingPass != QMetalCommandBuffer::NoPass) {
[cbD->d->currentRenderPassEncoder popDebugGroup];
} else {
- if (@available(macOS 10.13, iOS 11.0, *))
+ if (@available(macØS 10.13, iOS 11.0, *))
[cbD->d->cb popDebugGroup];
}
}
@@ -1260,7 +1260,7 @@ QRhi::FrameOpResult QRhiMetal::beginFrame(QRhiSwapChain *swapChain, QRhi::BeginF
if (swapChainD->ds)
swapChainD->ds->lastActiveFrameSlot = currentFrameSlot;
- if (@available(macOS 10.13, iOS 11.0, *))
+ if (@available(macØS 10.13, iOS 11.0, *))
[d->captureScope beginScope];
// Do not let the command buffer mess with the refcount of objects. We do
@@ -1314,7 +1314,7 @@ QRhi::FrameOpResult QRhiMetal::endFrame(QRhiSwapChain *swapChain, QRhi::EndFrame
QRhiProfilerPrivate *rhiP = profilerPrivateOrNull();
QRHI_PROF_F(endSwapChainFrame(swapChain, swapChainD->frameCount + 1));
- if (@available(macOS 10.13, iOS 11.0, *))
+ if (@available(macØS 10.13, iOS 11.0, *))
[d->captureScope endScope];
if (needsPresent)
@@ -2076,7 +2076,7 @@ bool QMetalBuffer::build()
d->managed = false;
MTLResourceOptions opts = MTLResourceStorageModeShared;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
if (m_type != Dynamic) {
opts = MTLResourceStorageModeManaged;
d->managed = true;
@@ -2085,7 +2085,7 @@ bool QMetalBuffer::build()
// Have QMTL_FRAMES_IN_FLIGHT versions regardless of the type, for now.
// This is because writing to a Managed buffer (which is what Immutable and
- // Static maps to on macOS) is not safe when another frame reading from the
+ // Static maps to on macØS) is not safe when another frame reading from the
// same buffer is still in flight.
d->slotted = !m_usage.testFlag(QRhiBuffer::StorageBuffer); // except for SSBOs written in the shader
@@ -2168,7 +2168,7 @@ bool QMetalRenderBuffer::build()
bool transientBacking = false;
switch (m_type) {
case DepthStencil:
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
desc.storageMode = MTLStorageModePrivate;
#else
desc.storageMode = MTLResourceStorageModeMemoryless;
@@ -2265,7 +2265,7 @@ static inline MTLPixelFormat toMetalTextureFormat(QRhiTexture::Format format, QR
case QRhiTexture::BGRA8:
return srgb ? MTLPixelFormatBGRA8Unorm_sRGB : MTLPixelFormatBGRA8Unorm;
case QRhiTexture::R8:
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
return MTLPixelFormatR8Unorm;
#else
return srgb ? MTLPixelFormatR8Unorm_sRGB : MTLPixelFormatR8Unorm;
@@ -2281,7 +2281,7 @@ static inline MTLPixelFormat toMetalTextureFormat(QRhiTexture::Format format, QR
return MTLPixelFormatRGBA32Float;
case QRhiTexture::D16:
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
return MTLPixelFormatDepth16Unorm;
#else
return MTLPixelFormatDepth32Float;
@@ -2289,7 +2289,7 @@ static inline MTLPixelFormat toMetalTextureFormat(QRhiTexture::Format format, QR
case QRhiTexture::D32F:
return MTLPixelFormatDepth32Float;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
case QRhiTexture::BC1:
return srgb ? MTLPixelFormatBC1_RGBA_sRGB : MTLPixelFormatBC1_RGBA;
case QRhiTexture::BC2:
@@ -2317,7 +2317,7 @@ static inline MTLPixelFormat toMetalTextureFormat(QRhiTexture::Format format, QR
return MTLPixelFormatRGBA8Unorm;
#endif
-#ifndef Q_OS_MACOS
+#ifndef Q_OS_MACØS
case QRhiTexture::ETC2_RGB8:
return srgb ? MTLPixelFormatETC2_RGB8_sRGB : MTLPixelFormatETC2_RGB8;
case QRhiTexture::ETC2_RGB8A1:
@@ -2937,7 +2937,7 @@ static inline MTLVertexFormat toMetalAttributeFormat(QRhiVertexInputAttribute::F
case QRhiVertexInputAttribute::UNormByte2:
return MTLVertexFormatUChar2Normalized;
case QRhiVertexInputAttribute::UNormByte:
- if (@available(macOS 10.13, iOS 11.0, *))
+ if (@available(macØS 10.13, iOS 11.0, *))
return MTLVertexFormatUCharNormalized;
else
Q_UNREACHABLE();
@@ -3634,9 +3634,9 @@ bool QMetalSwapChain::buildOrResize()
if (m_flags.testFlag(UsedAsTransferSource))
d->layer.framebufferOnly = NO;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
if (m_flags.testFlag(NoVSync)) {
- if (@available(macOS 10.13, *))
+ if (@available(macØS 10.13, *))
d->layer.displaySyncEnabled = NO;
}
#endif
diff --git i/src/gui/rhi/rhi.pri w/src/gui/rhi/rhi.pri
index 4297a5602b..86083ba646 100644
--- i/src/gui/rhi/rhi.pri
+++ w/src/gui/rhi/rhi.pri
@@ -44,7 +44,7 @@ win32 {
}
# darwin {
-macos {
+macøs {
HEADERS += \
rhi/qrhimetal_p.h \
rhi/qrhimetal_p_p.h
diff --git i/src/gui/text/qfont.cpp w/src/gui/text/qfont.cpp
index bf130fa0b7..16f8692931 100644
--- i/src/gui/text/qfont.cpp
+++ w/src/gui/text/qfont.cpp
@@ -864,7 +864,7 @@ int QFont::pointSize() const
\li Vertical hinting (light)
\li Full hinting
\row
- \li Cocoa on \macos
+ \li Cocoa on \macøs
\li No hinting
\li No hinting
\li No hinting
diff --git i/src/gui/text/qfontdatabase.cpp w/src/gui/text/qfontdatabase.cpp
index 67702ab5b5..e34cbd8d89 100644
--- i/src/gui/text/qfontdatabase.cpp
+++ w/src/gui/text/qfontdatabase.cpp
@@ -2049,7 +2049,7 @@ bool QFontDatabase::hasFamily(const QString &family) const
Returns \c true if and only if the \a family font family is private.
- This happens, for instance, on \macos and iOS, where the system UI fonts are not
+ This happens, for instance, on \macøs and iOS, where the system UI fonts are not
accessible to the user. For completeness, QFontDatabase::families() returns all
font families, including the private ones. You should use this function if you
are developing a font selection control in order to keep private fonts hidden.
diff --git i/src/gui/text/qrawfont.cpp w/src/gui/text/qrawfont.cpp
index a060448924..8c491a1cb3 100644
--- i/src/gui/text/qrawfont.cpp
+++ w/src/gui/text/qrawfont.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
also have accessors to some relevant data in the physical font.
QRawFont only provides support for the main font technologies: GDI and DirectWrite on Windows
- platforms, FreeType on Linux platforms and CoreText on \macos. For other
+ platforms, FreeType on Linux platforms and CoreText on \macøs. For other
font back-ends, the APIs will be disabled.
QRawFont can be constructed in a number of ways:
diff --git i/src/gui/text/qtextformat.cpp w/src/gui/text/qtextformat.cpp
index e3bd49a15e..3e619ebfa7 100644
--- i/src/gui/text/qtextformat.cpp
+++ w/src/gui/text/qtextformat.cpp
@@ -1386,7 +1386,7 @@ bool QTextFormat::operator==(const QTextFormat &rhs) const
\value WaveUnderline The text is underlined using a wave shaped line.
\value SpellCheckUnderline The underline is drawn depending on the SpellCheckUnderlineStyle
theme hint of QPlatformTheme. By default this is mapped to
- WaveUnderline, on \macos it is mapped to DotLine.
+ WaveUnderline, on \macøs it is mapped to DotLine.
\sa Qt::PenStyle
*/
diff --git i/src/gui/vulkan/qplatformvulkaninstance.h w/src/gui/vulkan/qplatformvulkaninstance.h
index d47c59b5db..c517dcbf3d 100644
--- i/src/gui/vulkan/qplatformvulkaninstance.h
+++ w/src/gui/vulkan/qplatformvulkaninstance.h
@@ -92,7 +92,7 @@ QT_END_NAMESPACE
#if defined(Q_CLANG_QDOC)
/*
The following include file did not exist for clang-qdoc running
- in macOS, but the classes are documented in qvulkanfunctions.cpp.
+ in macØS, but the classes are documented in qvulkanfunctions.cpp.
clang-qdoc must parse the class declarations in an include file,
or else it can't find a place to put the documentation for the
classes. Apparently these classes are created at build time if
diff --git i/src/network/access/qnetworkaccessmanager.cpp w/src/network/access/qnetworkaccessmanager.cpp
index 76b95b5823..e9cac0f6c0 100644
--- i/src/network/access/qnetworkaccessmanager.cpp
+++ w/src/network/access/qnetworkaccessmanager.cpp
@@ -82,7 +82,7 @@
#include <QHostInfo>
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
#include <CoreServices/CoreServices.h>
#include <SystemConfiguration/SystemConfiguration.h>
#include <Security/SecKeychain.h>
diff --git i/src/network/kernel/kernel.pri w/src/network/kernel/kernel.pri
index 110d9f56bf..4abb1c6fda 100644
--- i/src/network/kernel/kernel.pri
+++ w/src/network/kernel/kernel.pri
@@ -72,7 +72,7 @@ mac {
!uikit: LIBS_PRIVATE += -framework CoreServices -framework SystemConfiguration
}
-macos | ios {
+macøs | ios {
OBJECTIVE_SOURCES += \
kernel/qnetconmonitor_darwin.mm
diff --git i/src/network/kernel/qnetworkinterface.cpp w/src/network/kernel/qnetworkinterface.cpp
index d43dba3e0c..ce3cbceeae 100644
--- i/src/network/kernel/qnetworkinterface.cpp
+++ w/src/network/kernel/qnetworkinterface.cpp
@@ -542,7 +542,7 @@ bool QNetworkAddressEntry::isPermanent() const
Not all operating systems support reporting all features. Only the
IPv4 addresses are guaranteed to be listed by this class in all
platforms. In particular, IPv6 address listing is only supported
- on Windows, Linux, \macos and the BSDs.
+ on Windows, Linux, \macøs and the BSDs.
\sa QNetworkAddressEntry
*/
diff --git i/src/network/kernel/qnetworkproxy.cpp w/src/network/kernel/qnetworkproxy.cpp
index a2a89ed94b..6e4dad2bf7 100644
--- i/src/network/kernel/qnetworkproxy.cpp
+++ w/src/network/kernel/qnetworkproxy.cpp
@@ -1602,7 +1602,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
those settings are not found, this function will attempt to obtain
Internet Explorer's settings and use them.
- On \macos, this function will obtain the proxy settings using the
+ On \macøs, this function will obtain the proxy settings using the
SystemConfiguration framework from Apple. It will apply the FTP,
HTTP and HTTPS proxy configurations for queries that contain the
protocol tag "ftp", "http" and "https", respectively. If the SOCKS
@@ -1621,7 +1621,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
listed here.
\list
- \li On \macos, this function will ignore the Proxy Auto Configuration
+ \li On \macøs, this function will ignore the Proxy Auto Configuration
settings, since it cannot execute the associated ECMAScript code.
\li On Windows platforms, this function may take several seconds to
diff --git i/src/network/socket/qabstractsocket.cpp w/src/network/socket/qabstractsocket.cpp
index b1ea9a4133..13f5530bdc 100644
--- i/src/network/socket/qabstractsocket.cpp
+++ w/src/network/socket/qabstractsocket.cpp
@@ -433,7 +433,7 @@
allowed to rebind, even if they pass ReuseAddressHint. This option
provides more security than ShareAddress, but on certain operating
systems, it requires you to run the server with administrator privileges.
- On Unix and \macos, not sharing is the default behavior for binding
+ On Unix and \macøs, not sharing is the default behavior for binding
an address and port, so this option is ignored. On Windows, this
option uses the SO_EXCLUSIVEADDRUSE socket option.
@@ -443,7 +443,7 @@
socket option.
\value DefaultForPlatform The default option for the current platform.
- On Unix and \macos, this is equivalent to (DontShareAddress
+ On Unix and \macøs, this is equivalent to (DontShareAddress
+ ReuseAddressHint), and on Windows, it is equivalent to ShareAddress.
*/
diff --git i/src/network/socket/qlocalserver.cpp w/src/network/socket/qlocalserver.cpp
index 3e36a7b229..ac3822cab5 100644
--- i/src/network/socket/qlocalserver.cpp
+++ w/src/network/socket/qlocalserver.cpp
@@ -149,7 +149,7 @@ QLocalServer::~QLocalServer()
and are created based on the umask. Setting the access flags will
overide this and will restrict or permit access as specified.
- Other Unix-based operating systems, such as \macos, do not
+ Other Unix-based operating systems, such as \macøs, do not
honor file permissions for Unix domain sockets and by default
have WorldAccess and these permission flags will have no effect.
diff --git i/src/network/socket/qnativesocketengine_unix.cpp w/src/network/socket/qnativesocketengine_unix.cpp
index 3ca586e247..1d6a332d9c 100644
--- i/src/network/socket/qnativesocketengine_unix.cpp
+++ w/src/network/socket/qnativesocketengine_unix.cpp
@@ -883,7 +883,7 @@ qint64 QNativeSocketEnginePrivate::nativePendingDatagramSize() const
char c;
EINTR_LOOP(recvResult, ::recv(socketDescriptor, &c, 1, MSG_PEEK | MSG_TRUNC));
#elif defined(SO_NREAD)
- // macOS can return the actual datagram size if we use SO_NREAD
+ // macØS can return the actual datagram size if we use SO_NREAD
int value;
socklen_t valuelen = sizeof(value);
recvResult = getsockopt(socketDescriptor, SOL_SOCKET, SO_NREAD, &value, &valuelen);
diff --git i/src/network/ssl/qsslsocket.cpp w/src/network/ssl/qsslsocket.cpp
index e302aa1761..7793c7fdf3 100644
--- i/src/network/ssl/qsslsocket.cpp
+++ w/src/network/ssl/qsslsocket.cpp
@@ -143,7 +143,7 @@
addDefaultCaCertificates(), and QSslConfiguration::defaultConfiguration().setCaCertificates().
\endlist
- \note If available, root certificates on Unix (excluding \macos) will be
+ \note If available, root certificates on Unix (excluding \macøs) will be
loaded on demand from the standard certificate directories. If you do not
want to load root certificates on demand, you need to call either
QSslConfiguration::defaultConfiguration().setCaCertificates() before the first
@@ -1010,7 +1010,7 @@ QList<QSslCertificate> QSslSocket::localCertificateChain() const
sockets, but are also rarely used by client sockets if the server requires
the client to authenticate.
- \note Secure Transport SSL backend on macOS may update the default keychain
+ \note Secure Transport SSL backend on macØS may update the default keychain
(the default is probably your login keychain) by importing your local certificates
and keys. This can also result in system dialogs showing up and asking for
permission when your application is using these private keys. If such behavior
diff --git i/src/network/ssl/qsslsocket_mac.cpp w/src/network/ssl/qsslsocket_mac.cpp
index e0e065679d..daca9acb0a 100644
--- i/src/network/ssl/qsslsocket_mac.cpp
+++ w/src/network/ssl/qsslsocket_mac.cpp
@@ -74,10 +74,10 @@ QT_BEGIN_NAMESPACE
namespace
{
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
/*
-Our own temporarykeychain is needed only on macOS where SecPKCS12Import changes
+Our own temporarykeychain is needed only on macØS where SecPKCS12Import changes
the default keychain and where we see annoying pop-ups asking about accessing a
private key.
@@ -173,7 +173,7 @@ EphemeralSecKeychain::~EphemeralSecKeychain()
}
}
-#endif // Q_OS_MACOS
+#endif // Q_OS_MACØS
} // unnamed namespace
@@ -224,7 +224,7 @@ bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
-#if !defined(QT_PLATFORM_UIKIT) // dhparam is only used on macOS. (see the SSLSetDiffieHellmanParams call below)
+#if !defined(QT_PLATFORM_UIKIT) // dhparam is only used on macØS. (see the SSLSetDiffieHellmanParams call below)
static const uint8_t dhparam[] =
"\x30\x82\x01\x08\x02\x82\x01\x01\x00\x97\xea\xd0\x46\xf7\xae\xa7\x76\x80"
"\x9c\x74\x56\x98\xd8\x56\x97\x2b\x20\x6c\x77\xe2\x82\xbb\xc8\x84\xbe\xe7"
@@ -415,7 +415,7 @@ void QSslSocketBackendPrivate::continueHandshake()
// a callback during handshake. We can only set our list of preferred protocols
// (and send it during handshake) and then receive what our peer has sent to us.
// And here we can finally try to find a match (if any).
- if (__builtin_available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *)) {
+ if (__builtin_available(macØS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *)) {
const auto &requestedProtocols = configuration.nextAllowedProtocols;
if (const int requestedCount = requestedProtocols.size()) {
configuration.nextProtocolNegotiationStatus = QSslConfiguration::NextProtocolNegotiationNone;
@@ -923,7 +923,7 @@ bool QSslSocketBackendPrivate::initSslContext()
}
#if QT_DARWIN_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13_4, __IPHONE_11_0, __TVOS_11_0, __WATCHOS_4_0)
- if (__builtin_available(macOS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *)) {
+ if (__builtin_available(macØS 10.13, iOS 11.0, tvOS 11.0, watchOS 4.0, *)) {
const auto protocolNames = configuration.nextAllowedProtocols;
QCFType<CFMutableArrayRef> cfNames(CFArrayCreateMutable(nullptr, 0, &kCFTypeArrayCallBacks));
if (cfNames) {
@@ -1026,7 +1026,7 @@ bool QSslSocketBackendPrivate::setSessionCertificate(QString &errorDescription,
const void *keys[2] = { kSecImportExportPassphrase };
const void *values[2] = { password };
CFIndex nKeys = 1;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
bool envOk = false;
const int env = qEnvironmentVariableIntValue("QT_SSL_USE_TEMPORARY_KEYCHAIN", &envOk);
if (envOk && env) {
@@ -1125,7 +1125,7 @@ bool QSslSocketBackendPrivate::setSessionProtocol()
// SecureTransport has kTLSProtocol13 constant and also, kTLSProtocolMaxSupported.
// Calling SSLSetProtocolVersionMax/Min with any of these two constants results
// in errInvalidParam and a failure to set the protocol version. This means
- // no TLS 1.3 on macOS and iOS.
+ // no TLS 1.3 on macØS and iOS.
switch (configuration.protocol) {
case QSsl::TlsV1_3:
case QSsl::TlsV1_3OrLater:
@@ -1346,7 +1346,7 @@ bool QSslSocketBackendPrivate::verifyPeerTrust()
// QSslConfiguration and the ones from the system database. This behavior can
// be unexpected if a user's code tries to limit the trusted CAs to those
// explicitly set in QSslConfiguration.
- // Since on macOS we initialize the default QSslConfiguration copying the
+ // Since on macØS we initialize the default QSslConfiguration copying the
// system CA certificates (using SecTrustSettingsCopyCertificates) we can
// call SecTrustSetAnchorCertificatesOnly(trust, true) to force SecTrustEvaluate
// to use anchors only from our QSslConfiguration.
@@ -1356,17 +1356,17 @@ bool QSslSocketBackendPrivate::verifyPeerTrust()
// actual system CA certificate list (which most use-cases need) other than
// by letting SecTrustEvaluate fall through to the system list; so, in this case
// (even though the client code may have provided its own certs), we retain
- // the default behavior. Note, with macOS SDK below 10.12 using 'trust my
+ // the default behavior. Note, with macØS SDK below 10.12 using 'trust my
// anchors only' may result in some valid chains rejected, apparently the
// ones containing intermediated certificates; so we use this functionality
// on more recent versions only.
bool anchorsFromConfigurationOnly = false;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSierra)
anchorsFromConfigurationOnly = true;
-#endif // Q_OS_MACOS
+#endif // Q_OS_MACØS
SecTrustSetAnchorCertificatesOnly(trust, anchorsFromConfigurationOnly);
diff --git i/src/network/ssl/qsslsocket_openssl_symbols.cpp w/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 1fcfdf9f16..f0973b8e5f 100644
--- i/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ w/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -878,8 +878,8 @@ static LoadedOpenSsl loadOpenSsl()
#ifndef Q_OS_DARWIN
// second attempt: find the development files libssl.so and libcrypto.so
//
- // disabled on macOS/iOS:
- // macOS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
+ // disabled on macØS/iOS:
+ // macØS's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
// attempt, _after_ <bundle>/Contents/Frameworks has been searched.
// iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
# if defined(Q_OS_ANDROID)
diff --git i/src/network/ssl/qsslsocket_opensslpre11.cpp w/src/network/ssl/qsslsocket_opensslpre11.cpp
index 2af437f0fa..f4a67e3c9b 100644
--- i/src/network/ssl/qsslsocket_opensslpre11.cpp
+++ w/src/network/ssl/qsslsocket_opensslpre11.cpp
@@ -252,7 +252,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
//load symbols needed to receive certificates from system store
#if defined(Q_OS_QNX)
s_loadRootCertsOnDemand = true;
-#elif defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
+#elif defined(Q_OS_UNIX) && !defined(Q_OS_MACØS)
// check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there)
QList<QByteArray> dirs = unixRootCertDirectories();
QStringList symLinkFilter;
diff --git i/src/opengl/doc/src/qtopengl-index.qdoc w/src/opengl/doc/src/qtopengl-index.qdoc
index 4694f68a93..edfa11e67e 100644
--- i/src/opengl/doc/src/qtopengl-index.qdoc
+++ w/src/opengl/doc/src/qtopengl-index.qdoc
@@ -37,7 +37,7 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only
deals with 3D rendering and provides little or no support for GUI
programming issues. The user interface for an OpenGL application
- must be created with another toolkit, such as Cocoa on the \macos
+ must be created with another toolkit, such as Cocoa on the \macøs
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.
diff --git i/src/opengl/doc/src/qtopengl-module.qdoc w/src/opengl/doc/src/qtopengl-module.qdoc
index 336d37c73f..7b14866203 100644
--- i/src/opengl/doc/src/qtopengl-module.qdoc
+++ w/src/opengl/doc/src/qtopengl-module.qdoc
@@ -40,7 +40,7 @@
OpenGL is a standard API for rendering 3D graphics. OpenGL only
deals with 3D rendering and provides little or no support for GUI
programming issues. The user interface for an OpenGL application
- must be created with another toolkit, such as Cocoa on the \macos
+ must be created with another toolkit, such as Cocoa on the \macøs
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.
diff --git i/src/opengl/qgl.cpp w/src/opengl/qgl.cpp
index 2d7b0280d8..3074159501 100644
--- i/src/opengl/qgl.cpp
+++ w/src/opengl/qgl.cpp
@@ -3703,7 +3703,7 @@ void QGLContext::doneCurrent()
QGLWidget. This will side-step the issue altogether, and is what
we recommend for users that need this kind of functionality.
- On \macos, when Qt is built with Cocoa support, a QGLWidget
+ On \macøs, when Qt is built with Cocoa support, a QGLWidget
can't have any sibling widgets placed ontop of itself. This is due
to limitations in the Cocoa API and is not supported by Apple.
diff --git i/src/opengl/qglpixelbuffer.cpp w/src/opengl/qglpixelbuffer.cpp
index e2f434ac3c..074da075b6 100644
--- i/src/opengl/qglpixelbuffer.cpp
+++ w/src/opengl/qglpixelbuffer.cpp
@@ -66,7 +66,7 @@
an OpenGL texture.} The texture is then updated automatically
when the pbuffer contents change, eliminating the need for
additional copy operations. This is supported only on Windows
- and \macos systems that provide the \c render_texture
+ and \macøs systems that provide the \c render_texture
extension. Note that under Windows, a multi-sampled pbuffer
can't be used in conjunction with the \c render_texture
extension. If a multi-sampled pbuffer is requested under
@@ -293,7 +293,7 @@ QGLContext *QGLPixelBuffer::context() const
pbuffer contents to a texture using updateDynamicTexture().
\warning For the bindToDynamicTexture() call to succeed on the
- \macos, the pbuffer needs a shared context, i.e. the
+ \macøs, the pbuffer needs a shared context, i.e. the
QGLPixelBuffer must be created with a share widget.
\sa generateDynamicTexture(), releaseFromDynamicTexture()
@@ -322,7 +322,7 @@ QGLContext *QGLPixelBuffer::context() const
\snippet code/src_opengl_qglpixelbuffer.cpp 1
- An alternative on Windows and \macos systems that support the
+ An alternative on Windows and \macøs systems that support the
\c render_texture extension is to use bindToDynamicTexture() to
get dynamic updates of the texture.
diff --git i/src/platformsupport/clipboard/clipboard.pro w/src/platformsupport/clipboard/clipboard.pro
index 916f6b0c06..ab40b6542e 100644
--- i/src/platformsupport/clipboard/clipboard.pro
+++ w/src/platformsupport/clipboard/clipboard.pro
@@ -10,6 +10,6 @@ HEADERS += qmacmime_p.h
SOURCES += qmacmime.mm
LIBS += -framework ImageIO
-macos: LIBS_PRIVATE += -framework AppKit
+macøs: LIBS_PRIVATE += -framework AppKit
load(qt_module)
diff --git i/src/platformsupport/clipboard/qmacmime.mm w/src/platformsupport/clipboard/qmacmime.mm
index 76e9c8712c..24e4778acf 100644
--- i/src/platformsupport/clipboard/qmacmime.mm
+++ w/src/platformsupport/clipboard/qmacmime.mm
@@ -107,7 +107,7 @@ const QStringList& qt_mac_enabledDraggedTypes()
/*!
\class QMacPasteboardMime
\brief The QMacPasteboardMime class converts between a MIME type and a
- \l{http://developer.apple.com/macosx/uniformtypeidentifiers.html}{Uniform
+ \l{http://developer.apple.com/macøsx/uniformtypeidentifiers.html}{Uniform
Type Identifier (UTI)} format.
\since 4.2
@@ -437,10 +437,10 @@ QList<QByteArray> QMacPasteboardMimeUnicodeText::convertFromMime(const QString &
#if QT_CONFIG(textcodec)
else if (flavor == QLatin1String("public.utf16-plain-text")) {
QTextCodec::ConverterState state;
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
// Some applications such as Microsoft Excel, don't deal well with
// a BOM present, so we follow the traditional approach of Qt on
- // macOS to not generate public.utf16-plain-text with a BOM.
+ // macØS to not generate public.utf16-plain-text with a BOM.
state.flags = QTextCodec::IgnoreHeader;
#else
// Whereas iOS applications will fail to paste if we do _not_
diff --git i/src/platformsupport/fontdatabases/mac/coretext.pri w/src/platformsupport/fontdatabases/mac/coretext.pri
index 95b9926e65..c7ace26320 100644
--- i/src/platformsupport/fontdatabases/mac/coretext.pri
+++ w/src/platformsupport/fontdatabases/mac/coretext.pri
@@ -7,7 +7,7 @@ LIBS_PRIVATE += \
-framework CoreText \
-framework Foundation
-macos: \
+macøs: \
LIBS_PRIVATE += -framework AppKit
else: \
LIBS_PRIVATE += -framework UIKit
diff --git i/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm w/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 894919a1c8..2e2e748ff3 100644
--- i/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ w/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -142,7 +142,7 @@ void QCoreTextFontDatabase::populateFontDatabase()
bool QCoreTextFontDatabase::populateFamilyAliases(const QString &missingFamily)
{
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (m_hasPopulatedAliases)
return false;
@@ -488,7 +488,7 @@ CTFontDescriptorRef descriptorForStyle(QFont::StyleHint styleHint)
case QFont::SansSerif: return descriptorForFamily("Helvetica");
case QFont::Serif: return descriptorForFamily("Times New Roman");
case QFont::Monospace: return descriptorForFamily("Menlo");
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
case QFont::Cursive: return descriptorForFamily("Apple Chancery");
#endif
case QFont::Fantasy: return descriptorForFamily("Zapfino");
@@ -558,7 +558,7 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
fallbackList.move(index, fallbackList.size() - 1);
}
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
// Since we are only returning a list of default fonts for the current language, we do not
// cover all Unicode completely. This was especially an issue for some of the common script
// symbols such as mathematical symbols, currency or geometric shapes. To minimize the risk
@@ -736,7 +736,7 @@ static CTFontDescriptorRef fontDescriptorFromTheme(QPlatformTheme::Font f)
}
#endif // Q_OS_IOS, Q_OS_TVOS, Q_OS_WATCHOS
- // macOS default case and iOS fallback case
+ // macØS default case and iOS fallback case
return descriptorForFontType(fontTypeFromTheme(f));
}
diff --git i/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm w/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
index 30c80ebd86..769bc38a7c 100644
--- i/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ w/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
@@ -50,7 +50,7 @@
#include <cmath>
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
#import <AppKit/AppKit.h>
#endif
@@ -61,7 +61,7 @@
// These are available cross platform, exported as kCTFontWeightXXX from CoreText.framework,
// but they are not documented and are not in public headers so are private API and exposed
// only through the NSFontWeightXXX and UIFontWeightXXX aliases in AppKit and UIKit (rdar://26109857)
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
#define kCTFontWeightUltraLight NSFontWeightUltraLight
#define kCTFontWeightThin NSFontWeightThin
#define kCTFontWeightLight NSFontWeightLight
@@ -621,7 +621,7 @@ glyph_metrics_t QCoreTextFontEngine::alphaMapBoundingBox(glyph_t glyph, QFixed s
Apple has gone through many iterations of its font smoothing algorithms,
and there are many ways to enable or disable certain aspects of it. As
keeping up with all the different toggles and behavior differences between
- macOS versions is tricky, we resort to rendering a single glyph in a few
+ macØS versions is tricky, we resort to rendering a single glyph in a few
configurations, picking up the font smoothing algorithm from the observed
result.
@@ -641,7 +641,7 @@ glyph_metrics_t QCoreTextFontEngine::alphaMapBoundingBox(glyph_t glyph, QFixed s
- Subpixel: Font smoothing is applied, and affects subpixels.
- This was the default mode on macOS versions prior to 10.14 (Mojave).
+ This was the default mode on macØS versions prior to 10.14 (Mojave).
The font dilation (stem darkening) parameters were controlled by the
AppleFontSmoothing setting, ranging from 1 to 3 (light to strong).
@@ -651,7 +651,7 @@ glyph_metrics_t QCoreTextFontEngine::alphaMapBoundingBox(glyph_t glyph, QFixed s
- Grayscale: Font smoothing is applied, but does not affect subpixels.
- This is the default mode on macOS 10.14 (Mojave). The font dilation
+ This is the default mode on macØS 10.14 (Mojave). The font dilation
(stem darkening) parameters are not affected by the AppleFontSmoothing
setting, but are instead computed based on the fill color used when
drawing the glyphs (white fill gives a lighter dilation than black
@@ -767,10 +767,10 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
const bool shouldSmooth = shouldSmoothFont();
CGContextSetShouldSmoothFonts(ctx, shouldSmooth);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
auto glyphColor = [&] {
if (shouldSmooth && fontSmoothing() == Grayscale) {
- // The grayscale font smoothing algorithm introduced in macOS Mojave (10.14) adjusts
+ // The grayscale font smoothing algorithm introduced in macØS Mojave (10.14) adjusts
// its dilation (stem darkening) parameters based on the fill color. This means our
// default approach of drawing white on black to produce the alpha map will result
// in non-native looking text when then drawn as black on white during the final blit.
@@ -812,7 +812,7 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
if (!hasColorGlyphs()) {
CGContextSetTextMatrix(ctx, cgMatrix);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
CGContextSetFillColorWithColor(ctx, CGColorGetConstantColor(glyphColor));
#else
CGContextSetRGBFillColor(ctx, 1, 1, 1, 1);
@@ -843,7 +843,7 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
if (expectsGammaCorrectedBlending())
qGamma_correct_back_to_linear_cs(&im);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (blackOnWhiteGlyphs)
im.invertPixels();
#endif
diff --git i/src/plugins/bearer/generic/qgenericengine.cpp w/src/plugins/bearer/generic/qgenericengine.cpp
index b1f28849a7..cf1220d52d 100644
--- i/src/plugins/bearer/generic/qgenericengine.cpp
+++ w/src/plugins/bearer/generic/qgenericengine.cpp
@@ -231,7 +231,7 @@ static QNetworkConfiguration::BearerType qGetInterfaceType(const QString &interf
QGenericEngine::QGenericEngine(QObject *parent)
: QBearerEngineImpl(parent)
{
- //workaround for deadlock in __cxa_guard_acquire with webkit on macos x
+ //workaround for deadlock in __cxa_guard_acquire with webkit on macøs x
//initialise the Q_GLOBAL_STATIC in same thread as the AtomicallyInitializedStatic
(void)QNetworkInterface::interfaceFromIndex(0);
}
diff --git i/src/plugins/platforminputcontexts/platforminputcontexts.pro w/src/plugins/platforminputcontexts/platforminputcontexts.pro
index 56a39a49e7..7a25a490a2 100644
--- i/src/plugins/platforminputcontexts/platforminputcontexts.pro
+++ w/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -5,7 +5,7 @@ qtConfig(xkbcommon) {
SUBDIRS += compose
qtHaveModule(dbus) {
- !macos:!win32:SUBDIRS += ibus
+ !macøs:!win32:SUBDIRS += ibus
}
}
diff --git i/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm w/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index 3560c9d9b5..09a9814c94 100644
--- i/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ w/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -257,7 +257,7 @@ static void convertLineOffset(QAccessibleTextInterface *text, int *line, int *of
if (!iface || !iface->isValid())
return nil;
- // macOS expects that the hierarchy is:
+ // macØS expects that the hierarchy is:
// App -> Window -> Children
// We don't actually have the window reflected properly in QAccessibility.
// Check if the parent is the application and then instead return the native window.
diff --git i/src/plugins/platforms/cocoa/qcocoaglcontext.mm w/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index 6db4bdb9fd..cb25df4439 100644
--- i/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ w/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -226,7 +226,7 @@ NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurface
}
if (qGuiApp->testAttribute(Qt::AA_UseSoftwareOpenGL)) {
- // kCGLRendererGenericFloatID is the modern software renderer on macOS,
+ // kCGLRendererGenericFloatID is the modern software renderer on macØS,
// as opposed to kCGLRendererGenericID, which is deprecated.
attrs << NSOpenGLPFARendererID << kCGLRendererGenericFloatID;
}
@@ -274,10 +274,10 @@ void QCocoaGLContext::updateSurfaceFormat()
}
}());
- // Debug contexts not supported on macOS
+ // Debug contexts not supported on macØS
m_format.setOption(QSurfaceFormat::DebugContext, false);
- // Nor are stereo buffers (deprecated in macOS 10.12)
+ // Nor are stereo buffers (deprecated in macØS 10.12)
m_format.setOption(QSurfaceFormat::StereoBuffers, false);
// ------------------ Query the pixel format ------------------
@@ -315,7 +315,7 @@ void QCocoaGLContext::updateSurfaceFormat()
m_format.setGreenBufferSize(colorSize);
m_format.setBlueBufferSize(colorSize);
- // Surfaces on macOS always have an alpha channel, but unless the user requested
+ // Surfaces on macØS always have an alpha channel, but unless the user requested
// one via setAlphaBufferSize(), which triggered setting NSOpenGLCPSurfaceOpacity
// to make the surface non-opaque, we don't want to report back the actual alpha
// size, as that will make the user believe the alpha channel can be used for
diff --git i/src/plugins/platforms/cocoa/qcocoahelpers.mm w/src/plugins/platforms/cocoa/qcocoahelpers.mm
index c9eafa81d0..021469b445 100644
--- i/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ w/src/plugins/platforms/cocoa/qcocoahelpers.mm
@@ -159,7 +159,7 @@ Qt::DropActions qt_mac_mapNSDragOperations(NSDragOperation nsActions)
Do not use this method soley to check for foreign windows, as
that will make the code harder to read for people not working
- primarily on macOS, who do not know the difference between the
+ primarily on macØS, who do not know the difference between the
NSView and QNSView cases.
*/
QNSView *qnsview_cast(NSView *view)
@@ -242,7 +242,7 @@ QString qt_mac_applicationName()
Flips the Y coordinate of the point/rect between quadrant I and IV.
- The native coordinate system on macOS uses quadrant I, with origin
+ The native coordinate system on macØS uses quadrant I, with origin
in bottom left, and Qt uses quadrant IV, with origin in top left.
By flipping the Y coordinate, we can map the point/rect between
@@ -413,10 +413,10 @@ QMacVersion::VersionTuple QMacVersion::versionsForImage(const mach_header *machH
auto commandCursor = uintptr_t(machHeader) + sizeof(mach_header_64);
for (uint32_t i = 0; i < machHeader->ncmds; ++i) {
load_command *loadCommand = reinterpret_cast<load_command *>(commandCursor);
- if (loadCommand->cmd == LC_VERSION_MIN_MACOSX) {
+ if (loadCommand->cmd == LC_VERSION_MIN_MACØSX) {
auto versionCommand = reinterpret_cast<version_min_command *>(loadCommand);
return makeVersionTuple(versionCommand->version, versionCommand->sdk);
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13)
+#if QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_13)
} else if (loadCommand->cmd == LC_BUILD_VERSION) {
auto versionCommand = reinterpret_cast<build_version_command *>(loadCommand);
return makeVersionTuple(versionCommand->minos, versionCommand->sdk);
diff --git i/src/plugins/platforms/cocoa/qcocoaintegration.mm w/src/plugins/platforms/cocoa/qcocoaintegration.mm
index b7f15a2bf1..ae03275d30 100644
--- i/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ w/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -94,7 +94,7 @@ static void logVersionInformation()
auto appBuildSDK = QMacVersion::buildSDK(QMacVersion::ApplicationBinary);
auto appDeploymentTarget = QMacVersion::deploymentTarget(QMacVersion::ApplicationBinary);
- qCInfo(lcQpa, "Loading macOS (Cocoa) platform plugin for Qt " QT_VERSION_STR ", running on macOS %d.%d.%d\n\n" \
+ qCInfo(lcQpa, "Loading macØS (Cocoa) platform plugin for Qt " QT_VERSION_STR ", running on macØS %d.%d.%d\n\n" \
" Component SDK version Deployment target \n" \
" ------------- ------------- -------------------\n" \
" Qt " QT_VERSION_STR " %d.%d.%d %d.%d.%d\n" \
diff --git i/src/plugins/platforms/cocoa/qcocoamenuloader.mm w/src/plugins/platforms/cocoa/qcocoamenuloader.mm
index d384078e91..4ca4189d17 100644
--- i/src/plugins/platforms/cocoa/qcocoamenuloader.mm
+++ w/src/plugins/platforms/cocoa/qcocoamenuloader.mm
@@ -117,9 +117,9 @@
[appMenu addItem:[NSMenuItem separatorItem]];
// Preferences
- // We'll be adding app specific items after this. The macOS HIG state that,
+ // We'll be adding app specific items after this. The macØS HIG state that,
// "In general, a Preferences menu item should be the first app-specific menu item."
- // https://developer.apple.com/macos/human-interface-guidelines/menus/menu-bar-menus/
+ // https://developer.apple.com/macøs/human-interface-guidelines/menus/menu-bar-menus/
preferencesItem = [[QCocoaNSMenuItem alloc] init];
preferencesItem.title = @"Preferences…";
preferencesItem.keyEquivalent = @",";
diff --git i/src/plugins/platforms/cocoa/qcocoanativeinterface.mm w/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index d0e69bdca5..7281ab3c21 100644
--- i/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ w/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -177,7 +177,7 @@ void *QCocoaNativeInterface::NSPrintInfoForPrintEngine(QPrintEngine *printEngine
QPixmap QCocoaNativeInterface::defaultBackgroundPixmapForQWizard()
{
- // Note: starting with macOS 10.14, the KeyboardSetupAssistant app bundle no
+ // Note: starting with macØS 10.14, the KeyboardSetupAssistant app bundle no
// longer contains the "Background.png" image. This function then returns a
// null pixmap.
const int ExpectedImageWidth = 242;
diff --git i/src/plugins/platforms/cocoa/qcocoaprintdevice.mm w/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
index 7605dc9d1a..9cfcab4b1d 100644
--- i/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
+++ w/src/plugins/platforms/cocoa/qcocoaprintdevice.mm
@@ -48,10 +48,10 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_PRINTER
-// The CUPS PPD APIs were deprecated in CUPS 1.6/macOS 10.8, but
+// The CUPS PPD APIs were deprecated in CUPS 1.6/macØS 10.8, but
// as long as we're supporting RHEL 6, which still ships CUPS 1.4
// we're not going to rewrite this, as we want to share the code
-// between macOS and Linux for the CUPS-bits. See discussion in
+// between macØS and Linux for the CUPS-bits. See discussion in
// https://bugreports.qt.io/browse/QTBUG-56545
#pragma message "Disabling CUPS PPD deprecation warnings. This should be fixed once we drop support for RHEL6 (QTBUG-56545)"
#pragma clang diagnostic push
diff --git i/src/plugins/platforms/cocoa/qcocoascreen.mm w/src/plugins/platforms/cocoa/qcocoascreen.mm
index bd5c95b9d0..29e3d076ff 100644
--- i/src/plugins/platforms/cocoa/qcocoascreen.mm
+++ w/src/plugins/platforms/cocoa/qcocoascreen.mm
@@ -568,7 +568,7 @@ QPixmap QCocoaScreen::grabWindow(WId view, int x, int y, int width, int height)
QCocoaScreen *QCocoaScreen::primaryScreen()
{
// Note: The primary screen that Qt knows about may not match the current CGMainDisplayID()
- // if macOS has not yet been able to inform us that the main display has changed, but we
+ // if macØS has not yet been able to inform us that the main display has changed, but we
// will update the primary screen accordingly once the reconfiguration callback comes in.
return static_cast<QCocoaScreen *>(QGuiApplication::primaryScreen()->handle());
}
@@ -577,7 +577,7 @@ QList<QPlatformScreen*> QCocoaScreen::virtualSiblings() const
{
QList<QPlatformScreen*> siblings;
- // Screens on macOS are always part of the same virtual desktop
+ // Screens on macØS are always part of the same virtual desktop
for (QScreen *screen : QGuiApplication::screens())
siblings << screen->handle();
diff --git i/src/plugins/platforms/cocoa/qcocoasystemsettings.mm w/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
index cb25bd7d81..ccd59142d0 100644
--- i/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
+++ w/src/plugins/platforms/cocoa/qcocoasystemsettings.mm
@@ -45,7 +45,7 @@
#include <QtGui/qfont.h>
#include <QtGui/private/qcoregraphics_p.h>
-#if !QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
+#if !QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
@interface NSColor (MojaveForwardDeclarations)
@property (class, strong, readonly) NSColor *selectedContentBackgroundColor NS_AVAILABLE_MAC(10_14);
@property (class, strong, readonly) NSColor *unemphasizedSelectedTextBackgroundColor NS_AVAILABLE_MAC(10_14);
@@ -87,7 +87,7 @@ QPalette * qt_mac_createSystemPalette()
// System palette initialization:
QBrush br = qt_mac_toQBrush([NSColor selectedControlColor]);
palette->setBrush(QPalette::Active, QPalette::Highlight, br);
- if (__builtin_available(macOS 10.14, *)) {
+ if (__builtin_available(macØS 10.14, *)) {
const auto inactiveHighlight = qt_mac_toQBrush([NSColor unemphasizedSelectedContentBackgroundColor]);
palette->setBrush(QPalette::Inactive, QPalette::Highlight, inactiveHighlight);
palette->setBrush(QPalette::Disabled, QPalette::Highlight, inactiveHighlight);
@@ -173,7 +173,7 @@ QHash<QPlatformTheme::Palette, QPalette*> qt_mac_createRolePalettes()
if (mac_widget_colors[i].paletteRole == QPlatformTheme::MenuPalette
|| mac_widget_colors[i].paletteRole == QPlatformTheme::MenuBarPalette) {
NSColor *selectedMenuItemColor = nil;
- if (__builtin_available(macOS 10.14, *)) {
+ if (__builtin_available(macØS 10.14, *)) {
// Cheap approximation for NSVisualEffectView (see deprecation note for selectedMenuItemTextColor)
selectedMenuItemColor = [[NSColor selectedContentBackgroundColor] highlightWithLevel:0.4];
} else {
@@ -203,7 +203,7 @@ QHash<QPlatformTheme::Palette, QPalette*> qt_mac_createRolePalettes()
} else if (mac_widget_colors[i].paletteRole == QPlatformTheme::ItemViewPalette) {
NSArray<NSColor *> *baseColors = nil;
NSColor *activeHighlightColor = nil;
- if (__builtin_available(macOS 10.14, *)) {
+ if (__builtin_available(macØS 10.14, *)) {
baseColors = [NSColor alternatingContentBackgroundColors];
activeHighlightColor = [NSColor selectedContentBackgroundColor];
pal.setBrush(QPalette::Inactive, QPalette::HighlightedText,
diff --git i/src/plugins/platforms/cocoa/qcocoatheme.mm w/src/plugins/platforms/cocoa/qcocoatheme.mm
index 7c10456824..424f445047 100644
--- i/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ w/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -87,10 +87,10 @@ const char *QCocoaTheme::name = "cocoa";
QCocoaTheme::QCocoaTheme()
: m_systemPalette(nullptr)
{
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
+#if QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave) {
m_appearanceObserver = QMacKeyValueObserver(NSApp, @"effectiveAppearance", [this] {
- if (__builtin_available(macOS 10.14, *))
+ if (__builtin_available(macØS 10.14, *))
NSAppearance.currentAppearance = NSApp.effectiveAppearance;
handleSystemThemeChange();
diff --git i/src/plugins/platforms/cocoa/qcocoavulkaninstance.h w/src/plugins/platforms/cocoa/qcocoavulkaninstance.h
index 5fe6a612af..9e29b72dc6 100644
--- i/src/plugins/platforms/cocoa/qcocoavulkaninstance.h
+++ w/src/plugins/platforms/cocoa/qcocoavulkaninstance.h
@@ -41,7 +41,7 @@
#define QCOCOAVULKANINSTANCE_H
// Include mvk_vulkan.h first. The order is important since
-// mvk_vulkan.h just defines VK_USE_PLATFORM_MACOS_MVK (or the IOS
+// mvk_vulkan.h just defines VK_USE_PLATFORM_MACØS_MVK (or the IOS
// variant) and includes vulkan.h. If something else included vulkan.h
// before this then we wouldn't get the MVK specifics...
#include <MoltenVK/mvk_vulkan.h>
diff --git i/src/plugins/platforms/cocoa/qcocoavulkaninstance.mm w/src/plugins/platforms/cocoa/qcocoavulkaninstance.mm
index 7ce78ee738..1425d59807 100644
--- i/src/plugins/platforms/cocoa/qcocoavulkaninstance.mm
+++ w/src/plugins/platforms/cocoa/qcocoavulkaninstance.mm
@@ -54,7 +54,7 @@ QCocoaVulkanInstance::~QCocoaVulkanInstance()
void QCocoaVulkanInstance::createOrAdoptInstance()
{
- initInstance(m_instance, QByteArrayList() << QByteArrayLiteral("VK_MVK_macos_surface"));
+ initInstance(m_instance, QByteArrayList() << QByteArrayLiteral("VK_MVK_macøs_surface"));
}
VkSurfaceKHR *QCocoaVulkanInstance::createSurface(QWindow *window)
@@ -78,7 +78,7 @@ VkSurfaceKHR QCocoaVulkanInstance::createSurface(NSView *view)
}
VkMacOSSurfaceCreateInfoMVK surfaceInfo;
- surfaceInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
+ surfaceInfo.sType = VK_STRUCTURE_TYPE_MACØS_SURFACE_CREATE_INFO_MVK;
surfaceInfo.pNext = nullptr;
surfaceInfo.flags = 0;
surfaceInfo.pView = view;
diff --git i/src/plugins/platforms/cocoa/qcocoawindow.mm w/src/plugins/platforms/cocoa/qcocoawindow.mm
index 69d192b4f5..74c43d4ceb 100644
--- i/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ w/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -872,7 +872,7 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon)
NSButton *iconButton = [m_view.window standardWindowButton:NSWindowDocumentIconButton];
if (!iconButton) {
- // Window icons are only supported on macOS in combination with a document filePath
+ // Window icons are only supported on macØS in combination with a document filePath
return;
}
@@ -1113,7 +1113,7 @@ void QCocoaWindow::viewDidChangeFrame()
{
// Note: When the view is the content view, it would seem redundant
// to deliver geometry changes both from windowDidResize and this
- // callback, but in some cases such as when macOS native tabbed
+ // callback, but in some cases such as when macØS native tabbed
// windows are enabled we may end up with the wrong geometry in
// the initial windowDidResize callback when a new tab is created.
handleGeometryChange();
@@ -1559,7 +1559,7 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel)
NSRect contentRect = QCocoaScreen::mapToNative(rect, targetCocoaScreen);
if (targetScreen->primaryOrientation() == Qt::PortraitOrientation) {
- // The macOS window manager has a bug, where if a screen is rotated, it will not allow
+ // The macØS window manager has a bug, where if a screen is rotated, it will not allow
// a window to be created within the area of the screen that has a Y coordinate (I quadrant)
// higher than the height of the screen in its non-rotated state (including a magic padding
// of 24 points), unless the window is created with the NSWindowStyleMaskBorderless style mask.
diff --git i/src/plugins/platforms/cocoa/qnsview_drawing.mm w/src/plugins/platforms/cocoa/qnsview_drawing.mm
index 2fd63fad67..6a1b24ac30 100644
--- i/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ w/src/plugins/platforms/cocoa/qnsview_drawing.mm
@@ -147,7 +147,7 @@
qCDebug(lcQpaDrawing) << "Making" << self
<< (self.wantsLayer ? "layer-backed" : "layer-hosted")
<< "with" << layer << "due to being" << ([self layerExplicitlyRequested] ? "explicitly requested"
- : [self shouldUseMetalLayer] ? "needed by surface type" : "enabled by macOS");
+ : [self shouldUseMetalLayer] ? "needed by surface type" : "enabled by macØS");
if (layer.delegate && layer.delegate != self) {
qCWarning(lcQpaDrawing) << "Layer already has delegate" << layer.delegate
diff --git i/src/plugins/platforms/cocoa/qt_attribution.json w/src/plugins/platforms/cocoa/qt_attribution.json
index 37c0937f29..deaec83858 100644
--- i/src/plugins/platforms/cocoa/qt_attribution.json
+++ w/src/plugins/platforms/cocoa/qt_attribution.json
@@ -2,7 +2,7 @@
"Id": "cocoa-platform-plugin",
"Name": "Cocoa Platform Plugin",
"QDocModule": "qtgui",
- "QtUsage": "Code used in the Qt Platform Abstraction (QPA) for macOS.",
+ "QtUsage": "Code used in the Qt Platform Abstraction (QPA) for macØS.",
"Files": "qcocoaapplication.h qcocoaapplication.mm qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoaeventdispatcher.h qcocoaeventdispatcher.mm qcocoaintrospection.h qcocoaintrospection.mm qcocoasystemtrayicon.mm qmacdefines_mac.h",
"Description": "Allows Qt to integrate into Apple's Cocoa API.",
diff --git i/src/plugins/platforms/wasm/qwasmeventtranslator.cpp w/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
index ad94ba9c77..25a10d12ed 100644
--- i/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
+++ w/src/plugins/platforms/wasm/qwasmeventtranslator.cpp
@@ -301,7 +301,7 @@ static constexpr const auto DeadKeyShiftTbl = qMakeArray(
>::Data{}
);
-// macOS CTRL <-> META switching. We most likely want to enable
+// macØS CTRL <-> META switching. We most likely want to enable
// the existing switching code in QtGui, but for now do it here.
static bool g_usePlatformMacCtrlMetaSwitching = false;
@@ -350,7 +350,7 @@ void QWasmEventTranslator::initEventHandlers()
g_usePlatformMacCtrlMetaSwitching = (platform == MacOSPlatform);
if (platform == MacOSPlatform) {
- g_useNaturalScrolling = false; // make this !default on macOS
+ g_useNaturalScrolling = false; // make this !default on macØS
if (emscripten::val::global("window")["safari"].isUndefined()) {
@@ -665,7 +665,7 @@ int QWasmEventTranslator::wheel_cb(int eventType, const EmscriptenWheelEvent *wh
break;
};
- if (g_useNaturalScrolling) //macOS platform has document oriented scrolling
+ if (g_useNaturalScrolling) //macØS platform has document oriented scrolling
scrollFactor = -scrollFactor;
QWasmEventTranslator *translator = (QWasmEventTranslator*)userData;
@@ -838,8 +838,8 @@ Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBa
{
Qt::Key wasmKey = Qt::Key_unknown;
switch (deadKey) {
-#ifdef Q_OS_MACOS
- case Qt::Key_QuoteLeft: // ` macOS: Key_Dead_Grave
+#ifdef Q_OS_MACØS
+ case Qt::Key_QuoteLeft: // ` macØS: Key_Dead_Grave
#else
case Qt::Key_O: // ´ Key_Dead_Grave
#endif
@@ -852,13 +852,13 @@ Qt::Key QWasmEventTranslator::translateDeadKey(Qt::Key deadKey, Qt::Key accentBa
case Qt::Key_N:// Key_Dead_Tilde
wasmKey = find(tildeKeyTable, accentBaseKey);
break;
-#ifndef Q_OS_MACOS
+#ifndef Q_OS_MACØS
case Qt::Key_QuoteLeft:
#endif
case Qt::Key_U:// ¨ Key_Dead_Diaeresis
wasmKey = find(diaeresisKeyTable, accentBaseKey);
break;
- case Qt::Key_I:// macOS Key_Dead_Circumflex
+ case Qt::Key_I:// macØS Key_Dead_Circumflex
case Qt::Key_6:// linux
case Qt::Key_Apostrophe:// linux
wasmKey = find(circumflexKeyTable, accentBaseKey);
diff --git i/src/plugins/platforms/windows/qwindowsmousehandler.cpp w/src/plugins/platforms/windows/qwindowsmousehandler.cpp
index 6df5e6aa27..6f6f9af14d 100644
--- i/src/plugins/platforms/windows/qwindowsmousehandler.cpp
+++ w/src/plugins/platforms/windows/qwindowsmousehandler.cpp
@@ -288,7 +288,7 @@ bool QWindowsMouseHandler::translateMouseEvent(QWindow *window, HWND hwnd,
// Windows sends a mouse move with no buttons pressed to signal "Enter"
// when a window is shown over the cursor. Discard the event and only use
// it for generating QEvent::Enter to be consistent with other platforms -
- // X11 and macOS.
+ // X11 and macØS.
bool discardEvent = false;
if (msg.message == WM_MOUSEMOVE) {
const bool samePosition = globalPosition == lastMouseMovePos;
diff --git i/src/plugins/platforms/windows/qwindowspointerhandler.cpp w/src/plugins/platforms/windows/qwindowspointerhandler.cpp
index b477147da7..238e607858 100644
--- i/src/plugins/platforms/windows/qwindowspointerhandler.cpp
+++ w/src/plugins/platforms/windows/qwindowspointerhandler.cpp
@@ -725,7 +725,7 @@ bool QWindowsPointerHandler::translateMouseEvent(QWindow *window,
// Windows sends a mouse move with no buttons pressed to signal "Enter"
// when a window is shown over the cursor. Discard the event and only use
// it for generating QEvent::Enter to be consistent with other platforms -
- // X11 and macOS.
+ // X11 and macØS.
bool discardEvent = false;
if (msg.message == WM_MOUSEMOVE) {
static QPoint lastMouseMovePos;
diff --git i/src/plugins/platforms/xcb/xcb-plugin.pro w/src/plugins/platforms/xcb/xcb-plugin.pro
index 4c646d42c6..b3f6739c37 100644
--- i/src/plugins/platforms/xcb/xcb-plugin.pro
+++ w/src/plugins/platforms/xcb/xcb-plugin.pro
@@ -4,7 +4,7 @@ QT += core-private gui-private xcb_qpa_lib-private
DEFINES += QT_NO_FOREACH
-macos: CONFIG += no_app_extension_api_only
+macøs: CONFIG += no_app_extension_api_only
SOURCES = \
qxcbmain.cpp
diff --git i/src/plugins/styles/mac/qmacstyle_mac.mm w/src/plugins/styles/mac/qmacstyle_mac.mm
index ecdde06bb8..56dac230fd 100644
--- i/src/plugins/styles/mac/qmacstyle_mac.mm
+++ w/src/plugins/styles/mac/qmacstyle_mac.mm
@@ -397,7 +397,7 @@ class AppearanceSync {
public:
AppearanceSync()
{
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
+#if QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave
&& !qt_mac_applicationIsInDarkMode()) {
auto requiredAppearanceName = NSApplication.sharedApplication.effectiveAppearance.name;
@@ -406,7 +406,7 @@ public:
NSAppearance.currentAppearance = [NSAppearance appearanceNamed:requiredAppearanceName];
}
}
-#endif // QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
+#endif // QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
}
~AppearanceSync()
@@ -475,7 +475,7 @@ static bool setupSlider(NSSlider *slider, const QStyleOptionSlider *sl)
static void fixStaleGeometry(NSSlider *slider)
{
// If it's later fixed in AppKit, this function is not needed.
- // On macOS Mojave we suddenly have NSSliderCell with a cached
+ // On macØS Mojave we suddenly have NSSliderCell with a cached
// (and stale) geometry, thus its -drawKnob, -drawBarInside:flipped:,
// -drawTickMarks fail to render the slider properly. Setting the number
// of tickmarks triggers an update in geometry.
@@ -783,7 +783,7 @@ enum QAquaMetric {
};
static const int qt_mac_aqua_metrics[] = {
- // Values as of macOS 10.12.4 and Xcode 8.3.1
+ // Values as of macØS 10.12.4 and Xcode 8.3.1
18 /* CheckBoxHeight */,
18 /* CheckBoxWidth */,
1 /* EditTextFrameOutset */,
@@ -1798,7 +1798,7 @@ NSView *QMacStylePrivate::cocoaControl(CocoaControl widget) const
return nil;
if (widget.type == Box) {
- if (__builtin_available(macOS 10.14, *)) {
+ if (__builtin_available(macØS 10.14, *)) {
if (qt_mac_applicationIsInDarkMode()) {
// See render code in drawPrimitive(PE_FrameTabWidget)
widget.type = Box_Dark;
@@ -2048,7 +2048,7 @@ QMacStyle::QMacStyle()
QCoreApplication::sendEvent(o, &event);
});
-#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
+#if QT_MACØS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_14)
Q_D(QMacStyle);
// FIXME: Tie this logic into theme change, or even polish/unpolish
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave) {
@@ -3047,7 +3047,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
{
const auto cw = QMacStylePrivate::CocoaControl(QMacStylePrivate::Box, QStyleHelper::SizeLarge);
auto *box = static_cast<NSBox *>(d->cocoaControl(cw));
- // FIXME Since macOS 10.14, simply calling drawRect: won't display anything anymore.
+ // FIXME Since macØS 10.14, simply calling drawRect: won't display anything anymore.
// The AppKit team is aware of this and has proposed a couple of solutions.
// The first solution was to call displayRectIgnoringOpacity:inContext: instead.
// However, it doesn't seem to work on 10.13. More importantly, dark mode on 10.14
@@ -3925,7 +3925,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
}
// Rotate and translate CTM when vertical
- // On macOS: positive angle is CW, negative is CCW
+ // On macØS: positive angle is CW, negative is CCW
if (tabDirection == QMacStylePrivate::West) {
CGContextTranslateCTM(ctx, 0, frameRect.right());
CGContextRotateCTM(ctx, -M_PI_2);
@@ -5188,7 +5188,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
const QColor bgColor = QStyleHelper::backgroundColor(opt->palette, widget);
const bool hasDarkBg = bgColor.red() < 128 && bgColor.green() < 128 && bgColor.blue() < 128;
if (isTransient) {
- // macOS behavior: as soon as one color channel is >= 128,
+ // macØS behavior: as soon as one color channel is >= 128,
// the background is considered bright, scroller is dark.
scroller.knobStyle = hasDarkBg? NSScrollerKnobStyleLight : NSScrollerKnobStyleDark;
} else {
@@ -5465,7 +5465,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex
const auto frameRect = cw.adjustedControlFrame(combo->rect);
cb.frame = frameRect.toCGRect();
- // This API was requested to Apple in rdar #36197888. We know it's safe to use up to macOS 10.13.3
+ // This API was requested to Apple in rdar #36197888. We know it's safe to use up to macØS 10.13.3
if (NSButtonCell *cell = static_cast<NSButtonCell *>([cc.cell qt_valueForPrivateKey:@"_buttonCell"])) {
cell.highlighted = isPressed;
} else {
@@ -5746,7 +5746,7 @@ QStyle::SubControl QMacStyle::hitTestComplexControl(ComplexControl cc,
}
// Since -[NSScroller testPart:] doesn't want to cooperate, we do it the
- // straightforward way. In any case, macOS doesn't return line-sized changes
+ // straightforward way. In any case, macØS doesn't return line-sized changes
// with NSScroller since 10.7, according to the aforementioned method's doc.
const auto knobRect = QRectF::fromCGRect([scroller rectForPart:NSScrollerKnob]);
if (isHorizontal) {
diff --git i/src/plugins/styles/mac/qmacstyle_mac_p_p.h w/src/plugins/styles/mac/qmacstyle_mac_p_p.h
index d6af18f01f..f393cceddf 100644
--- i/src/plugins/styles/mac/qmacstyle_mac_p_p.h
+++ w/src/plugins/styles/mac/qmacstyle_mac_p_p.h
@@ -161,8 +161,8 @@ QT_BEGIN_NAMESPACE
/*
AHIG:
- macOS Human Interface Guidelines
- https://developer.apple.com/macos/human-interface-guidelines/overview/themes/
+ macØS Human Interface Guidelines
+ https://developer.apple.com/macøs/human-interface-guidelines/overview/themes/
Builder:
Interface Builder in Xcode 8 or later
diff --git i/src/printsupport/dialogs/dialogs.pri w/src/printsupport/dialogs/dialogs.pri
index 0a7b947c79..d3569329f1 100644
--- i/src/printsupport/dialogs/dialogs.pri
+++ w/src/printsupport/dialogs/dialogs.pri
@@ -10,7 +10,7 @@ qtConfig(printdialog) {
dialogs/qpagesetupdialog.h \
dialogs/qprintdialog.h
- macos {
+ macøs {
OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
dialogs/qprintdialog_mac.mm
LIBS_PRIVATE += -framework AppKit
diff --git i/src/printsupport/dialogs/qabstractprintdialog.cpp w/src/printsupport/dialogs/qabstractprintdialog.cpp
index 1a2aa7afac..0aa82604f8 100644
--- i/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ w/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -386,13 +386,13 @@ void QAbstractPrintDialogPrivate::setPrinter(QPrinter *newPrinter)
settings for each available printer can be modified via the dialog's
\uicontrol{Properties} push button.
- On Windows and \macos, the native print dialog is used, which means that
+ On Windows and \macøs, the native print dialog is used, which means that
some QWidget and QDialog properties set on the dialog won't be respected.
- The native print dialog on \macos does not support setting printer options,
+ The native print dialog on \macøs does not support setting printer options,
i.e. setOptions() and setOption() have no effect.
In Qt 4.4, it was possible to use the static functions to show a sheet on
- \macos. This is no longer supported in Qt 4.5. If you want this
+ \macøs. This is no longer supported in Qt 4.5. If you want this
functionality, use QPrintDialog::open().
\sa QPageSetupDialog, QPrinter
@@ -452,7 +452,7 @@ void QAbstractPrintDialog::setOptionTabs(const QList<QWidget*> &tabs)
and exec() to return \a result.
\note This function does not apply to the Native Print Dialog on the Mac
- \macos and Windows platforms, because the dialog is required to be modal
+ \macøs and Windows platforms, because the dialog is required to be modal
and only the user can close it.
\sa QDialog::done()
diff --git i/src/printsupport/dialogs/qpagesetupdialog.cpp w/src/printsupport/dialogs/qpagesetupdialog.cpp
index ce2a0416c8..79a3dea71f 100644
--- i/src/printsupport/dialogs/qpagesetupdialog.cpp
+++ w/src/printsupport/dialogs/qpagesetupdialog.cpp
@@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE
\ingroup printing
\inmodule QtPrintSupport
- On Windows and \macos the page setup dialog is implemented using
+ On Windows and \macøs the page setup dialog is implemented using
the native page setup dialogs.
- Note that on Windows and \macos custom paper sizes won't be
+ Note that on Windows and \macøs custom paper sizes won't be
reflected in the native page setup dialogs. Additionally, custom
- page margins set on a QPrinter won't show in the native \macos
+ page margins set on a QPrinter won't show in the native \macøs
page setup dialog.
\sa QPrinter, QPrintDialog
diff --git i/src/printsupport/kernel/qprint_p.h w/src/printsupport/kernel/qprint_p.h
index 4956775461..a422f2cc4a 100644
--- i/src/printsupport/kernel/qprint_p.h
+++ w/src/printsupport/kernel/qprint_p.h
@@ -57,7 +57,7 @@
#include <QtCore/qstring.h>
#include <QtCore/qlist.h>
-#if (defined Q_OS_MACOS) || (defined Q_OS_UNIX && QT_CONFIG(cups))
+#if (defined Q_OS_MACØS) || (defined Q_OS_UNIX && QT_CONFIG(cups))
#include <cups/ppd.h> // Use for type defs only, don't want to actually link in main module
Q_DECLARE_METATYPE(ppd_file_t *)
#endif
@@ -246,7 +246,7 @@ public:
return QByteArray();
}
-#if (defined Q_OS_MACOS) || (defined Q_OS_UNIX && QT_CONFIG(cups))
+#if (defined Q_OS_MACØS) || (defined Q_OS_UNIX && QT_CONFIG(cups))
// PPD utilities shared by CUPS and Mac plugins requiring CUPS headers
// May turn into a proper internal QPpd class if enough shared between Mac and CUPS,
diff --git i/src/printsupport/kernel/qprinter.cpp w/src/printsupport/kernel/qprinter.cpp
index ddcd8c4702..eef0c5fb12 100644
--- i/src/printsupport/kernel/qprinter.cpp
+++ w/src/printsupport/kernel/qprinter.cpp
@@ -318,7 +318,7 @@ public:
features, such as orientation and resolution, and to step through
the pages in a document as it is generated.
- When printing directly to a printer on Windows or \macos, QPrinter uses
+ When printing directly to a printer on Windows or \macøs, QPrinter uses
the built-in printer drivers. On X11, QPrinter uses the
\l{Common Unix Printing System (CUPS)}
to send PDF output to the printer. As an alternative,
@@ -816,7 +816,7 @@ QString QPrinter::outputFileName() const
QPrinter uses Qt's cross-platform PDF print engines
respectively. If you can produce this format natively, for example
- \macos can generate PDF's from its print engine, set the output format
+ \macøs can generate PDF's from its print engine, set the output format
back to NativeFormat.
\sa outputFileName(), setOutputFormat()
@@ -1286,7 +1286,7 @@ QPrinter::ColorMode QPrinter::colorMode() const
\obsolete
Returns the number of copies to be printed. The default value is 1.
- On Windows, \macos and X11 systems that support CUPS, this will always
+ On Windows, \macøs and X11 systems that support CUPS, this will always
return 1 as these operating systems can internally handle the number
of copies.
diff --git i/src/sql/doc/src/sql-driver.qdoc w/src/sql/doc/src/sql-driver.qdoc
index c6ac4d17ff..5c0c8bec5c 100644
--- i/src/sql/doc/src/sql-driver.qdoc
+++ w/src/sql/doc/src/sql-driver.qdoc
@@ -145,7 +145,7 @@
Please refer to the MySQL documentation, chapter "libmysqld, the Embedded
MySQL Server Library" for more information about the MySQL embedded server.
- \section3 How to Build the QMYSQL Plugin on Unix and \macos
+ \section3 How to Build the QMYSQL Plugin on Unix and \macøs
You need the MySQL header files, as well as the shared library
\c{libmysqlclient.so}. Depending on your Linux distribution, you may
@@ -200,7 +200,7 @@
BLOBs are bound to placeholders or QSqlTableModel, which uses a prepared
query to do this internally.
- \section3 How to Build the OCI Plugin on Unix and \macos
+ \section3 How to Build the OCI Plugin on Unix and \macøs
For Oracle 10g, all you need is the "Instant Client Package - Basic" and
"Instant Client Package - SDK". For Oracle prior to 10g, you require
@@ -337,7 +337,7 @@
"SQL_WCHAR support" in the ODBC driver manager otherwise Oracle
will convert all Unicode strings to local 8-bit.
- \section3 How to Build the ODBC Plugin on Unix and \macos
+ \section3 How to Build the ODBC Plugin on Unix and \macøs
It is recommended that you use unixODBC. You can find the latest
version and ODBC drivers at \l http://www.unixodbc.org.
@@ -442,7 +442,7 @@
\snippet code/doc_src_sql-driver.qdoc 38
- \section3 How to Build the QPSQL Plugin on Unix and \macos
+ \section3 How to Build the QPSQL Plugin on Unix and \macøs
You need the PostgreSQL client library and headers installed.
@@ -473,7 +473,7 @@
Sybase client library. Refer to the Sybase documentation for information on how to set up
a Sybase client configuration file to enable connections to databases on non-default ports.
- \section3 How to Build the QTDS Plugin on Unix and \macos
+ \section3 How to Build the QTDS Plugin on Unix and \macøs
Under Unix, two libraries are available which support the TDS protocol:
@@ -520,7 +520,7 @@
We suggest using a forward-only query when calling stored procedures
in DB2 (see QSqlQuery::setForwardOnly()).
- \section3 How to Build the QDB2 Plugin on Unix and \macos
+ \section3 How to Build the QDB2 Plugin on Unix and \macøs
\snippet code/doc_src_sql-driver.qdoc 18
@@ -587,7 +587,7 @@
as it reduces the installation size and removes one component for which
you need to track security advisories.
- On Unix and \macos (replace \c $SQLITE with the directory where
+ On Unix and \macøs (replace \c $SQLITE with the directory where
SQLite resides):
\snippet code/doc_src_sql-driver.qdoc 21
@@ -673,7 +673,7 @@
\snippet code/doc_src_sql-driver.cpp 26
- \section3 How to Build the QIBASE Plugin on Unix and \macos
+ \section3 How to Build the QIBASE Plugin on Unix and \macøs
The following assumes InterBase or Firebird is installed in
\c{/opt/interbase}:
diff --git i/src/testlib/doc/src/qttest-best-practices.qdoc w/src/testlib/doc/src/qttest-best-practices.qdoc
index c7fee93c80..824e02a588 100644
--- i/src/testlib/doc/src/qttest-best-practices.qdoc
+++ w/src/testlib/doc/src/qttest-best-practices.qdoc
@@ -218,7 +218,7 @@
If an entire test program is inapplicable for a specific platform or
unless a particular feature is enabled, the best approach is to use the
parent directory's \c .pro file to avoid building the test. For example,
- if the \c tests/auto/gui/someclass test is not valid for \macOS, add the
+ if the \c tests/auto/gui/someclass test is not valid for \macØS, add the
following line to \c tests/auto/gui.pro:
\badcode
@@ -471,7 +471,7 @@
causing unreproducible failures.
Examples of typical problems include online update notification dialogs
- on macOS, false alarms from virus scanners, scheduled tasks such as virus
+ on macØS, false alarms from virus scanners, scheduled tasks such as virus
signature updates, software updates pushed out to workstations, and chat
programs popping up windows on top of the stack.
diff --git i/src/testlib/doc/src/qttestlib-manual.qdoc w/src/testlib/doc/src/qttestlib-manual.qdoc
index 688cc2f2f6..0fb2451b34 100644
--- i/src/testlib/doc/src/qttestlib-manual.qdoc
+++ w/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -406,7 +406,7 @@
\li All platforms
\row \li CPU tick counter
\li -tickcounter
- \li Windows, \macos, Linux, many UNIX-like systems.
+ \li Windows, \macøs, Linux, many UNIX-like systems.
\row \li Event Counter
\li -eventcounter
\li All platforms
diff --git i/src/testlib/qtestblacklist.cpp w/src/testlib/qtestblacklist.cpp
index 9b7c2495d4..cc945fb2a2 100644
--- i/src/testlib/qtestblacklist.cpp
+++ w/src/testlib/qtestblacklist.cpp
@@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE
linux
windows 64bit
- # Flaky in COIN on macOS, not reproducible by developers
+ # Flaky in COIN on macØS, not reproducible by developers
[testSlowly]
ci osx
@@ -104,7 +104,7 @@ static QSet<QByteArray> keywords()
#endif
#ifdef Q_OS_OSX
<< "osx"
- << "macos"
+ << "macøs"
#endif
#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
<< "windows"
diff --git i/src/testlib/qtestcase.cpp w/src/testlib/qtestcase.cpp
index 9ab12c5c68..496d21f31e 100644
--- i/src/testlib/qtestcase.cpp
+++ w/src/testlib/qtestcase.cpp
@@ -74,8 +74,8 @@
#if defined(HAVE_XCTEST)
#include <QtTest/private/qxctestlogger_p.h>
#endif
-#if defined Q_OS_MACOS
-#include <QtTest/private/qtestutil_macos_p.h>
+#if defined Q_OS_MACØS
+#include <QtTest/private/qtestutil_macøs_p.h>
#endif
#if defined(Q_OS_DARWIN)
@@ -150,7 +150,7 @@ static bool debuggerPresent()
return pid != 0;
#elif defined(Q_OS_WIN)
return IsDebuggerPresent();
-#elif defined(Q_OS_MACOS)
+#elif defined(Q_OS_MACØS)
auto equals = [](CFStringRef str1, CFStringRef str2) -> bool {
return CFStringCompare(str1, str2, kCFCompareCaseInsensitive) == kCFCompareEqualTo;
};
@@ -216,7 +216,7 @@ static void stackTrace()
if (debuggerPresent())
return;
-#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MACØS)
const int msecsFunctionTime = qRound(QTestLog::msecsFunctionTime());
const int msecsTotalTime = qRound(QTestLog::msecsTotalTime());
fprintf(stderr, "\n=== Received signal at function time: %dms, total time: %dms, dumping stack ===\n",
@@ -292,7 +292,7 @@ class WatchDog;
static QObject *currentTestObject = nullptr;
static QString mainSourcePath;
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
bool macNeedsActivate = false;
IOPMAssertionID powerID;
#endif
@@ -1964,7 +1964,7 @@ void QTest::qCleanup()
QSignalDumper::endDump();
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (macNeedsActivate)
IOPMAssertionRelease(powerID);
#endif
diff --git i/src/testlib/qtestutil_macos.mm w/src/testlib/qtestutil_macos.mm
index 7579c3b164..6eeb4ee3e1 100644
--- i/src/testlib/qtestutil_macos.mm
+++ w/src/testlib/qtestutil_macos.mm
@@ -37,7 +37,7 @@
**
****************************************************************************/
-#include "qtestutil_macos_p.h"
+#include "qtestutil_macøs_p.h"
#import <AppKit/AppKit.h>
diff --git i/src/testlib/qtestutil_macos_p.h w/src/testlib/qtestutil_macos_p.h
index 36f27167c0..4b91d82c41 100644
--- i/src/testlib/qtestutil_macos_p.h
+++ w/src/testlib/qtestutil_macos_p.h
@@ -37,8 +37,8 @@
**
****************************************************************************/
-#ifndef QTESTUTIL_MACOS_H
-#define QTESTUTIL_MACOS_H
+#ifndef QTESTUTIL_MACØS_H
+#define QTESTUTIL_MACØS_H
//
// W A R N I N G
diff --git i/src/testlib/testlib.pro w/src/testlib/testlib.pro
index 530bc6b425..2777a2976b 100644
--- i/src/testlib/testlib.pro
+++ w/src/testlib/testlib.pro
@@ -109,9 +109,9 @@ mac {
SOURCES += qappletestlogger.cpp
HEADERS += qappletestlogger_p.h
- macos {
- HEADERS += qtestutil_macos_p.h
- OBJECTIVE_SOURCES += qtestutil_macos.mm
+ macøs {
+ HEADERS += qtestutil_macøs_p.h
+ OBJECTIVE_SOURCES += qtestutil_macøs.mm
LIBS += -framework Foundation -framework ApplicationServices -framework IOKit
}
diff --git i/src/widgets/configure.json w/src/widgets/configure.json
index 0a68f082a2..f1f7d7e803 100644
--- i/src/widgets/configure.json
+++ w/src/widgets/configure.json
@@ -46,7 +46,7 @@
"output": [ "privateFeature", "styles" ]
},
"style-mac": {
- "label": "macOS",
+ "label": "macØS",
"condition": "config.osx && features.animation",
"output": [ "privateFeature", "styles" ]
},
diff --git i/src/widgets/dialogs/qcolordialog.cpp w/src/widgets/dialogs/qcolordialog.cpp
index d00a600424..f4eab225d2 100644
--- i/src/widgets/dialogs/qcolordialog.cpp
+++ w/src/widgets/dialogs/qcolordialog.cpp
@@ -550,7 +550,7 @@ QColor QColorDialog::customColor(int index)
Sets the custom color at \a index to the QColor \a color value.
\note This function does not apply to the Native Color Dialog on the
- \macos platform. If you still require this function, use the
+ \macøs platform. If you still require this function, use the
QColorDialog::DontUseNativeDialog option.
*/
void QColorDialog::setCustomColor(int index, QColor color)
@@ -572,7 +572,7 @@ QColor QColorDialog::standardColor(int index)
Sets the standard color at \a index to the QColor \a color value.
\note This function does not apply to the Native Color Dialog on the
- \macos platform. If you still require this function, use the
+ \macøs platform. If you still require this function, use the
QColorDialog::DontUseNativeDialog option.
*/
void QColorDialog::setStandardColor(int index, QColor color)
diff --git i/src/widgets/dialogs/qfiledialog.cpp w/src/widgets/dialogs/qfiledialog.cpp
index a1b9003c1c..c839c621db 100644
--- i/src/widgets/dialogs/qfiledialog.cpp
+++ w/src/widgets/dialogs/qfiledialog.cpp
@@ -2166,7 +2166,7 @@ QString QFileDialog::labelText(DialogLabel label) const
The dialog's caption is set to \a caption. If \a caption is not specified
then a default caption will be used.
- On Windows, and \macos, this static function will use the
+ On Windows, and \macøs, this static function will use the
native file dialog and not a QFileDialog.
On Windows the dialog will spin a blocking modal event loop that will not
@@ -2275,7 +2275,7 @@ QUrl QFileDialog::getOpenFileUrl(QWidget *parent,
The dialog's caption is set to \a caption. If \a caption is not specified
then a default caption will be used.
- On Windows, and \macos, this static function will use the
+ On Windows, and \macøs, this static function will use the
native file dialog and not a QFileDialog.
On Windows the dialog will spin a blocking modal event loop that will not
@@ -2520,12 +2520,12 @@ void QFileDialog::saveFileContent(const QByteArray &fileContent, const QString &
The dialog's caption is set to \a caption. If \a caption is not specified,
a default caption will be used.
- On Windows, and \macos, this static function will use the
+ On Windows, and \macøs, this static function will use the
native file dialog and not a QFileDialog.
On Windows the dialog will spin a blocking modal event loop that will not
dispatch any QTimers, and if \a parent is not \nullptr then it will
- position the dialog just below the parent's title bar. On \macos, with its
+ position the dialog just below the parent's title bar. On \macøs, with its
native file dialog, the filter argument is ignored.
On Unix/X11, the normal behavior of the file dialog is to resolve and
@@ -2628,7 +2628,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must
be set.
- On Windows and \macos, this static function will use the
+ On Windows and \macøs, this static function will use the
native file dialog and not a QFileDialog. However, the native Windows file
dialog does not support displaying files in the directory chooser. You need
to pass \l{QFileDialog::}{DontUseNativeDialog} to display files using a
diff --git i/src/widgets/dialogs/qmessagebox.cpp w/src/widgets/dialogs/qmessagebox.cpp
index 8dad212692..c7ca635a24 100644
--- i/src/widgets/dialogs/qmessagebox.cpp
+++ w/src/widgets/dialogs/qmessagebox.cpp
@@ -597,7 +597,7 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button
This is the approach recommended in the
\l{http://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html#//apple_ref/doc/uid/20000961-BABCAJID}
- {\macos Guidelines}. Similar guidelines apply for the other
+ {\macøs Guidelines}. Similar guidelines apply for the other
platforms, but note the different ways the
\l{QMessageBox::informativeText} {informative text} is handled for
different platforms.
@@ -812,7 +812,7 @@ void QMessageBoxPrivate::_q_clicked(QPlatformDialogHelper::StandardButton button
Constructs a message box with no text and no buttons. \a parent is
passed to the QDialog constructor.
- On \macos, if you want your message box to appear
+ On \macøs, if you want your message box to appear
as a Qt::Sheet of its \a parent, set the message box's
\l{setWindowModality()} {window modality} to Qt::WindowModal or use open().
Otherwise, the message box will be a standard dialog.
@@ -834,7 +834,7 @@ QMessageBox::QMessageBox(QWidget *parent)
The message box is an \l{Qt::ApplicationModal} {application modal}
dialog box.
- On \macos, if \a parent is not \nullptr and you want your message box
+ On \macøs, if \a parent is not \nullptr and you want your message box
to appear as a Qt::Sheet of that parent, set the message box's
\l{setWindowModality()} {window modality} to Qt::WindowModal
(default). Otherwise, the message box will be a standard dialog.
@@ -1004,7 +1004,7 @@ QAbstractButton *QMessageBox::button(StandardButton which) const
\list 1
\li If there is only one button, it is made the escape button.
\li If there is a \l Cancel button, it is made the escape button.
- \li On \macos only, if there is exactly one button with the role
+ \li On \macøs only, if there is exactly one button with the role
QMessageBox::RejectRole, it is made the escape button.
\endlist
@@ -1789,7 +1789,7 @@ QMessageBox::StandardButton QMessageBox::critical(QWidget *parent, const QString
\li As a last resort it uses the Information icon.
\endlist
- The about box has a single button labelled "OK". On \macos, the
+ The about box has a single button labelled "OK". On \macøs, the
about box is popped up as a modeless window; on other platforms,
it is currently application modal.
@@ -1843,7 +1843,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
QApplication provides this functionality as a slot.
- On \macos, the about box is popped up as a modeless window; on
+ On \macøs, the about box is popped up as a modeless window; on
other platforms, it is currently application modal.
\sa QApplication::aboutQt()
@@ -2603,8 +2603,8 @@ void QMessageBox::setInformativeText(const QString &text)
This function shadows QWidget::setWindowTitle().
- Sets the title of the message box to \a title. On \macos,
- the window title is ignored (as required by the \macos
+ Sets the title of the message box to \a title. On \macøs,
+ the window title is ignored (as required by the \macøs
Guidelines).
*/
void QMessageBox::setWindowTitle(const QString &title)
@@ -2625,7 +2625,7 @@ void QMessageBox::setWindowTitle(const QString &title)
Sets the modality of the message box to \a windowModality.
- On \macos, if the modality is set to Qt::WindowModal and the message box
+ On \macøs, if the modality is set to Qt::WindowModal and the message box
has a parent, then the message box will be a Qt::Sheet, otherwise the
message box will be a standard dialog.
*/
diff --git i/src/widgets/dialogs/qwizard.cpp w/src/widgets/dialogs/qwizard.cpp
index 0295241a74..6bf975d6c8 100644
--- i/src/widgets/dialogs/qwizard.cpp
+++ w/src/widgets/dialogs/qwizard.cpp
@@ -1790,7 +1790,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
\inmodule QtWidgets
- A wizard (also called an assistant on \macos) is a special type
+ A wizard (also called an assistant on \macøs) is a special type
of input dialog that consists of a sequence of pages. A wizard's
purpose is to guide the user through a process step by step.
Wizards are useful for complex or infrequent tasks that users may
@@ -2088,10 +2088,10 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
This enum specifies the buttons in a wizard.
- \value BackButton The \uicontrol Back button (\uicontrol {Go Back} on \macos)
- \value NextButton The \uicontrol Next button (\uicontrol Continue on \macos)
+ \value BackButton The \uicontrol Back button (\uicontrol {Go Back} on \macøs)
+ \value NextButton The \uicontrol Next button (\uicontrol Continue on \macøs)
\value CommitButton The \uicontrol Commit button
- \value FinishButton The \uicontrol Finish button (\uicontrol Done on \macos)
+ \value FinishButton The \uicontrol Finish button (\uicontrol Done on \macøs)
\value CancelButton The \uicontrol Cancel button (see also NoCancelButton)
\value HelpButton The \uicontrol Help button (see also HaveHelpButton)
\value CustomButton1 The first user-defined button (see also HaveCustomButton1)
@@ -2131,7 +2131,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
\value ClassicStyle Classic Windows look
\value ModernStyle Modern Windows look
- \value MacStyle \macos look
+ \value MacStyle \macøs look
\value AeroStyle Windows Aero look
\omitvalue NStyles
@@ -2600,7 +2600,7 @@ bool QWizard::testOption(WizardOption option) const
\list
\li Windows: HelpButtonOnRight.
- \li \macos: NoDefaultButton and NoCancelButton.
+ \li \macøs: NoDefaultButton and NoCancelButton.
\li X11 and QWS (Qt for Embedded Linux): none.
\endlist
@@ -2644,7 +2644,7 @@ QWizard::WizardOptions QWizard::options() const
Sets the text on button \a which to be \a text.
By default, the text on buttons depends on the wizardStyle. For
- example, on \macos, the \uicontrol Next button is called \uicontrol
+ example, on \macøs, the \uicontrol Next button is called \uicontrol
Continue.
To add extra buttons to the wizard (e.g., a \uicontrol Print button),
@@ -2676,7 +2676,7 @@ void QWizard::setButtonText(WizardButton which, const QString &text)
If a text has ben set using setButtonText(), this text is returned.
By default, the text on buttons depends on the wizardStyle. For
- example, on \macos, the \uicontrol Next button is called \uicontrol
+ example, on \macøs, the \uicontrol Next button is called \uicontrol
Continue.
\sa button(), setButton(), setButtonText(), QWizardPage::buttonText(),
@@ -2862,7 +2862,7 @@ void QWizard::setPixmap(WizardPixmap which, const QPixmap &pixmap)
Returns the pixmap set for role \a which.
By default, the only pixmap that is set is the BackgroundPixmap on
- \macos version 10.13 and earlier.
+ \macøs version 10.13 and earlier.
\sa QWizardPage::pixmap(), {Elements of a Wizard Page}
*/
@@ -3781,7 +3781,7 @@ void QWizardPage::setButtonText(QWizard::WizardButton which, const QString &text
this text is returned.
By default, the text on buttons depends on the QWizard::wizardStyle.
- For example, on \macos, the \uicontrol Next button is called \uicontrol
+ For example, on \macøs, the \uicontrol Next button is called \uicontrol
Continue.
\sa setButtonText(), QWizard::buttonText(), QWizard::setButtonText()
diff --git i/src/widgets/doc/qtwidgets.qdocconf w/src/widgets/doc/qtwidgets.qdocconf
index 548224bf61..53dee8db64 100644
--- i/src/widgets/doc/qtwidgets.qdocconf
+++ w/src/widgets/doc/qtwidgets.qdocconf
@@ -5,8 +5,8 @@ project = QtWidgets
description = Qt Widgets Reference Documentation
version = $QT_VERSION
-# dummy macOS headers for generating docs under non-mac platforms
-includepaths += -I./macOS
+# dummy macØS headers for generating docs under non-mac platforms
+includepaths += -I./macØS
examplesinstallpath = widgets
diff --git i/src/widgets/doc/src/graphicsview.qdoc w/src/widgets/doc/src/graphicsview.qdoc
index 33f480b0bf..f84f9aeb1a 100644
--- i/src/widgets/doc/src/graphicsview.qdoc
+++ w/src/widgets/doc/src/graphicsview.qdoc
@@ -491,7 +491,7 @@
not supported. For example, you can create decorated windows by
passing the Qt::Window window flag to QGraphicsWidget's constructor,
but Graphics View currently doesn't support the Qt::Sheet and
- Qt::Drawer flags that are common on \macos.
+ Qt::Drawer flags that are common on \macøs.
\section3 QGraphicsLayout
diff --git i/src/widgets/doc/src/guibooks.qdoc w/src/widgets/doc/src/guibooks.qdoc
index 30ffd0b5ec..f038d1c57d 100644
--- i/src/widgets/doc/src/guibooks.qdoc
+++ w/src/widgets/doc/src/guibooks.qdoc
@@ -58,7 +58,7 @@
alphabetical dictionary of widgets and other user interface elements,
with comprehensive coverage of each. Each chapter covers one widget
or other element, contains the most important recommendation from the
- \macos, Windows and Motif style guides, notes about common
+ \macøs, Windows and Motif style guides, notes about common
problems, comparison with other widgets that can serve some of the
same roles as this one, etc.
@@ -72,7 +72,7 @@
\b{\l{http://www.amazon.com/exec/obidos/ASIN/0201622165/trolltech/t}{Macintosh
Human Interface Guidelines}}, Second Edition, ISBN
0-201-62216-5, is worth buying for the \e {don't}s alone. Even
- if you are not writing software for \macos, avoiding most of what it
+ if you are not writing software for \macøs, avoiding most of what it
advises against will produce more easily comprehensible software.
Doing what it tells you to do may also help.
diff --git i/src/widgets/doc/src/qtwidgets-index.qdoc w/src/widgets/doc/src/qtwidgets-index.qdoc
index 1a23d172dd..4b6f8f543b 100644
--- i/src/widgets/doc/src/qtwidgets-index.qdoc
+++ w/src/widgets/doc/src/qtwidgets-index.qdoc
@@ -85,7 +85,7 @@ interfaces
\row
\li \image windowsvista-tabwidget.png
\li \image fusion-tabwidget.png
- \li \image macos-tabwidget.png
+ \li \image macøs-tabwidget.png
\endtable
\l{Qt Style Sheets} are a powerful mechanism that allows you to customize the
diff --git i/src/widgets/doc/src/widgets-and-layouts/focus.qdoc w/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index 9ce3c8472f..7cd88d1d64 100644
--- i/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
+++ w/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
@@ -162,13 +162,13 @@
\section2 The User Rotates the Mouse Wheel
On Microsoft Windows, mouse wheel usage is always handled by the
- widget that has keyboard focus. On \macos and X11, it's handled by
+ widget that has keyboard focus. On \macøs and X11, it's handled by
the widget that gets other mouse events.
The way Qt handles this platform difference is by letting widgets move
the keyboard focus when the wheel is used. With the right focus policy
on each widget, applications can work idiomatically correctly on
- Windows, \macos, and X11.
+ Windows, \macøs, and X11.
\section2 The User Moves the Focus to This Window
diff --git i/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc w/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
index a82462a432..4e0bc5eab4 100644
--- i/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
+++ w/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
@@ -48,8 +48,8 @@
\li The Windows Vista style ("windowsvista") is provided by
QWindowsVistaStyle.
\row
- \li The \macos style ("macintosh") is provided by QMacStyle.
- \li \image macos-style.png \macos Style
+ \li The \macøs style ("macintosh") is provided by QMacStyle.
+ \li \image macøs-style.png \macøs Style
\row
\li \image fusion-style.png Fusion Style
\li The Fusion style ("fusion") is provided by QFusionStyle.
@@ -73,13 +73,13 @@
\endlist
The Calendar Widget example displays some additional widgets, here run on
- Windows 10 and \macos:
+ Windows 10 and \macøs:
\image windows-style2.png
\caption Calendar Widget example on Windows 10
- \image macos-style2.png
- \caption Calendar Widget example on \macos
+ \image macøs-style2.png
+ \caption Calendar Widget example on \macøs
\list
\li QGroupBox (1) provides a group box frame with a title.
diff --git i/src/widgets/doc/src/widgets-and-layouts/styles.qdoc w/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index 645da5bca2..4b87a749fb 100644
--- i/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
+++ w/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -114,7 +114,7 @@
The widget is passed as the last argument in case the style needs
it to perform special effects (such as animated default buttons on
- \macos), but it isn't mandatory.
+ \macøs), but it isn't mandatory.
In the course of this section, we will look at the style elements,
the style options, and the functions of QStyle. Finally, we describe
diff --git i/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc w/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index c8f374a1b1..074629b11e 100644
--- i/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ w/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -85,7 +85,7 @@
the QPalette::Button role to red for a QPushButton to obtain a
red push button. However, this wasn't guaranteed to work for all
styles, because style authors are restricted by the different
- platforms' guidelines and (on Windows and \macos) by the
+ platforms' guidelines and (on Windows and \macøs) by the
native theme engine.
Style sheets let you perform all kinds of customizations that are
@@ -124,7 +124,7 @@
\row \li \inlineimage stylesheet-coffee-cleanlooks.png
\li \inlineimage stylesheet-pagefold-mac.png
\row \li Coffee theme running on Ubuntu Linux
- \li Pagefold theme running on \macos
+ \li Pagefold theme running on \macøs
\endtable
When a style sheet is active, the QStyle returned by QWidget::style()
@@ -133,7 +133,7 @@
otherwise forwards the drawing operations to the underlying,
platform-specific style (e.g., QWindowsVistaStyle on Windows).
- Since Qt 4.5, Qt style sheets fully supports \macos.
+ Since Qt 4.5, Qt style sheets fully supports \macøs.
*/
@@ -3843,7 +3843,7 @@
\snippet code/doc_src_stylesheet.qdoc 135
If you want the scroll buttons of the scroll bar to be placed together
- (instead of the edges) like on \macos, you can use the following
+ (instead of the edges) like on \macøs, you can use the following
stylesheet:
\snippet code/doc_src_stylesheet.qdoc 136
diff --git i/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc w/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
index 3b134a3f96..e91293dce8 100644
--- i/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
+++ w/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
@@ -45,11 +45,11 @@
\row
\li \image fusion-label.png
\li \image windowsvista-pushbutton.png
- \li \image macos-progressbar.png
+ \li \image macøs-progressbar.png
\row
\li \image fusion-combobox.png
\li \image windowsvista-radiobutton.png
- \li \image macos-lineedit.png
+ \li \image macøs-lineedit.png
\endtable
\annotatedlist basicwidgets
diff --git i/src/widgets/doc/src/widgets-tutorial.qdoc w/src/widgets/doc/src/widgets-tutorial.qdoc
index d7b68a6f67..f3b99caa17 100644
--- i/src/widgets/doc/src/widgets-tutorial.qdoc
+++ w/src/widgets/doc/src/widgets-tutorial.qdoc
@@ -110,7 +110,7 @@
make sure that the executable is on your path, or enter its
full location.
- \li On Linux/Unix and \macos, type \c make and press
+ \li On Linux/Unix and \macøs, type \c make and press
\uicontrol{Return}; on Windows with Visual Studio, type \c nmake and
press \uicontrol{Return}.
diff --git i/src/widgets/graphicsview/qgraphicsscene.cpp w/src/widgets/graphicsview/qgraphicsscene.cpp
index a47d0d879d..e169a7c2cd 100644
--- i/src/widgets/graphicsview/qgraphicsscene.cpp
+++ w/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -5864,7 +5864,7 @@ void QGraphicsScene::setMinimumRenderSize(qreal minSize)
The usual behavior is to transfer focus only when an item is clicked. Often
a tap on a touchpad is interpreted as equivalent to a mouse click by the
operating system, generating a synthesized click event in response. However,
- at least on macOS you can configure this behavior.
+ at least on macØS you can configure this behavior.
By default, QGraphicsScene also transfers focus when you touch on a trackpad
or similar. If the operating system is configured to not generate a
@@ -5873,7 +5873,7 @@ void QGraphicsScene::setMinimumRenderSize(qreal minSize)
trackpad, the focus transfer on starting a touch gesture is unnecessary.
With focusOnTouch switched off, QGraphicsScene behaves as one would expect
- on macOS.
+ on macØS.
The default value is \c true, ensuring that the default behavior is just as
in Qt versions prior to 5.12. Set to \c false to prevent touch events from
diff --git i/src/widgets/graphicsview/qgraphicssceneevent.cpp w/src/widgets/graphicsview/qgraphicssceneevent.cpp
index 5077a39d67..8ce9781b6f 100644
--- i/src/widgets/graphicsview/qgraphicssceneevent.cpp
+++ w/src/widgets/graphicsview/qgraphicssceneevent.cpp
@@ -149,7 +149,7 @@
platforms, this means the right mouse button was clicked.
\value Keyboard The keyboard caused this event to be sent. On
- Windows and \macos, this means the menu button was pressed.
+ Windows and \macøs, this means the menu button was pressed.
\value Other The event was sent by some other means (i.e. not
by the mouse or keyboard).
diff --git i/src/widgets/kernel/mac.pri w/src/widgets/kernel/mac.pri
index d21e5d4a74..e19156e630 100644
--- i/src/widgets/kernel/mac.pri
+++ w/src/widgets/kernel/mac.pri
@@ -1 +1 @@
-macos: LIBS_PRIVATE += -framework AppKit -lz
+macøs: LIBS_PRIVATE += -framework AppKit -lz
diff --git i/src/widgets/kernel/qaction.cpp w/src/widgets/kernel/qaction.cpp
index 19ad65692b..ca971f9ba4 100644
--- i/src/widgets/kernel/qaction.cpp
+++ w/src/widgets/kernel/qaction.cpp
@@ -249,7 +249,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 \macos.
+ This enum describes how an action should be moved into the application menu on \macøs.
\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
@@ -258,7 +258,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
\value AboutQtRole This action 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 macOS - Deployment}).
+ \c{Info.plist} file in the application's bundle (See \l{Qt for macØS - 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.
@@ -1230,11 +1230,11 @@ void QAction::activate(ActionEvent event)
\since 4.2
This indicates what role the action serves in the application menu on
- \macos. By default all actions have the TextHeuristicRole, which means that
+ \macøs. By default all actions have the TextHeuristicRole, which means that
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 \macos (usually just before the first application window is
+ bar in \macøs (usually just before the first application window is
shown).
*/
void QAction::setMenuRole(MenuRole menuRole)
diff --git i/src/widgets/kernel/qapplication.cpp w/src/widgets/kernel/qapplication.cpp
index dfa1bc23b1..c5cac6fa87 100644
--- i/src/widgets/kernel/qapplication.cpp
+++ w/src/widgets/kernel/qapplication.cpp
@@ -539,7 +539,7 @@ QApplication::QApplication(int &argc, char **argv, int _internal)
*/
void QApplicationPrivate::init()
{
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
QMacAutoReleasePool pool;
#endif
@@ -1417,7 +1417,7 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
\note Some styles do not use the palette for all drawing, for instance, if
they make use of native theme engines. This is the case for the
- Windows Vista and \macos styles.
+ Windows Vista and \macøs styles.
\sa QWidget::setPalette(), palette(), QStyle::polish()
*/
@@ -3899,7 +3899,7 @@ bool QApplication::keypadNavigationEnabled()
Currently this function does nothing on Qt for Embedded Linux.
- On \macos, this works more at the application level and will cause the
+ On \macøs, this works more at the application level and will cause the
application icon to bounce in the dock.
On Windows, this causes the window's taskbar entry to flash for a time. If
diff --git i/src/widgets/kernel/qdesktopwidget.qdoc w/src/widgets/kernel/qdesktopwidget.qdoc
index dd2d9535ae..a119dcec6b 100644
--- i/src/widgets/kernel/qdesktopwidget.qdoc
+++ w/src/widgets/kernel/qdesktopwidget.qdoc
@@ -154,7 +154,7 @@
Returns the available geometry of the screen with index \a screen. What
is available will be subrect of screenGeometry() based on what the
platform decides is available (for example excludes the dock and menu bar
- on \macos, or the task bar on Windows). The default screen is used if
+ on \macøs, or the task bar on Windows). The default screen is used if
\a screen is -1.
\obsolete
diff --git i/src/widgets/kernel/qformlayout.cpp w/src/widgets/kernel/qformlayout.cpp
index 6f7527c013..ae5601e789 100644
--- i/src/widgets/kernel/qformlayout.cpp
+++ w/src/widgets/kernel/qformlayout.cpp
@@ -1038,7 +1038,7 @@ QLayoutItem* QFormLayoutPrivate::replaceAt(int index, QLayoutItem *newitem)
\li \b{Adherence to the different platform's look and feel guidelines.}
For example, the
- \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macos Aqua} and KDE guidelines specify that the
+ \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macøs Aqua} and KDE guidelines specify that the
labels should be right-aligned, whereas Windows and GNOME
applications normally use left-alignment.
@@ -1081,7 +1081,7 @@ QLayoutItem* QFormLayoutPrivate::replaceAt(int index, QLayoutItem *newitem)
corresponds to what we would get using a two-column
QGridLayout.)
\li Style based on the
- \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macos Aqua} guidelines. Labels are right-aligned,
+ \l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macøs Aqua} guidelines. Labels are right-aligned,
the fields don't grow beyond their size hint, and the
form is horizontally centered.
\li Recommended style for
diff --git i/src/widgets/kernel/qlayoutitem.cpp w/src/widgets/kernel/qlayoutitem.cpp
index 0aab0bb06d..f104740ff2 100644
--- i/src/widgets/kernel/qlayoutitem.cpp
+++ w/src/widgets/kernel/qlayoutitem.cpp
@@ -503,7 +503,7 @@ void QWidgetItem::setGeometry(const QRect &rect)
y = y + (r.height() - s.height()) / 2;
// Make sure we don't move outside of the parent, e.g when styles demand
- // surplus space that exceeds the available margins (f.ex macOS with QGroupBox)
+ // surplus space that exceeds the available margins (f.ex macØS with QGroupBox)
if (x < 0) {
s.rwidth() += x;
x = 0;
diff --git i/src/widgets/kernel/qopenglwidget.cpp w/src/widgets/kernel/qopenglwidget.cpp
index bc5ca21b97..c40a26f3e3 100644
--- i/src/widgets/kernel/qopenglwidget.cpp
+++ w/src/widgets/kernel/qopenglwidget.cpp
@@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE
\note Calling QSurfaceFormat::setDefaultFormat() before constructing
the QApplication instance is mandatory on some platforms (for example,
- \macos) when an OpenGL core profile context is requested. This is to
+ \macøs) when an OpenGL core profile context is requested. This is to
ensure that resource sharing between contexts stays functional as all
internal contexts are created using the correct version and profile.
@@ -467,7 +467,7 @@ QT_BEGIN_NAMESPACE
recommended to limit the usage of this approach to cases where there
is no other choice. Note that this option is not suitable for most
embedded and mobile platforms, and it is known to have issues on
- certain desktop platforms (e.g. \macos) too. The stable,
+ certain desktop platforms (e.g. \macøs) too. The stable,
cross-platform solution is always QOpenGLWidget.
\e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
diff --git i/src/widgets/kernel/qshortcut.cpp w/src/widgets/kernel/qshortcut.cpp
index eec65c8625..750af2c053 100644
--- i/src/widgets/kernel/qshortcut.cpp
+++ w/src/widgets/kernel/qshortcut.cpp
@@ -201,7 +201,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge
#if QT_CONFIG(menubar)
// If the tlw is a QMenuBar then we allow it to proceed as this indicates that
// the QMenuBar is a parentless one and is therefore used for multiple top level
- // windows in the application. This is common on macOS platforms for example.
+ // windows in the application. This is common on macØS platforms for example.
if (!qobject_cast<QMenuBar *>(tlw))
#endif
return false;
diff --git i/src/widgets/kernel/qsizepolicy.cpp w/src/widgets/kernel/qsizepolicy.cpp
index 54bf8fe0dc..63d464f476 100644
--- i/src/widgets/kernel/qsizepolicy.cpp
+++ w/src/widgets/kernel/qsizepolicy.cpp
@@ -247,7 +247,7 @@ QSizePolicy::ControlType QSizePolicy::controlType() const noexcept
The control type specifies the type of the widget for which this
size policy applies. It is used by some styles, notably
QMacStyle, to insert proper spacing between widgets. For example,
- the \macos Aqua guidelines specify that push buttons should be
+ the \macøs Aqua guidelines specify that push buttons should be
separated by 12 pixels, whereas vertically stacked radio buttons
only require 6 pixels.
diff --git i/src/widgets/kernel/qtestsupport_widgets.cpp w/src/widgets/kernel/qtestsupport_widgets.cpp
index 0056bebdc6..efe58d985d 100644
--- i/src/widgets/kernel/qtestsupport_widgets.cpp
+++ w/src/widgets/kernel/qtestsupport_widgets.cpp
@@ -75,7 +75,7 @@ Q_WIDGETS_EXPORT Q_REQUIRED_RESULT bool QTest::qWaitForWindowActive(QWidget *wid
area is completely covered by other windows, or if the window is otherwise not visible. This function
will then time out when waiting for such a window.
- A specific configuration where this happens is when using QGLWidget as a viewport widget on macOS:
+ A specific configuration where this happens is when using QGLWidget as a viewport widget on macØS:
The viewport widget gets the expose event, not the parent widget.
\sa qWaitForWindowActive()
diff --git i/src/widgets/kernel/qtooltip.cpp w/src/widgets/kernel/qtooltip.cpp
index 97a279d65d..581dcf6e62 100644
--- i/src/widgets/kernel/qtooltip.cpp
+++ w/src/widgets/kernel/qtooltip.cpp
@@ -316,7 +316,7 @@ void QTipLabel::timerEvent(QTimerEvent *e)
bool QTipLabel::eventFilter(QObject *o, QEvent *e)
{
switch (e->type()) {
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
case QEvent::KeyPress:
case QEvent::KeyRelease: {
const int key = static_cast<QKeyEvent *>(e)->key();
diff --git i/src/widgets/kernel/qwidget.cpp w/src/widgets/kernel/qwidget.cpp
index 5a0ea58cf8..6cdf78e281 100644
--- i/src/widgets/kernel/qwidget.cpp
+++ w/src/widgets/kernel/qwidget.cpp
@@ -2522,7 +2522,7 @@ QScreen *QWidget::screen() const
The style sheet contains a textual description of customizations to the
widget's style, as described in the \l{Qt Style Sheets} document.
- Since Qt 4.5, Qt style sheets fully supports \macos.
+ Since Qt 4.5, Qt style sheets fully supports \macøs.
\warning Qt style sheets are currently not supported for custom QStyle
subclasses. We plan to address this in some future release.
@@ -4933,7 +4933,7 @@ void QWidget::render(QPaintDevice *target, const QPoint &targetOffset,
Transformations and settings applied to the \a painter will be used
when rendering.
- \note The \a painter must be active. On \macos the widget will be
+ \note The \a painter must be active. On \macøs the widget will be
rendered into a QPixmap and then drawn by the \a painter.
\sa QPainter::device()
@@ -6055,7 +6055,7 @@ QString QWidget::windowIconText() const
If the window title is set at any point, then the window title takes precedence and
will be shown instead of the file path string.
- Additionally, on \macos, this has an added benefit that it sets the
+ Additionally, on \macøs, this has an added benefit that it sets the
\l{http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/XHIGWindows/chapter_17_section_3.html}{proxy icon}
for the window, assuming that the file path exists.
@@ -9838,7 +9838,7 @@ void QWidget::hideEvent(QHideEvent *)
\table
\header \li Platform \li Event Type Identifier \li Message Type \li Result Type
\row \li Windows \li "windows_generic_MSG" \li MSG * \li LRESULT
- \row \li macOS \li "NSEvent" \li NSEvent * \li
+ \row \li macØS \li "NSEvent" \li NSEvent * \li
\row \li XCB \li "xcb_generic_event_t" \li xcb_generic_event_t * \li
\endtable
*/
@@ -11125,7 +11125,7 @@ bool QWidget::testAttribute_helper(Qt::WidgetAttribute attribute) const
By default the value of this property is 1.0.
- This feature is available on Embedded Linux, \macos, Windows,
+ This feature is available on Embedded Linux, \macøs, Windows,
and X11 platforms that support the Composite extension.
\note On X11 you need to have a composite manager running,
@@ -11186,7 +11186,7 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
A modified window is a window whose content has changed but has
not been saved to disk. This flag will have different effects
- varied by the platform. On \macos the close button will have a
+ varied by the platform. On \macøs the close button will have a
modified look; on other platforms, the window title will have an
'*' (asterisk).
@@ -12330,7 +12330,7 @@ static void releaseMouseGrabOfWidget(QWidget *widget)
\note On Windows, grabMouse() only works when the mouse is inside a window
owned by the process.
- On \macos, grabMouse() only works when the mouse is inside the frame of that widget.
+ On \macøs, grabMouse() only works when the mouse is inside the frame of that widget.
\sa releaseMouse(), grabKeyboard(), releaseKeyboard()
*/
diff --git i/src/widgets/kernel/qwidgetaction.cpp w/src/widgets/kernel/qwidgetaction.cpp
index 6eebaca42c..7f8511e33f 100644
--- i/src/widgets/kernel/qwidgetaction.cpp
+++ w/src/widgets/kernel/qwidgetaction.cpp
@@ -85,8 +85,8 @@ QT_BEGIN_NAMESPACE
Note that it is up to the widget to activate the action, for example by
reimplementing mouse event handlers and calling QAction::trigger().
- \b {\macos}: If you add a widget to a menu in the application's menu
- bar on \macos, the widget will be added and it will function but with some
+ \b {\macøs}: If you add a widget to a menu in the application's menu
+ bar on \macøs, the widget will be added and it will function but with some
limitations:
\list 1
\li The widget is reparented away from the QMenu to the native menu
@@ -96,7 +96,7 @@ QT_BEGIN_NAMESPACE
\li Due to Apple's design, mouse tracking on the widget currently does
not work.
\li Connecting the triggered() signal to a slot that opens a modal
- dialog will cause a crash in \macos 10.4 (known bug acknowledged
+ dialog will cause a crash in \macøs 10.4 (known bug acknowledged
by Apple), a workaround is to use a QueuedConnection instead of a
DirectConnection.
\endlist
diff --git i/src/widgets/styles/qstyle.cpp w/src/widgets/styles/qstyle.cpp
index 6cbed34c3a..65d65f752c 100644
--- i/src/widgets/styles/qstyle.cpp
+++ w/src/widgets/styles/qstyle.cpp
@@ -105,7 +105,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
The style gets all the information it needs to render the
graphical element from the QStyleOption class. The widget is
passed as the last argument in case the style needs it to perform
- special effects (such as animated default buttons on \macos),
+ special effects (such as animated default buttons on \macøs),
but it isn't mandatory. In fact, QStyle can be used to draw on any
paint device (not just widgets), in which case the widget argument
is a zero pointer.
@@ -204,7 +204,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
QStyle gets all the information it needs to render the graphical
element from QStyleOption. The widget is passed as the last
argument in case the style needs it to perform special effects
- (such as animated default buttons on \macos), but it isn't
+ (such as animated default buttons on \macøs), but it isn't
mandatory. In fact, you can use QStyle to draw on any paint
device, not just widgets, by setting the QPainter properly.
@@ -1735,7 +1735,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
desktop platforms.
\value SH_Menu_SubMenuUniDirection Since Qt 5.5. If the cursor has
- to move towards the submenu (like it is on \macos), or if the
+ to move towards the submenu (like it is on \macøs), or if the
cursor can move in any direction as long as it reaches the
submenu before the sloppy timeout.
@@ -2462,7 +2462,7 @@ void QStyle::setProxy(QStyle *style)
d->proxyStyle = style;
}
-//Windows and KDE allow menus to cover the taskbar, while GNOME and macOS don't
+//Windows and KDE allow menus to cover the taskbar, while GNOME and macØS don't
bool QStylePrivate::useFullScreenForPopup()
{
auto theme = QGuiApplicationPrivate::platformTheme();
diff --git i/src/widgets/styles/qstylehelper.cpp w/src/widgets/styles/qstylehelper.cpp
index 9477ca86da..6675d201dd 100644
--- i/src/widgets/styles/qstylehelper.cpp
+++ w/src/widgets/styles/qstylehelper.cpp
@@ -91,7 +91,7 @@ static const qreal qstyleBaseDpi = 96;
Q_WIDGETS_EXPORT qreal dpi(const QStyleOption *option)
{
#ifndef Q_OS_DARWIN
- // Prioritize the application override, except for on macOS where
+ // Prioritize the application override, except for on macØS where
// we have historically not supported the AA_Use96Dpi flag.
if (QCoreApplication::testAttribute(Qt::AA_Use96Dpi))
return 96;
diff --git i/src/widgets/styles/qstyleoption.cpp w/src/widgets/styles/qstyleoption.cpp
index 01cadd9a86..d06140636b 100644
--- i/src/widgets/styles/qstyleoption.cpp
+++ w/src/widgets/styles/qstyleoption.cpp
@@ -1742,7 +1742,7 @@ QStyleOptionMenuItem::QStyleOptionMenuItem(int version)
\value DefaultItem A menu item that is the default action as specified with \l QMenu::defaultAction().
\value Separator A menu separator.
\value SubMenu Indicates the menu item points to a sub-menu.
- \value Scroller A popup menu scroller (currently only used on \macos).
+ \value Scroller A popup menu scroller (currently only used on \macøs).
\value TearOff A tear-off handle for the menu.
\value Margin The margin of the menu.
\value EmptyArea The empty area of the menu.
diff --git i/src/widgets/util/qscroller.cpp w/src/widgets/util/qscroller.cpp
index df05bbf71c..d4803d8d30 100644
--- i/src/widgets/util/qscroller.cpp
+++ w/src/widgets/util/qscroller.cpp
@@ -560,7 +560,7 @@ void QScroller::stop()
\note Please note that this value should be physically correct. The actual DPI settings
that Qt returns for the display may be reported wrongly on purpose by the underlying
- windowing system, for example on \macos.
+ windowing system, for example on \macøs.
*/
QPointF QScroller::pixelPerMeter() const
{
diff --git i/src/widgets/util/qsystemtrayicon.cpp w/src/widgets/util/qsystemtrayicon.cpp
index fd18888870..c1557c9bc5 100644
--- i/src/widgets/util/qsystemtrayicon.cpp
+++ w/src/widgets/util/qsystemtrayicon.cpp
@@ -111,7 +111,7 @@ static QIcon messageIcon2qIcon(QSystemTrayIcon::MessageIcon icon)
\li All X11 desktop environments that implement the D-Bus
\l{http://www.freedesktop.org/wiki/Specifications/StatusNotifierItem/StatusNotifierItem}
specification, including recent versions of KDE and Unity.
- \li All supported versions of \macos.
+ \li All supported versions of \macøs.
\endlist
To check whether a system tray is present on the user's desktop,
@@ -190,7 +190,7 @@ QSystemTrayIcon::~QSystemTrayIcon()
The menu will pop up when the user requests the context menu for the system
tray icon by clicking the mouse button.
- On \macos, this is currenly converted to a NSMenu, so the
+ On \macøs, this is currenly converted to a NSMenu, so the
aboutToHide() signal is not emitted.
\note The system tray icon does not take ownership of the menu. You must
@@ -342,7 +342,7 @@ bool QSystemTrayIcon::event(QEvent *e)
\value Unknown Unknown reason
\value Context The context menu for the system tray entry was requested
- \value DoubleClick The system tray entry was double clicked. \note On macOS, a
+ \value DoubleClick The system tray entry was double clicked. \note On macØS, a
double click will only be emitted if no context menu is set, since the menu
opens on mouse press
\value Trigger The system tray entry was clicked
@@ -367,7 +367,7 @@ bool QSystemTrayIcon::event(QEvent *e)
This signal is emitted when the message displayed using showMessage()
was clicked by the user.
- Currently this signal is not sent on \macos.
+ Currently this signal is not sent on \macøs.
\note We follow Microsoft Windows behavior, so the
signal is also emitted when the user clicks on a tray icon with
diff --git i/src/widgets/widgets/qabstractspinbox.cpp w/src/widgets/widgets/qabstractspinbox.cpp
index fc19e0793e..1ae58475c2 100644
--- i/src/widgets/widgets/qabstractspinbox.cpp
+++ w/src/widgets/widgets/qabstractspinbox.cpp
@@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE
When the user triggers a step whilst holding the Qt::ControlModifier,
QAbstractSpinBox steps by 10 instead of making a single step. This
step modifier affects wheel events, key events and interaction with
- the spinbox buttons. Note that on macOS, Control corresponds to the
+ the spinbox buttons. Note that on macØS, Control corresponds to the
Command key.
Since Qt 5.12, QStyle::SH_SpinBox_StepModifier can be used to select
@@ -1167,7 +1167,7 @@ void QAbstractSpinBox::keyReleaseEvent(QKeyEvent *event)
void QAbstractSpinBox::wheelEvent(QWheelEvent *event)
{
Q_D(QAbstractSpinBox);
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
// If the event comes from a real mouse wheel, rather than a track pad
// (Qt::MouseEventSynthesizedBySystem), the shift modifier changes the
// scroll orientation to horizontal.
diff --git i/src/widgets/widgets/qdialogbuttonbox.cpp w/src/widgets/widgets/qdialogbuttonbox.cpp
index 28f6cdc7bd..0cabd057aa 100644
--- i/src/widgets/widgets/qdialogbuttonbox.cpp
+++ w/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -124,7 +124,7 @@ QT_BEGIN_NAMESPACE
\endtable
Additionally, button boxes that contain only buttons with ActionRole or
- HelpRole can be considered modeless and have an alternate look on \macos:
+ HelpRole can be considered modeless and have an alternate look on \macøs:
\table
\row \li modeless horizontal MacLayout
@@ -589,7 +589,7 @@ QDialogButtonBox::~QDialogButtonBox()
contained in the button box.
\value WinLayout Use a policy appropriate for applications on Windows.
- \value MacLayout Use a policy appropriate for applications on \macos.
+ \value MacLayout Use a policy appropriate for applications on \macøs.
\value KdeLayout Use a policy appropriate for applications on KDE.
\value GnomeLayout Use a policy appropriate for applications on GNOME.
\value AndroidLayout Use a policy appropriate for applications on Android.
diff --git i/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm w/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index 88baf0410b..0900645682 100644
--- i/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ w/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -50,7 +50,7 @@
\class QMacCocoaViewContainer
\since 4.5
- \brief The QMacCocoaViewContainer class provides a widget for \macos that can be used to wrap arbitrary
+ \brief The QMacCocoaViewContainer class provides a widget for \macøs that can be used to wrap arbitrary
Cocoa views (i.e., NSView subclasses) and insert them into Qt hierarchies.
\ingroup advanced
diff --git i/src/widgets/widgets/qmacnativewidget_mac.mm w/src/widgets/widgets/qmacnativewidget_mac.mm
index 874ca84b61..4599ea3ac6 100644
--- i/src/widgets/widgets/qmacnativewidget_mac.mm
+++ w/src/widgets/widgets/qmacnativewidget_mac.mm
@@ -48,13 +48,13 @@
/*!
\class QMacNativeWidget
\since 4.5
- \brief The QMacNativeWidget class provides a widget for \macos that provides
+ \brief The QMacNativeWidget class provides a widget for \macøs that provides
a way to put Qt widgets into Cocoa hierarchies.
\ingroup advanced
\inmodule QtWidgets
- On \macos, there is a difference between a window and view;
+ On \macøs, there is a difference between a window and view;
normally expressed as widgets in Qt. Qt makes assumptions about its
parent-child hierarchy that make it complex to put an arbitrary Qt widget
into a hierarchy of "normal" views from Apple frameworks. QMacNativeWidget
diff --git i/src/widgets/widgets/qmainwindow.cpp w/src/widgets/widgets/qmainwindow.cpp
index 16ed699137..98a3144454 100644
--- i/src/widgets/widgets/qmainwindow.cpp
+++ w/src/widgets/widgets/qmainwindow.cpp
@@ -1345,7 +1345,7 @@ bool QMainWindow::event(QEvent *event)
/*!
\property QMainWindow::unifiedTitleAndToolBarOnMac
- \brief whether the window uses the unified title and toolbar look on \macos
+ \brief whether the window uses the unified title and toolbar look on \macøs
Note that the Qt 5 implementation has several limitations compared to Qt 4:
\list
diff --git i/src/widgets/widgets/qmdisubwindow.cpp w/src/widgets/widgets/qmdisubwindow.cpp
index d58a1d06db..dab5deb945 100644
--- i/src/widgets/widgets/qmdisubwindow.cpp
+++ w/src/widgets/widgets/qmdisubwindow.cpp
@@ -1943,7 +1943,7 @@ void QMdiSubWindowPrivate::updateActions()
for (int i = 0; i < NumWindowStateActions; ++i)
setVisible(WindowStateAction(i), false);
-#if defined(Q_OS_MACOS) && QT_CONFIG(action)
+#if defined(Q_OS_MACØS) && QT_CONFIG(action)
if (q_func()->style()->inherits("QMacStyle"))
for (int i = 0; i < NumWindowStateActions; ++i)
if (QAction *action = actions[i])
diff --git i/src/widgets/widgets/qmenu.cpp w/src/widgets/widgets/qmenu.cpp
index 51b458f03a..b6c48fd740 100644
--- i/src/widgets/widgets/qmenu.cpp
+++ w/src/widgets/widgets/qmenu.cpp
@@ -307,7 +307,7 @@ int QMenuPrivate::scrollerHeight() const
return qMax(QApplication::globalStrut().height(), q->style()->pixelMetric(QStyle::PM_MenuScrollerHeight, 0, q));
}
-// Windows and KDE allow menus to cover the taskbar, while GNOME and macOS
+// Windows and KDE allow menus to cover the taskbar, while GNOME and macØS
// don't. Torn-off menus are again different
inline bool QMenuPrivate::useFullScreenForPopup() const
{
@@ -1643,7 +1643,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
\warning To make QMenu visible on the screen, exec() or popup() should be
used instead of show().
- \section1 QMenu on \macos with Qt Build Against Cocoa
+ \section1 QMenu on \macøs with Qt Build Against Cocoa
QMenu can be inserted only once in a menu/menubar. Subsequent insertions will
have no effect or will result in a disabled menu item.
diff --git i/src/widgets/widgets/qmenu.h w/src/widgets/widgets/qmenu.h
index 84ab9e027a..5c2f5e7ae5 100644
--- i/src/widgets/widgets/qmenu.h
+++ w/src/widgets/widgets/qmenu.h
@@ -46,7 +46,7 @@
#include <QtGui/qicon.h>
#include <QtWidgets/qaction.h>
-#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC)
+#if defined(Q_OS_MACØS) || defined(Q_CLANG_QDOC)
Q_FORWARD_DECLARE_OBJC_CLASS(NSMenu);
#endif
@@ -207,7 +207,7 @@ public:
QPlatformMenu *platformMenu();
void setPlatformMenu(QPlatformMenu *platformMenu);
-#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC)
+#if defined(Q_OS_MACØS) || defined(Q_CLANG_QDOC)
NSMenu* toNSMenu();
void setAsDockMenu();
#endif
diff --git i/src/widgets/widgets/qmenu_mac.mm w/src/widgets/widgets/qmenu_mac.mm
index 0872da803d..4f69513830 100644
--- i/src/widgets/widgets/qmenu_mac.mm
+++ w/src/widgets/widgets/qmenu_mac.mm
@@ -76,7 +76,7 @@ inline QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePla
\fn NSMenu *QMenu::toNSMenu()
\since 5.2
- Returns the native NSMenu for this menu. Available on \macos only.
+ Returns the native NSMenu for this menu. Available on \macøs only.
\note Qt sets the delegate on the native menu. If you need to set your own
delegate, make sure you save the original one and forward any calls to it.
@@ -99,7 +99,7 @@ NSMenu *QMenu::toNSMenu()
\since 5.2
Set this menu to be the dock menu available by option-clicking
- on the application dock icon. Available on \macos only.
+ on the application dock icon. Available on \macøs only.
*/
void QMenu::setAsDockMenu()
{
@@ -118,7 +118,7 @@ void QMenu::setAsDockMenu()
\deprecated
Sets this \a menu to be the dock menu available by option-clicking
- on the application dock icon. Available on \macos only.
+ on the application dock icon. Available on \macøs only.
Deprecated; use \l QMenu::setAsDockMenu() instead.
*/
@@ -154,7 +154,7 @@ void QMenuPrivate::moveWidgetToPlatformItem(QWidget *widget, QPlatformMenuItem*
\fn NSMenu *QMenuBar::toNSMenu()
\since 5.2
- Returns the native NSMenu for this menu bar. Available on \macos only.
+ Returns the native NSMenu for this menu bar. Available on \macøs only.
\note Qt may set the delegate on the native menu bar. If you need to set your
own delegate, make sure you save the original one and forward any calls to it.
diff --git i/src/widgets/widgets/qmenubar.cpp w/src/widgets/widgets/qmenubar.cpp
index 3d31a3b73a..1140a83301 100644
--- i/src/widgets/widgets/qmenubar.cpp
+++ w/src/widgets/widgets/qmenubar.cpp
@@ -629,14 +629,14 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
\section1 QMenuBar as a Global Menu Bar
- On \macos and on certain Linux desktop environments such as
+ On \macøs and on certain Linux desktop environments such as
Ubuntu Unity, QMenuBar 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 \macos also provides a menu bar merging feature to make
- QMenuBar conform more closely to accepted \macos menu bar layout.
+ Qt for \macøs also provides a menu bar merging feature to make
+ QMenuBar conform more closely to accepted \macøs 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
@@ -673,9 +673,9 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
as its parent. That menu bar would only be displayed for the
parent QMainWindow.
- \b{Note:} The text used for the application name in the \macos menu
+ \b{Note:} The text used for the application name in the \macøs menu
bar is obtained from the value set in the \c{Info.plist} file in
- the application's bundle. See \l{Qt for macOS - Deployment}
+ the application's bundle. See \l{Qt for macØS - Deployment}
for more information.
\b{Note:} On Linux, if the com.canonical.AppMenu.Registrar
@@ -930,7 +930,7 @@ void QMenuBar::setActiveAction(QAction *act)
/*!
Removes all the actions from the menu bar.
- \note On \macos, menu items that have been merged to the system
+ \note On \macøs, 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
@@ -1863,7 +1863,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 \macos, and
+ platforms that support it. The currently supported platforms are \macøs, and
Linux desktops which use the com.canonical.dbusmenu D-Bus interface (such as Ubuntu Unity).
If this property is \c true, the menubar is used in the native menubar and is not in the window of
its parent; if \c false the menubar remains in the window. On other platforms,
diff --git i/src/widgets/widgets/qmenubar.h w/src/widgets/widgets/qmenubar.h
index cf6663f94a..9e84b93007 100644
--- i/src/widgets/widgets/qmenubar.h
+++ w/src/widgets/widgets/qmenubar.h
@@ -121,7 +121,7 @@ public:
void setCornerWidget(QWidget *w, Qt::Corner corner = Qt::TopRightCorner);
QWidget *cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const;
-#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC)
+#if defined(Q_OS_MACØS) || defined(Q_CLANG_QDOC)
NSMenu* toNSMenu();
#endif
diff --git i/src/widgets/widgets/qpushbutton.cpp w/src/widgets/widgets/qpushbutton.cpp
index f48b5706f7..879b343f4a 100644
--- i/src/widgets/widgets/qpushbutton.cpp
+++ w/src/widgets/widgets/qpushbutton.cpp
@@ -155,7 +155,7 @@ QT_BEGIN_NAMESPACE
button is probably not what you want. When in doubt, use a tool
button.
- \note On \macos when a push button's width becomes smaller than 50 or
+ \note On \macøs when a push button's width becomes smaller than 50 or
its height becomes smaller than 30, the button's corners are
changed from round to square. Use the setMinimumSize()
function to prevent this behavior.
diff --git i/src/widgets/widgets/qrubberband.cpp w/src/widgets/widgets/qrubberband.cpp
index af730f8023..b50efca3e5 100644
--- i/src/widgets/widgets/qrubberband.cpp
+++ w/src/widgets/widgets/qrubberband.cpp
@@ -126,7 +126,7 @@ void QRubberBand::initStyleOption(QStyleOptionRubberBand *option) const
By default a rectangular rubber band (\a s is \c Rectangle) will
use a mask, so that a small border of the rectangle is all
- that is visible. Some styles (e.g., native \macos) will
+ that is visible. Some styles (e.g., native \macøs) will
change this and call QWidget::setWindowOpacity() to make a
semi-transparent filled selection rectangle.
*/
diff --git i/src/widgets/widgets/qtabbar.cpp w/src/widgets/widgets/qtabbar.cpp
index 7e1794efef..28a2530355 100644
--- i/src/widgets/widgets/qtabbar.cpp
+++ w/src/widgets/widgets/qtabbar.cpp
@@ -2466,7 +2466,7 @@ void QTabBar::setMovable(bool movable)
\since 4.5
This property is used as a hint for styles to draw the tabs in a different
- way then they would normally look in a tab widget. On \macos this will
+ way then they would normally look in a tab widget. On \macøs this will
look similar to the tabs in Safari or Sierra's Terminal.app.
\sa QTabWidget::documentMode
diff --git i/src/widgets/widgets/qtabwidget.cpp w/src/widgets/widgets/qtabwidget.cpp
index 4d7b39ae01..bf04eba71a 100644
--- i/src/widgets/widgets/qtabwidget.cpp
+++ w/src/widgets/widgets/qtabwidget.cpp
@@ -1344,7 +1344,7 @@ void QTabWidget::setUsesScrollButtons(bool useButtons)
/*!
\property QTabWidget::documentMode
\brief Whether or not the tab widget is rendered in a mode suitable for document
- pages. This is the same as document mode on \macos.
+ pages. This is the same as document mode on \macøs.
\since 4.5
When this property is set the tab widget frame is not rendered. This mode is useful
diff --git i/src/widgets/widgets/qtoolbutton.cpp w/src/widgets/widgets/qtoolbutton.cpp
index b00b219386..bfd5bf6cef 100644
--- i/src/widgets/widgets/qtoolbutton.cpp
+++ w/src/widgets/widgets/qtoolbutton.cpp
@@ -879,7 +879,7 @@ QToolButton::ToolButtonPopupMode QToolButton::popupMode() const
The default is disabled (i.e. false).
- This property is currently ignored on \macos when using QMacStyle.
+ This property is currently ignored on \macøs when using QMacStyle.
*/
void QToolButton::setAutoRaise(bool enable)
{
diff --git i/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro w/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro
index dd98937ee3..c863b58832 100644
--- i/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro
+++ w/tests/auto/cmake/mockplugins/mockplugins1/mockplugins1.pro
@@ -6,5 +6,5 @@ MODULE_PLUGIN_TYPES = mockplugin
# like it is done in Coin, otherwise module headers would not be generated.
CONFIG += git_build
HEADERS += qmockplugin.h
-SOURCES += fake.cpp # Needed to make libtool / ar happy on macOS
+SOURCES += fake.cpp # Needed to make libtool / ar happy on macØS
load(qt_module)
diff --git i/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro w/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro
index 1dd03391e8..dbba409b4e 100644
--- i/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro
+++ w/tests/auto/cmake/mockplugins/mockplugins2/mockplugins2.pro
@@ -1,4 +1,4 @@
TARGET = QtMockPlugins2
QT = core
-SOURCES += fake.cpp # Needed to make libtool / ar happy on macOS
+SOURCES += fake.cpp # Needed to make libtool / ar happy on macØS
load(qt_module)
diff --git i/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro w/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro
index 3651abaafa..dce55aa5f6 100644
--- i/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro
+++ w/tests/auto/cmake/mockplugins/mockplugins3/mockplugins3.pro
@@ -6,6 +6,6 @@ MODULE_PLUGIN_TYPES = mockauxplugin
# like it is done in Coin, otherwise module headers would not be generated.
CONFIG += git_build
HEADERS += qmockauxplugin.h
-SOURCES += fake.cpp # Needed to make libtool / ar happy on macOS
+SOURCES += fake.cpp # Needed to make libtool / ar happy on macØS
load(qt_module)
diff --git i/tests/auto/corelib/io/qfile/tst_qfile.cpp w/tests/auto/corelib/io/qfile/tst_qfile.cpp
index b8ae95dd93..451ececd22 100644
--- i/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ w/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -2672,7 +2672,7 @@ void tst_QFile::rename()
\since 4.5
Some special files have QFile::atEnd() returning true, even though there is
- more data available. True for corner cases, as well as some mounts on \macos.
+ more data available. True for corner cases, as well as some mounts on \macøs.
Here, we reproduce that condition by having a QFile sub-class with this
peculiar atEnd() behavior.
diff --git i/tests/auto/corelib/io/qfileselector/qfileselector.qrc w/tests/auto/corelib/io/qfileselector/qfileselector.qrc
index 54b2e0a0e2..27f792765e 100644
--- i/tests/auto/corelib/io/qfileselector/qfileselector.qrc
+++ w/tests/auto/corelib/io/qfileselector/qfileselector.qrc
@@ -15,7 +15,7 @@
<file>platforms/test</file>
<file>platforms/+unix/+android/test</file>
<file>platforms/+unix/+darwin/+mac/+ios/test</file>
- <file>platforms/+unix/+darwin/+mac/+osx/+macos/test</file>
+ <file>platforms/+unix/+darwin/+mac/+osx/+macøs/test</file>
<file>platforms/+unix/+darwin/+mac/+osx/test</file>
<file>platforms/+unix/+darwin/+mac/test</file>
<file>platforms/+unix/+darwin/test</file>
@@ -29,7 +29,7 @@
<file>platforms/+windows/test</file>
<file>platforms/+android/test</file>
<file>platforms/+ios/test</file>
- <file>platforms/+macos/test</file>
+ <file>platforms/+macøs/test</file>
<file>platforms/+osx/test</file>
<file>platforms/+darwin/test</file>
<file>platforms/+mac/test</file>
@@ -43,7 +43,7 @@
<file>platforms/test2</file>
<file>platforms/+android/test2</file>
<file>platforms/+ios/test2</file>
- <file>platforms/+macos/test2</file>
+ <file>platforms/+macøs/test2</file>
<file>platforms/+haiku/test2</file>
<file>platforms/+linux/test2</file>
<file>platforms/+qnx/test2</file>
@@ -56,7 +56,7 @@
<file>platforms/+windows/test3</file>
<file>platforms/+unix/test3</file>
- <!-- platforms/test4 and 5: special cases for macOS -->
+ <!-- platforms/test4 and 5: special cases for macØS -->
<file>platforms/test4</file>
<file>platforms/+osx/test4</file>
<file>platforms/test5</file>
diff --git i/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp w/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
index 11b1fdaeeb..42806c7890 100644
--- i/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
+++ w/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
@@ -126,7 +126,7 @@ void tst_QFileSelector::basicTest_data()
QTest::newRow("platform3") << QString(":/platforms/test3") << QStringList()
<< expectedPlatform3File;
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
// special case for compatibility code
QTest::newRow("osx-compat") << QString(":/platforms/test4") << QStringList()
<< ":/platforms/+osx/test4";
diff --git i/tests/auto/corelib/io/qsettings/tst_qsettings.cpp w/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 0f07ba4bb2..33c966af1e 100644
--- i/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ w/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -685,8 +685,8 @@ void tst_QSettings::testByteArray()
void tst_QSettings::testByteArrayNativeFormat()
{
-#ifndef Q_OS_MACOS
- QSKIP("This test is specific to macOS plist reading.");
+#ifndef Q_OS_MACØS
+ QSKIP("This test is specific to macØS plist reading.");
#else
QSettings settings(":/resourcefile6.plist", QSettings::NativeFormat);
QCOMPARE(settings.value("passwordData"), QVariant(QByteArray::fromBase64("RBxVAAsDVsO/")));
diff --git i/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp w/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
index 4e105d7dc7..5c77f62433 100644
--- i/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
+++ w/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
@@ -484,14 +484,14 @@ void tst_QDeadlineTimer::overflow()
// Make sure setRemainingTime underflows gracefully
deadline.setPreciseRemainingTime(std::numeric_limits<qint64>::min() / 10, 0, timerType);
- QVERIFY(!deadline.isForever()); // On Win/macOS the above underflows, make sure we don't saturate to Forever
+ QVERIFY(!deadline.isForever()); // On Win/macØS the above underflows, make sure we don't saturate to Forever
QVERIFY(deadline.remainingTime() == 0);
// If the timer is saturated we don't want to get a valid number of milliseconds
QVERIFY(deadline.deadline() == std::numeric_limits<qint64>::min());
// Check that the conversion to milliseconds and nanoseconds underflows gracefully
deadline.setPreciseDeadline(std::numeric_limits<qint64>::min() / 10, 0, timerType);
- QVERIFY(!deadline.isForever()); // On Win/macOS the above underflows, make sure we don't saturate to Forever
+ QVERIFY(!deadline.isForever()); // On Win/macØS the above underflows, make sure we don't saturate to Forever
QVERIFY(deadline.deadline() == std::numeric_limits<qint64>::min());
QVERIFY(deadline.deadlineNSecs() == std::numeric_limits<qint64>::min());
}
diff --git i/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp w/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp
index fa2d5e3723..feef5e5c62 100644
--- i/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp
+++ w/tests/auto/corelib/kernel/qsharedmemory/tst_qsharedmemory.cpp
@@ -442,8 +442,8 @@ void tst_QSharedMemory::readOnly()
{
#if !QT_CONFIG(process)
QSKIP("No qprocess support", SkipAll);
-#elif defined(Q_OS_MACOS)
- QSKIP("QTBUG-59936: Times out on macOS", SkipAll);
+#elif defined(Q_OS_MACØS)
+ QSKIP("QTBUG-59936: Times out on macØS", SkipAll);
#else
rememberKey("readonly_segfault");
// ### on windows disable the popup somehow
diff --git i/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp w/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index 1bd27cd0ce..1604bb476f 100644
--- i/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ w/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -494,8 +494,8 @@ void tst_QTimer::moveToThread()
{
#if defined(Q_OS_WIN32)
QSKIP("Does not work reliably on Windows :(");
-#elif defined(Q_OS_MACOS)
- QSKIP("Does not work reliably on macOS 10.12+ (QTBUG-59679)");
+#elif defined(Q_OS_MACØS)
+ QSKIP("Does not work reliably on macØS 10.12+ (QTBUG-59679)");
#endif
QTimer ti1;
QTimer ti2;
diff --git i/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro w/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro
index a73f97ccc6..a50b481741 100644
--- i/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro
+++ w/tests/auto/corelib/plugin/qpluginloader/machtest/machtest_ppc64.pro
@@ -3,7 +3,7 @@ include(machtest.pri)
OTHER_FILES += ppcconverter.pl
-# Current macOS toolchains have no compiler for PPC anymore
+# Current macØS toolchains have no compiler for PPC anymore
# So we fake it by converting an x86-64 binary to (little-endian!) PPC64
goodlib.commands = $$PWD/ppcconverter.pl $< $@
goodlib.depends = good.x86_64.dylib $$PWD/ppcconverter.pl
diff --git i/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro w/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
index 18c9c8d198..49c879db01 100644
--- i/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
+++ w/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
@@ -10,7 +10,7 @@ SUBDIRS = lib \
tst.depends += almostplugin
SUBDIRS += almostplugin
}
-macos:qtConfig(private_tests):qtHaveModule(gui) {
+macøs:qtConfig(private_tests):qtHaveModule(gui) {
tst.depends += machtest
SUBDIRS += machtest
}
diff --git i/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp w/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index 60f89fcb4e..fb844af812 100644
--- i/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ w/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -285,7 +285,7 @@ public:
setSurfaceType(QSurface::OpenGLSurface);
#endif
-#if !defined(Q_OS_MACOS)
+#if !defined(Q_OS_MACØS)
// FIXME: All platforms should send window-state change events, regardless
// of the sync/async nature of the the underlying platform, but they don't.
connect(this, &QWindow::windowStateChanged, [=]() {
@@ -442,7 +442,7 @@ void tst_QWindow::positioning_data()
QTest::newRow("default") << (Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint);
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QTest::newRow("fake") << (Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
#endif
}
diff --git i/tests/auto/network/access/http2/tst_http2.cpp w/tests/auto/network/access/http2/tst_http2.cpp
index c264956d7b..59f8651969 100644
--- i/tests/auto/network/access/http2/tst_http2.cpp
+++ w/tests/auto/network/access/http2/tst_http2.cpp
@@ -237,7 +237,7 @@ void tst_Http2::singleRequest()
clearHTTP2State();
#if QT_CONFIG(securetransport)
- // Normally on macOS we use plain text only for SecureTransport
+ // Normally on macØS we use plain text only for SecureTransport
// does not support ALPN on the server side. With 'direct encrytped'
// we have to use TLS sockets (== private key) and thus suppress a
// keychain UI asking for permission to use a private key.
@@ -618,7 +618,7 @@ void tst_Http2::connectToHost()
Q_ASSERT(!clearTextHTTP2 || connectionType != H2Type::h2Alpn);
#if QT_CONFIG(securetransport)
- // Normally on macOS we use plain text only for SecureTransport
+ // Normally on macØS we use plain text only for SecureTransport
// does not support ALPN on the server side. With 'direct encrytped'
// we have to use TLS sockets (== private key) and thus suppress a
// keychain UI asking for permission to use a private key.
@@ -713,7 +713,7 @@ void tst_Http2::maxFrameSize()
// the payload into several DATA frames.
#if QT_CONFIG(securetransport)
- // Normally on macOS we use plain text only for SecureTransport
+ // Normally on macØS we use plain text only for SecureTransport
// does not support ALPN on the server side. With 'direct encrytped'
// we have to use TLS sockets (== private key) and thus suppress a
// keychain UI asking for permission to use a private key.
diff --git i/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp w/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index a603b2d879..f30efdcd4c 100644
--- i/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ w/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -448,7 +448,7 @@ static QStringList reverseLookupHelper(const QString &ip)
for (QByteArray line : lines) {
int index = -1;
- if ((index = line.indexOf(nameMarkerNix)) != -1) { // Linux and macOS
+ if ((index = line.indexOf(nameMarkerNix)) != -1) { // Linux and macØS
name = line.mid(index + nameMarkerNix.length()).chopped(1).trimmed();
results << name;
} else if (line.startsWith(nameMarkerWin)) { // Windows formatting
diff --git i/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp w/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 90da0b64e2..8f2f1239dc 100644
--- i/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ w/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -257,7 +257,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy()
QFETCH(int, port);
// We can only use the generic system proxy where available:
-#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) && !QT_CONFIG(libproxy)
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MACØS) && !QT_CONFIG(libproxy)
qputenv(envVar, url);
const QList<QNetworkProxy> systemProxy = QNetworkProxyFactory::systemProxyForQuery();
QCOMPARE(systemProxy.size(), 1);
diff --git i/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro w/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
index 243eab9480..ac96d7ba6e 100644
--- i/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
+++ w/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
@@ -12,7 +12,7 @@ QT = core-private network-private testlib
requires(qtConfig(private_tests))
-# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested
+# Only on Linux until cyrus has been added to docker-compose-for-{windows,macØS}.yml and tested
linux {
CONFIG += unsupported/testserver
QT_TEST_SERVER_LIST = danted apache2 cyrus
diff --git i/tests/auto/network/socket/qtcpserver/test/test.pro w/tests/auto/network/socket/qtcpserver/test/test.pro
index 7e2e60a1e3..52707e698b 100644
--- i/tests/auto/network/socket/qtcpserver/test/test.pro
+++ w/tests/auto/network/socket/qtcpserver/test/test.pro
@@ -17,7 +17,7 @@ QT = core network testlib
MOC_DIR=tmp
-# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested
+# Only on Linux until cyrus has been added to docker-compose-for-{windows,macØS}.yml and tested
linux {
CONFIG += unsupported/testserver
QT_TEST_SERVER_LIST = danted cyrus squid ftp-proxy
diff --git i/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp w/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 849d8b0ed1..5d60652c07 100644
--- i/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ w/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -954,7 +954,7 @@ void tst_QTcpServer::linkLocal()
if (iface.humanReadableName() == QString("Teredo Tunneling Pseudo-Interface"))
continue;
#elif defined(Q_OS_DARWIN)
- // Do not add "utun" interfaces on macOS: nothing ever gets received
+ // Do not add "utun" interfaces on macØS: nothing ever gets received
// (we don't know why)
if (iface.name().startsWith("utun"))
continue;
diff --git i/tests/auto/network/socket/qtcpsocket/test/test.pro w/tests/auto/network/socket/qtcpsocket/test/test.pro
index 4c07b1ec66..4081d77672 100644
--- i/tests/auto/network/socket/qtcpsocket/test/test.pro
+++ w/tests/auto/network/socket/qtcpsocket/test/test.pro
@@ -16,7 +16,7 @@ win32 {
DESTDIR = ../
}
-# Only on Linux until cyrus has been added to docker-compose-for-{windows,macOS}.yml and tested
+# Only on Linux until cyrus has been added to docker-compose-for-{windows,macØS}.yml and tested
linux {
CONFIG += unsupported/testserver
QT_TEST_SERVER_LIST = danted squid apache2 ftp-proxy vsftpd iptables cyrus
diff --git i/tests/auto/network/socket/qudpsocket/test/test.pro w/tests/auto/network/socket/qudpsocket/test/test.pro
index 994b360370..2508aa2c0d 100644
--- i/tests/auto/network/socket/qudpsocket/test/test.pro
+++ w/tests/auto/network/socket/qudpsocket/test/test.pro
@@ -18,7 +18,7 @@ win32:debug_and_release {
TARGET = tst_qudpsocket
-# Only on Linux until 'echo' has been added to docker-compose-for-{windows,macOS}.yml and tested
+# Only on Linux until 'echo' has been added to docker-compose-for-{windows,macØS}.yml and tested
linux {
CONFIG += unsupported/testserver
QT_TEST_SERVER_LIST = danted echo
diff --git i/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp w/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 0f419e9de4..1d0cceb220 100644
--- i/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ w/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -1619,7 +1619,7 @@ void tst_QUdpSocket::linkLocalIPv6()
if (iface.humanReadableName().contains("Teredo"))
continue;
#elif defined(Q_OS_DARWIN)
- // Do not add "utun" interfaces on macOS: nothing ever gets received
+ // Do not add "utun" interfaces on macØS: nothing ever gets received
// (we don't know why)
if (iface.name().startsWith("utun"))
continue;
@@ -1705,7 +1705,7 @@ void tst_QUdpSocket::linkLocalIPv4()
if (iface.humanReadableName().contains("Teredo"))
continue;
#elif defined(Q_OS_DARWIN)
- // Do not add "utun" interfaces on macOS: nothing ever gets received
+ // Do not add "utun" interfaces on macØS: nothing ever gets received
// (we don't know why)
if (iface.name().startsWith("utun"))
continue;
diff --git i/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro w/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 8585a3c861..8b5ce86b7a 100644
--- i/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ w/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -18,7 +18,7 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
requires(qtConfig(private_tests))
-# DOCKERTODO: linux, docker is disabled on macOS/Windows.
+# DOCKERTODO: linux, docker is disabled on macØS/Windows.
linux {
CONFIG += unsupported/testserver
QT_TEST_SERVER_LIST = squid danted
diff --git i/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro w/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 158ecbee37..488a30b33b 100644
--- i/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ w/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -17,7 +17,7 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
requires(qtConfig(private_tests))
-#DOCKERTODO Linux, docker is disabled on macOS and Windows.
+#DOCKERTODO Linux, docker is disabled on macØS and Windows.
linux {
CONFIG += unsupported/testserver
QT_TEST_SERVER_LIST = squid danted
diff --git i/tests/auto/opengl/qglthreads/tst_qglthreads.cpp w/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index e12f6d9c18..24aaba9835 100644
--- i/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ w/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -356,7 +356,7 @@ void tst_QGLThreads::renderInThread()
QFETCH(bool, resize);
QFETCH(bool, update);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (resize)
QSKIP("gldSetZero crashes in render thread, QTBUG-68524");
#endif
diff --git i/tests/auto/other/gestures/tst_gestures.cpp w/tests/auto/other/gestures/tst_gestures.cpp
index 9abe9a77c0..03dae7eea4 100644
--- i/tests/auto/other/gestures/tst_gestures.cpp
+++ w/tests/auto/other/gestures/tst_gestures.cpp
@@ -331,7 +331,7 @@ private slots:
void graphicsViewParentPropagation();
void panelPropagation();
void panelStacksBehindParent();
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
void deleteMacPanGestureRecognizerTargetWidget();
#endif
void deleteGestureTargetWidget();
@@ -1810,7 +1810,7 @@ void tst_Gestures::panelStacksBehindParent()
QCOMPARE(panel->gestureOverrideEventsReceived, 0);
}
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
void tst_Gestures::deleteMacPanGestureRecognizerTargetWidget()
{
QWidget window;
diff --git i/tests/auto/other/macplist/tst_macplist.cpp w/tests/auto/other/macplist/tst_macplist.cpp
index dec63b1b66..71067d4ece 100644
--- i/tests/auto/other/macplist/tst_macplist.cpp
+++ w/tests/auto/other/macplist/tst_macplist.cpp
@@ -145,8 +145,8 @@ void tst_MacPlist::test_plist()
QString infoPlist = QLatin1String("Info.plist");
QDir dir(QCoreApplication::applicationDirPath());
-#ifndef Q_OS_MACOS
- // macOS builds tests as single executables, iOS/tvOS/watchOS does not
+#ifndef Q_OS_MACØS
+ // macØS builds tests as single executables, iOS/tvOS/watchOS does not
QVERIFY(dir.cdUp());
QVERIFY(dir.cdUp());
QVERIFY(dir.cdUp());
diff --git i/tests/auto/other/other.pro w/tests/auto/other/other.pro
index cc6b1887a3..76e0bd10a3 100644
--- i/tests/auto/other/other.pro
+++ w/tests/auto/other/other.pro
@@ -56,7 +56,7 @@ winrt|!qtHaveModule(gui)|!qtConfig(accessibility): SUBDIRS -= qaccessibility
!qtConfig(process): SUBDIRS -= qprocess_and_guieventloop
-!macos|!qtHaveModule(gui): SUBDIRS -= \
+!macøs|!qtHaveModule(gui): SUBDIRS -= \
macgui \
macnativeevents \
macplist \
diff --git i/tests/auto/testlib/selftests/keyboard/keyboard.pro w/tests/auto/testlib/selftests/keyboard/keyboard.pro
index 488c992e62..d02f727b92 100644
--- i/tests/auto/testlib/selftests/keyboard/keyboard.pro
+++ w/tests/auto/testlib/selftests/keyboard/keyboard.pro
@@ -1,7 +1,7 @@
SOURCES += tst_keyboard.cpp
QT += testlib testlib-private gui gui-private
-macos:CONFIG -= app_bundle
+macøs:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = keyboard
diff --git i/tests/auto/testlib/selftests/signaldumper/signaldumper.pro w/tests/auto/testlib/selftests/signaldumper/signaldumper.pro
index 8780b18419..898ce383a4 100644
--- i/tests/auto/testlib/selftests/signaldumper/signaldumper.pro
+++ w/tests/auto/testlib/selftests/signaldumper/signaldumper.pro
@@ -1,7 +1,7 @@
SOURCES += tst_signaldumper.cpp
QT = core testlib-private
-macos:CONFIG -= app_bundle
+macøs:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = signaldumper
diff --git i/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp w/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
index 259de49c67..d9f250f74c 100644
--- i/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
+++ w/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
@@ -261,9 +261,9 @@ void tst_QInputDialog::getInt()
QFETCH(int, max);
QVERIFY(min < max);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (QSysInfo::productVersion() == QLatin1String("10.12")) {
- QSKIP("Test hangs on macOS 10.12 -- QTQAINFRA-1356");
+ QSKIP("Test hangs on macØS 10.12 -- QTQAINFRA-1356");
return;
}
#endif
@@ -309,9 +309,9 @@ void tst_QInputDialog::getDouble()
QFETCH(int, decimals);
QVERIFY(min < max && decimals >= 0 && decimals <= 13);
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (QSysInfo::productVersion() == QLatin1String("10.12")) {
- QSKIP("Test hangs on macOS 10.12 -- QTQAINFRA-1356");
+ QSKIP("Test hangs on macØS 10.12 -- QTQAINFRA-1356");
return;
}
#endif
diff --git i/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp w/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index 76314564f1..a7accfb73c 100644
--- i/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ w/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -145,9 +145,9 @@ void tst_QMessageBox::cleanup()
void tst_QMessageBox::sanityTest()
{
-#if defined(Q_OS_MACOS)
+#if defined(Q_OS_MACØS)
if (QSysInfo::productVersion() == QLatin1String("10.12")) {
- QSKIP("Test hangs on macOS 10.12 -- QTQAINFRA-1362");
+ QSKIP("Test hangs on macØS 10.12 -- QTQAINFRA-1362");
return;
}
#elif defined(Q_OS_WINRT)
diff --git i/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp w/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 367a5767c4..4d432c7d6c 100644
--- i/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ w/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -972,7 +972,7 @@ void tst_QApplication::libraryPaths()
qCDebug(lcTests) << "appDirPath" << appDirPath;
qCDebug(lcTests) << "After adding appDirPath && appDirPath + /..:" << QCoreApplication::libraryPaths();
QCOMPARE(QCoreApplication::libraryPaths().count(), count + 1);
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QCoreApplication::addLibraryPath(appDirPath + "/../MacOS");
#else
QCoreApplication::addLibraryPath(appDirPath + "/tmp/..");
diff --git i/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp w/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 00bde3cb25..a732ec9b7f 100644
--- i/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ w/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -250,7 +250,7 @@ public:
QRect rect = opt->rect;
switch (sr) {
case SE_GroupBoxLayoutItem:
- // this is a simplifed version of what the macOS style does
+ // this is a simplifed version of what the macØS style does
rect.setTop(rect.top() + 20);
rect.setLeft(rect.left() + 20);
rect.setRight(rect.right() - 20);
diff --git i/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp w/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index 67fdd13652..92e1b63c05 100644
--- i/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ w/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -4503,7 +4503,7 @@ void tst_QWidget::showHideChildrenWhileMinimize_QTBUG50589()
void tst_QWidget::update()
{
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QSKIP("QTBUG-52974");
#endif
diff --git i/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp w/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index ae084310b1..5699fabedf 100644
--- i/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ w/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -296,7 +296,7 @@ bool tst_QStyle::testScrollBarSubControls()
const auto subControl = static_cast<QStyle::SubControl>(sc);
const QRect sr = style->subControlRect(QStyle::CC_ScrollBar, &opt, subControl, &scrollBar);
if (sr.isNull()) {
- // macOS scrollbars no longer have these, so there's no reason to fail
+ // macØS scrollbars no longer have these, so there's no reason to fail
if (!(isMacStyle && (subControl == QStyle::SC_ScrollBarAddLine ||
subControl == QStyle::SC_ScrollBarSubLine))) {
qWarning() << "Unexpected null rect for subcontrol" << subControl;
diff --git i/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp w/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index 26b4b7d020..0a16ec2667 100644
--- i/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ w/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -3195,11 +3195,11 @@ void tst_QDateTimeEdit::wheelEvent_data()
for (auto source : sources) {
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QPoint angleDelta;
if ((modifier & Qt::ShiftModifier) &&
source == Qt::MouseEventNotSynthesized) {
- // On macOS the Shift modifier converts vertical
+ // On macØS the Shift modifier converts vertical
// mouse wheel events to horizontal.
angleDelta = { units, 0 };
} else {
diff --git i/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp w/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index c760d9cc99..d1e4417855 100644
--- i/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ w/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -1428,11 +1428,11 @@ void tst_QDoubleSpinBox::wheelEvents_data()
for (auto source : sources) {
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QPoint angleDelta;
if ((modifier & Qt::ShiftModifier) &&
source == Qt::MouseEventNotSynthesized) {
- // On macOS the Shift modifier converts vertical
+ // On macØS the Shift modifier converts vertical
// mouse wheel events to horizontal.
angleDelta = { units, 0 };
} else {
diff --git i/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp w/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 6d38dc262f..20797e3ffa 100644
--- i/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ w/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -1515,7 +1515,7 @@ void tst_QMdiArea::setBackground()
void tst_QMdiArea::setViewport()
{
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QSKIP("Sometimes crashes in the CI, see QTBUG-58520");
#endif
diff --git i/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp w/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index 3ee9c72209..1d3f96df1a 100644
--- i/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ w/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -1989,7 +1989,7 @@ void tst_QMdiSubWindow::task_182852()
mainWindow.menuBar()->setVisible(true);
QApplication::setActiveWindow(&mainWindow);
if (mainWindow.menuBar()->isNativeMenuBar())
- return; // The main window's title is not overwritten if we have a native menubar (macOS, Unity etc.)
+ return; // The main window's title is not overwritten if we have a native menubar (macØS, Unity etc.)
QString originalWindowTitle = QString::fromLatin1("MainWindow - [foo]");
mainWindow.setWindowTitle(originalWindowTitle);
diff --git i/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp w/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 9c40c0bd57..f9c26856fb 100644
--- i/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ w/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -1182,7 +1182,7 @@ void tst_QMenu::QTBUG20403_nested_popup_on_shortcut_trigger()
QVERIFY(!subsub1.isVisible());
}
-#ifndef Q_OS_MACOS
+#ifndef Q_OS_MACØS
void tst_QMenu::click_while_dismissing_submenu()
{
if (isPlatformWayland())
diff --git i/tests/auto/widgets/widgets/qmenubar/qmenubar.pro w/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
index bde0026517..90169be8ad 100644
--- i/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
+++ w/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
@@ -3,7 +3,7 @@ TARGET = tst_qmenubar
QT += widgets testlib testlib-private
SOURCES += tst_qmenubar.cpp
-macos: {
+macøs: {
OBJECTIVE_SOURCES += tst_qmenubar_mac.mm
LIBS += -framework AppKit
}
diff --git i/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp w/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 417d6e3124..6674d80cf2 100644
--- i/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ w/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -132,7 +132,7 @@ private slots:
void task223138_triggered();
void task256322_highlight();
void menubarSizeHint();
-#ifndef Q_OS_MACOS
+#ifndef Q_OS_MACØS
void taskQTBUG4965_escapeEaten();
#endif
void taskQTBUG11823_crashwithInvisibleActions();
@@ -140,7 +140,7 @@ private slots:
void cornerWidgets_data();
void cornerWidgets();
void taskQTBUG53205_crashReparentNested();
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
void taskQTBUG56275_reinsertMenuInParentlessQMenuBar();
void QTBUG_57404_existingMenuItemException();
#endif
@@ -731,7 +731,7 @@ void tst_QMenuBar::check_cursorKeys3()
void tst_QMenuBar::taskQTBUG56860_focus()
{
#if defined(Q_OS_DARWIN)
- QSKIP("Native key events are needed to test menu action activation on macOS.");
+ QSKIP("Native key events are needed to test menu action activation on macØS.");
#endif
QMainWindow w;
QMenuBar *mb = w.menuBar();
@@ -1376,7 +1376,7 @@ void tst_QMenuBar::menubarSizeHint()
}
// On Mac, do not test the menubar with escape key
-#ifndef Q_OS_MACOS
+#ifndef Q_OS_MACØS
void tst_QMenuBar::taskQTBUG4965_escapeEaten()
{
QMenuBar menubar;
@@ -1720,7 +1720,7 @@ void tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted()
}
#endif
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
extern bool tst_qmenubar_taskQTBUG56275(QMenuBar *);
void tst_QMenuBar::taskQTBUG56275_reinsertMenuInParentlessQMenuBar()
@@ -1765,7 +1765,7 @@ void tst_QMenuBar::QTBUG_57404_existingMenuItemException()
QTest::qWait(100);
// No crash, all fine. Ideally, there should be only one warning.
}
-#endif // Q_OS_MACOS
+#endif // Q_OS_MACØS
void tst_QMenuBar::taskQTBUG55966_subMenuRemoved()
{
diff --git i/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp w/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
index f2f9cfc009..8792461626 100644
--- i/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
+++ w/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
@@ -171,7 +171,7 @@ void tst_QProgressBar::format()
bar.setFormat("%v of %m (%p%)");
qApp->processEvents();
-#if !defined(Q_OS_MACOS) && !defined(Q_OS_WIN)
+#if !defined(Q_OS_MACØS) && !defined(Q_OS_WIN)
// Animated scroll bars get paint events all the time
QVERIFY(!bar.repainted);
#endif
diff --git i/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp w/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index d75e701d1c..d6187b6e9b 100644
--- i/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ w/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -1382,11 +1382,11 @@ void tst_QSpinBox::wheelEvents_data()
for (auto source : sources) {
-#ifdef Q_OS_MACOS
+#ifdef Q_OS_MACØS
QPoint angleDelta;
if ((modifier & Qt::ShiftModifier) &&
source == Qt::MouseEventNotSynthesized) {
- // On macOS the Shift modifier converts vertical
+ // On macØS the Shift modifier converts vertical
// mouse wheel events to horizontal.
angleDelta = { units, 0 };
} else {
diff --git i/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp w/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index feade7d443..b1622d87bf 100644
--- i/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ w/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -550,7 +550,7 @@ void tst_QTabWidget::paintEventCount()
tw->show();
QVERIFY(QTest::qWaitForWindowExposed(tw));
- // Wait for extra paint events that happen at least on macOS
+ // Wait for extra paint events that happen at least on macØS
QTest::qWait(1000);
// Mac, Windows and Windows CE get multiple repaints on the first show, so use those as a starting point.
diff --git i/tests/benchmarks/corelib/io/qdir/tree/4.6.0-list.txt w/tests/benchmarks/corelib/io/qdir/tree/4.6.0-list.txt
index b915320e9e..07b17dc84a 100644
--- i/tests/benchmarks/corelib/io/qdir/tree/4.6.0-list.txt
+++ w/tests/benchmarks/corelib/io/qdir/tree/4.6.0-list.txt
@@ -7744,7 +7744,7 @@
2 ia64/
0 arch.pri
qatomic_ia64.s
-2 macosx/
+2 macøsx/
0 arch.pri
qatomic32_ppc.s
2 mips/
@@ -7769,7 +7769,7 @@
qatomic_generic.h
qatomic_i386.h
qatomic_ia64.h
- qatomic_macosx.h
+ qatomic_macøsx.h
qatomic_mips.h
qatomic_parisc.h
qatomic_powerpc.h
diff --git i/tests/manual/qcursor/childwindowcontainer/main.cpp w/tests/manual/qcursor/childwindowcontainer/main.cpp
index e9bf927929..af8763cf90 100644
--- i/tests/manual/qcursor/childwindowcontainer/main.cpp
+++ w/tests/manual/qcursor/childwindowcontainer/main.cpp
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
QWidget* container = QWidget::createWindowContainer(w2);
container->winId(); // must make the container native, otherwise setCursor
// sets the cursor on a QWindowContainerClassWindow which
- // is outside the QWindow hierarchy (macOS).
+ // is outside the QWindow hierarchy (macØS).
container->setParent(w1);
container->setCursor(Qt::PointingHandCursor);
container->setGeometry(0, 0, 100, 100);
@ediosyncratic
Copy link

Missing: rename tests/auto/corelib/io/qfileselector/platforms/+macos/ (mentioned in tests/auto/corelib/io/qfileselector/qfileselector.qrc, which now references a non-existent file) and other files with macos in their names ;^>

@torarnv
Copy link
Author

torarnv commented Dec 9, 2019 •
edited

Thanks for the review! 😜

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment