Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
This commit is contained in:
Liang Qi
commit
6b8f422c5e
@ -10,6 +10,7 @@ macro.gui = "\\b"
|
||||
macro.HR.HTML = "<hr />"
|
||||
macro.iacute.HTML = "í"
|
||||
macro.key = "\\b"
|
||||
macro.macos = "macOS"
|
||||
macro.menu = "\\b"
|
||||
macro.oslash.HTML = "ø"
|
||||
macro.ouml.HTML = "ö"
|
||||
|
||||
@ -129,7 +129,7 @@
|
||||
\c{freeBytes.available()} is \c BufferSize - 1 and
|
||||
\c{usedBytes.available()} is 1. At that point, two things can
|
||||
happen: Either the consumer thread takes over and reads that
|
||||
byte, or the consumer gets to produce a second byte.
|
||||
byte, or the producer thread gets to produce a second byte.
|
||||
|
||||
The producer-consumer model presented in this example makes it
|
||||
possible to write highly concurrent multithreaded applications.
|
||||
|
||||
@ -137,7 +137,7 @@
|
||||
to show the message with the title, body, and icon for the time
|
||||
specified in milliseconds.
|
||||
|
||||
OS X users note: The Growl notification system must be
|
||||
\macos users note: The Growl notification system must be
|
||||
installed for QSystemTrayIcon::showMessage() to display messages.
|
||||
|
||||
QSystemTrayIcon also has the corresponding, \l {QSystemTrayIcon::}
|
||||
@ -172,7 +172,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 OS X we need to
|
||||
users when they are closing the editor window. On \macos 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
|
||||
|
||||
@ -222,7 +222,7 @@
|
||||
and Qt::AlignLeft.
|
||||
|
||||
A QString object, \c text, is customized to display data according to the
|
||||
contents of \c format. We invoke {QString}'s \l{QString::simplified()}
|
||||
contents of \c format. We invoke \l{QString}'s \l{QString::simplified()}
|
||||
{simplified()} function on \c text, to obtain a string that has no
|
||||
additional space before, after or in between words.
|
||||
|
||||
|
||||
@ -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 OS X styles), but for some
|
||||
styles (e.g., Windows and \macos 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 OS X, it uses the native XML-based
|
||||
Windows registry; on \macos, 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 OS X, this makes no difference, but on Windows,
|
||||
On Unix and \macos, this makes no difference, but on Windows,
|
||||
it ensures that the "\\r\\n" end-of-line sequence is converted to
|
||||
"\\n" when reading.
|
||||
|
||||
|
||||
@ -76,7 +76,7 @@
|
||||
\endlist
|
||||
|
||||
Although the program is just an example, if you press \uicontrol Finish
|
||||
(\uicontrol Done on OS X), actual C++ source files will actually be
|
||||
(\uicontrol Done on \macos), 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 OS X). The fields' values
|
||||
\uicontrol Next button (\uicontrol Continue on \macos). The fields' values
|
||||
can be accessed from any other page using QWizardPage::field(),
|
||||
or from the wizard code using QWizard::field().
|
||||
|
||||
|
||||
@ -94,7 +94,7 @@
|
||||
\snippet dialogs/licensewizard/licensewizard.cpp 4
|
||||
|
||||
We set the style to \l{QWizard::}{ModernStyle} on all platforms
|
||||
except OS X,
|
||||
except \macos,
|
||||
|
||||
\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 OS X). The fields' values
|
||||
\uicontrol Next button (\uicontrol Continue on \macos). The fields' values
|
||||
can be accessed from any other page using QWizardPage::field().
|
||||
|
||||
Resetting the page amounts to clearing the two text fields.
|
||||
|
||||
@ -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 OS X,
|
||||
file, and to do a \l{QDir::cd()}{cd()}. On Windows and \macos,
|
||||
this file is usually located in a subdirectory, so we need to
|
||||
take this into account.
|
||||
|
||||
|
||||
@ -12,9 +12,6 @@ build_pass:simulator: \
|
||||
|
||||
load(sdk)
|
||||
|
||||
lessThan(QMAKE_MAC_SDK_VERSION, "8.0"): \
|
||||
error("Current $$QMAKE_MAC_SDK SDK version ($$QMAKE_MAC_SDK_VERSION) is too old. Please upgrade Xcode.")
|
||||
|
||||
macx-xcode {
|
||||
sdk_path_device.name = "QMAKE_MAC_SDK_PATH[sdk=$${device.sdk}*]"
|
||||
sdk_path_device.value = $$xcodeSDKInfo(Path, $${device.sdk})
|
||||
|
||||
@ -44,6 +44,8 @@ echo "IPHONESIMULATOR_DEVICES = $booted_simulator"
|
||||
|
||||
xcodebuild test -scheme $1 -destination 'id=0' -destination-timeout 1 2>&1| sed -n 's/{ \(platform:.*\) }/\1/p' | while read destination; do
|
||||
id=$(echo $destination | sed -n -E 's/.*id:([^ ,]+).*/\1/p')
|
||||
[[ $id == *"placeholder"* ]] && continue
|
||||
|
||||
echo $destination | tr ',' '\n' | while read keyval; do
|
||||
key=$(echo $keyval | cut -d ':' -f 1 | tr '[:lower:]' '[:upper:]')
|
||||
val=$(echo $keyval | cut -d ':' -f 2)
|
||||
|
||||
@ -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 OS X and iOS
|
||||
\section1 \macos and iOS
|
||||
|
||||
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
|
||||
OS X, located at \c{/Library/Frameworks/}.
|
||||
\macos, 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 OS X - Deployment} for more information about
|
||||
See \l{Qt for macOS - Deployment} for more information about
|
||||
deploying applications and libraries.
|
||||
|
||||
\section2 Creating and Moving Xcode Projects
|
||||
|
||||
Developers on OS X can take advantage of the qmake support for Xcode
|
||||
project files, as described in \l{Qt for OS X#Additional Command-Line Options}{Qt for OS X} documentation.
|
||||
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.
|
||||
by running qmake to generate an Xcode project from an existing qmake project
|
||||
file. For example:
|
||||
|
||||
@ -1069,7 +1069,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 OS X:
|
||||
The following options take an effect only on \macos:
|
||||
|
||||
\table
|
||||
\header \li Option \li Description
|
||||
@ -1439,7 +1439,7 @@
|
||||
\target QMAKE_BUNDLE_DATA
|
||||
\section1 QMAKE_BUNDLE_DATA
|
||||
|
||||
\note This variable is used on OS X and iOS only.
|
||||
\note This variable is used on \macos and iOS only.
|
||||
|
||||
Specifies the data that will be installed with a library
|
||||
bundle, and is often used to specify a collection of header files.
|
||||
@ -1461,7 +1461,7 @@
|
||||
|
||||
\section1 QMAKE_BUNDLE_EXTENSION
|
||||
|
||||
\note This variable is used on OS X and iOS only.
|
||||
\note This variable is used on \macos and iOS only.
|
||||
|
||||
Specifies the extension to be used for library bundles.
|
||||
This allows frameworks to be created with custom extensions instead of the
|
||||
@ -1695,7 +1695,7 @@
|
||||
|
||||
\section1 QMAKE_FRAMEWORK_BUNDLE_NAME
|
||||
|
||||
\note This variable is used on OS X and iOS only.
|
||||
\note This variable is used on \macos and iOS only.
|
||||
|
||||
In a framework project, this variable contains the name to be used for the
|
||||
framework that is built.
|
||||
@ -1709,9 +1709,9 @@
|
||||
\target QMAKE_FRAMEWORK_VERSION
|
||||
\section1 QMAKE_FRAMEWORK_VERSION
|
||||
|
||||
\note This variable is used on OS X and iOS only.
|
||||
\note This variable is used on \macos and iOS only.
|
||||
|
||||
For projects where the build target is an OS X or iOS framework, this variable
|
||||
For projects where the build target is a \macos or an iOS framework, this variable
|
||||
is used to specify the version number that will be applied to the framework
|
||||
that is built.
|
||||
|
||||
@ -1804,10 +1804,10 @@
|
||||
\target QMAKE_INFO_PLIST
|
||||
\section1 QMAKE_INFO_PLIST
|
||||
|
||||
\note This variable is used on OS X and iOS platforms only.
|
||||
\note This variable is used on \macos and iOS platforms only.
|
||||
|
||||
Specifies the name of the property list file, \c{.plist}, you
|
||||
would like to include in your OS X and iOS application bundle.
|
||||
would like to include in your \macos and iOS application bundle.
|
||||
|
||||
In the \c{.plist} file, you can define some variables, e.g., @EXECUTABLE@,
|
||||
which qmake will replace with the actual executable name. Other variables
|
||||
@ -2077,16 +2077,16 @@
|
||||
|
||||
\section1 QMAKE_MAC_SDK
|
||||
|
||||
This variable is used on OS X when building universal binaries.
|
||||
This variable is used on \macos when building universal binaries.
|
||||
|
||||
\section1 QMAKE_MACOSX_DEPLOYMENT_TARGET
|
||||
|
||||
This variable only takes effect when building on OS X. On that
|
||||
This variable only takes effect when building on \macos. On that
|
||||
platform, the variable will be forwarded to the MACOSX_DEPLOYMENT_TARGET
|
||||
environment variable, which is interpreted by the compiler or linker.
|
||||
For more information, see the
|
||||
\l{Qt for OS X - Deployment#OS X Version Dependencies}{Deploying
|
||||
an Application on OS X} document.
|
||||
\l{Qt for macOS - Deployment#macOS Version Dependencies}{Deploying
|
||||
an Application on \macos} document.
|
||||
|
||||
\section1 QMAKE_MAKEFILE
|
||||
|
||||
@ -4308,7 +4308,7 @@
|
||||
\li nmake
|
||||
\li Visual Studio projects (VS 2008 and later)
|
||||
\endlist
|
||||
\li OS X and iOS
|
||||
\li \macos and iOS
|
||||
\list
|
||||
\li Makefile
|
||||
\li Xcode
|
||||
@ -4679,7 +4679,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 OS X}.
|
||||
see \l{Qt for Windows - Deployment} and \l{Qt for macOS}.
|
||||
|
||||
\target Application
|
||||
\section1 Building an Application
|
||||
@ -4827,7 +4827,7 @@
|
||||
\endlist
|
||||
|
||||
The target file name for the library is platform-dependent. For example, on
|
||||
X11, OS X, and iOS, the library name will be prefixed by \c lib. On Windows,
|
||||
X11, \macos, and iOS, the library name will be prefixed by \c lib. On Windows,
|
||||
no prefix is added to the file name.
|
||||
|
||||
\target Plugin
|
||||
|
||||
@ -423,6 +423,12 @@ void NmakeMakefileGenerator::init()
|
||||
if (!defines.contains("NDEBUG"))
|
||||
defines.append("NDEBUG");
|
||||
}
|
||||
|
||||
if (project->values("QMAKE_APP_FLAG").isEmpty() && project->isActiveConfig("dll")) {
|
||||
ProStringList &defines = project->values("DEFINES");
|
||||
if (!defines.contains("_WINDLL"))
|
||||
defines.append("_WINDLL");
|
||||
}
|
||||
}
|
||||
|
||||
QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter()
|
||||
|
||||
@ -136,7 +136,7 @@
|
||||
\image resources.png Building resources into an application
|
||||
|
||||
Currently, Qt always stores the data directly in the executable,
|
||||
even on Windows, OS X, and iOS, where the operating system provides
|
||||
even on Windows, \macos, and iOS, where the operating system provides
|
||||
native support for resources. This might change in a future Qt
|
||||
release.
|
||||
|
||||
|
||||
@ -1054,8 +1054,8 @@ bool qSharedBuild() Q_DECL_NOTHROW
|
||||
\endlist
|
||||
|
||||
Some constants are defined only on certain platforms. You can use
|
||||
the preprocessor symbols Q_OS_WIN and Q_OS_OSX to test that
|
||||
the application is compiled under Windows or OS X.
|
||||
the preprocessor symbols Q_OS_WIN and Q_OS_MACOS to test that
|
||||
the application is compiled under Windows or \macos.
|
||||
|
||||
\sa QLibraryInfo
|
||||
*/
|
||||
@ -1094,7 +1094,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
|
||||
/*!
|
||||
\fn QSysInfo::MacVersion QSysInfo::macVersion()
|
||||
|
||||
Returns the version of Darwin (OS X or iOS) on which the
|
||||
Returns the version of Darwin (\macos or iOS) on which the
|
||||
application is run, or MV_None if the operating system
|
||||
is not a version of Darwin.
|
||||
*/
|
||||
@ -1170,24 +1170,24 @@ bool qSharedBuild() Q_DECL_NOTHROW
|
||||
\enum QSysInfo::MacVersion
|
||||
|
||||
This enum provides symbolic names for the various versions of the
|
||||
Darwin operating system, covering both OS X and iOS. The
|
||||
Darwin operating system, covering both \macos and iOS. The
|
||||
QSysInfo::MacintoshVersion variable gives the version of the
|
||||
system on which the application is run.
|
||||
|
||||
\value MV_9 Mac OS 9
|
||||
\value MV_10_0 Mac OS X 10.0
|
||||
\value MV_10_1 Mac OS X 10.1
|
||||
\value MV_10_2 Mac OS X 10.2
|
||||
\value MV_10_3 Mac OS X 10.3
|
||||
\value MV_10_4 Mac OS X 10.4
|
||||
\value MV_10_5 Mac OS X 10.5
|
||||
\value MV_10_6 Mac OS X 10.6
|
||||
\value MV_10_7 Mac OS X 10.7
|
||||
\value MV_10_8 OS X 10.8
|
||||
\value MV_10_9 OS X 10.9
|
||||
\value MV_10_10 OS X 10.10
|
||||
\value MV_10_11 OS X 10.11
|
||||
\value MV_10_12 macOS 10.12
|
||||
\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_Unknown An unknown and currently unsupported platform
|
||||
|
||||
\value MV_CHEETAH Apple codename for MV_10_0
|
||||
@ -1232,7 +1232,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
|
||||
\macro Q_OS_DARWIN
|
||||
\relates <QtGlobal>
|
||||
|
||||
Defined on Darwin-based operating systems such as OS X, iOS, watchOS, and tvOS.
|
||||
Defined on Darwin-based operating systems such as \macos, iOS, watchOS, and tvOS.
|
||||
*/
|
||||
|
||||
/*!
|
||||
@ -1253,7 +1253,7 @@ bool qSharedBuild() Q_DECL_NOTHROW
|
||||
\macro Q_OS_MACOS
|
||||
\relates <QtGlobal>
|
||||
|
||||
Defined on macOS.
|
||||
Defined on \macos.
|
||||
*/
|
||||
|
||||
/*!
|
||||
@ -2603,7 +2603,7 @@ static QString unknownText()
|
||||
Note that 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 OS X and iOS. For information on the type
|
||||
Debian/kFreeBSD, and "darwin" for \macos and iOS. For information on the type
|
||||
of product the application is running on, see productType().
|
||||
|
||||
\sa QFileSelector, kernelVersion(), productType(), productVersion(), prettyProductName()
|
||||
@ -2627,7 +2627,7 @@ QString QSysInfo::kernelType()
|
||||
|
||||
Returns the release version of the operating system kernel. On Windows, it
|
||||
returns the version of the NT or CE kernel. On Unix systems, including
|
||||
Android and OS X, it returns the same as the \c{uname -r}
|
||||
Android and \macos, 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
|
||||
@ -2668,11 +2668,11 @@ QString QSysInfo::kernelVersion()
|
||||
to determine the distribution name and returns that. If determining the
|
||||
distribution name failed, it returns "unknown".
|
||||
|
||||
\b{Darwin, OS X and iOS note}: this function returns "macos" for macOS
|
||||
\b{Darwin, \macos and iOS note}: this function returns "macos" for macOS
|
||||
systems, "ios" for iOS systems and "darwin" in case the system could not be
|
||||
determined.
|
||||
|
||||
\b{OS X note}: this function returns "osx" for versions of macOS prior to 10.12.
|
||||
\b{OS X note}: this function returns "osx" for versions of \macos prior to 10.12.
|
||||
|
||||
\b{FreeBSD note}: this function returns "debian" for Debian/kFreeBSD and
|
||||
"unknown" otherwise.
|
||||
@ -2728,7 +2728,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, OS X, Windows full-product
|
||||
It will return the Android, iOS, \macos, Windows full-product
|
||||
versions on those systems. In particular, on OS X, iOS and Windows, the
|
||||
returned string is similar to the macVersion() or windowsVersion() enums.
|
||||
|
||||
@ -2739,7 +2739,7 @@ QString QSysInfo::productType()
|
||||
In all other Unix-type systems, this function always returns "unknown".
|
||||
|
||||
\note The version string returned from this function is only guaranteed to
|
||||
be orderable on Android, OS X and iOS. On Windows, some Windows
|
||||
be orderable on Android, \macos and iOS. On Windows, some Windows
|
||||
versions are text ("XP" and "Vista", for example). On Linux, the version of
|
||||
the distribution may jump unexpectedly, please refer to the distribution's
|
||||
documentation for versioning practices.
|
||||
|
||||
@ -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
|
||||
OS X menubar \e{may not} pick up a change in this attribute. Changes
|
||||
\macos menubar \e{may not} pick up a change in this attribute. Changes
|
||||
in the QAction::iconVisibleInMenu property will always be picked up.
|
||||
|
||||
\value AA_NativeWindows Ensures that widgets have native windows.
|
||||
@ -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 OS X or at the bottom in Windows CE).
|
||||
the top of the main screen on \macos or at the bottom in Windows CE).
|
||||
|
||||
\value AA_MacDontSwapCtrlAndMeta On OS X by default, Qt swaps the
|
||||
\value AA_MacDontSwapCtrlAndMeta On \macos 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
|
||||
@ -350,7 +350,7 @@
|
||||
|
||||
\omitvalue KeyboardModifierMask
|
||||
|
||||
\note On OS X, the \c ControlModifier value corresponds to
|
||||
\note On \macos, the \c ControlModifier value corresponds to
|
||||
the Command keys on the Macintosh 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
|
||||
@ -368,7 +368,7 @@
|
||||
This enum provides shorter names for the keyboard modifier keys
|
||||
supported by Qt.
|
||||
|
||||
\note On OS X, the \c CTRL value corresponds to
|
||||
\note On \macos, the \c CTRL value corresponds to
|
||||
the Command keys on the Macintosh keyboard, and the \c META value
|
||||
corresponds to the Control keys.
|
||||
|
||||
@ -969,34 +969,34 @@
|
||||
|
||||
\value WA_MacOpaqueSizeGrip Indicates that the native Carbon size grip
|
||||
should be opaque instead of transparent (the default). This attribute
|
||||
is only applicable to OS X and is set by the widget's author.
|
||||
is only applicable to \macos 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 OS X.
|
||||
frame. This attribute is only applicable to \macos.
|
||||
|
||||
\value WA_MacNormalSize Indicates the widget should have the
|
||||
normal size for widgets in OS X. This attribute is only
|
||||
applicable to OS X.
|
||||
normal size for widgets in \macos. This attribute is only
|
||||
applicable to \macos.
|
||||
|
||||
\value WA_MacSmallSize Indicates the widget should have the small
|
||||
size for widgets in OS X. This attribute is only applicable to
|
||||
OS X.
|
||||
size for widgets in \macos. This attribute is only applicable to
|
||||
\macos.
|
||||
|
||||
\value WA_MacMiniSize Indicates the widget should have the mini
|
||||
size for widgets in OS X. This attribute is only applicable to
|
||||
OS X.
|
||||
size for widgets in \macos. This attribute is only applicable to
|
||||
\macos.
|
||||
|
||||
\value WA_MacVariableSize Indicates the widget can choose between
|
||||
alternative sizes for widgets to avoid clipping.
|
||||
This attribute is only applicable to OS X.
|
||||
This attribute is only applicable to \macos.
|
||||
|
||||
\value WA_MacBrushedMetal Indicates the widget should be drawn in
|
||||
the brushed metal style as supported by the windowing system. This
|
||||
attribute is only applicable to OS X.
|
||||
attribute is only applicable to \macos.
|
||||
|
||||
\omitvalue WA_MacMetalStyle
|
||||
|
||||
@ -1146,14 +1146,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 OS X
|
||||
On some platforms this flag will do nothing, on others (including \macos
|
||||
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 and
|
||||
palette from its parent.
|
||||
|
||||
\value WA_MacAlwaysShowToolWindow On OS X, show the tool window even
|
||||
\value WA_MacAlwaysShowToolWindow On \macos, show the tool window even
|
||||
when the application is not active. By default, all tool windows are
|
||||
hidden when the application is inactive.
|
||||
|
||||
@ -1336,8 +1336,8 @@
|
||||
\value Key_PageUp
|
||||
\value Key_PageDown
|
||||
\value Key_Shift
|
||||
\value Key_Control On OS X, this corresponds to the Command keys.
|
||||
\value Key_Meta On OS X, this corresponds to the Control keys.
|
||||
\value Key_Control On \macos, this corresponds to the Command keys.
|
||||
\value Key_Meta On \macos, this corresponds to the Control keys.
|
||||
On Windows keyboards, this key is mapped to the
|
||||
Windows key.
|
||||
\value Key_Alt
|
||||
@ -1997,7 +1997,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 OS X this will also
|
||||
and clicking. On \macos 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
|
||||
@ -2103,7 +2103,7 @@
|
||||
system supports it, a tool window can be decorated
|
||||
with a somewhat lighter frame. It can also be
|
||||
combined with Qt::FramelessWindowHint.
|
||||
On OS X, tool windows correspond to the
|
||||
On \macos, tool windows correspond to the
|
||||
\l{http://developer.apple.com/documentation/Carbon/Conceptual/HandlingWindowsControls/hitb-wind_cont_concept/chapter_2_section_2.html}{Floating}
|
||||
class of windows. This means that the window lives on a
|
||||
level above normal windows; it impossible to put a normal
|
||||
@ -2192,10 +2192,10 @@
|
||||
\value WindowContextHelpButtonHint Adds a context help button to dialogs.
|
||||
On some platforms this implies Qt::WindowSystemMenuHint for it to work.
|
||||
|
||||
\value MacWindowToolBarButtonHint On OS X adds a tool bar button (i.e.,
|
||||
\value MacWindowToolBarButtonHint On \macos adds a tool bar button (i.e.,
|
||||
the oblong button that is on the top right of windows that have toolbars).
|
||||
|
||||
\value WindowFullscreenButtonHint On OS X adds a fullscreen button.
|
||||
\value WindowFullscreenButtonHint On \macos adds a fullscreen button.
|
||||
|
||||
\value BypassGraphicsProxyWidget Prevents the window and its children from
|
||||
automatically embedding themselves into a QGraphicsProxyWidget if the
|
||||
@ -2219,7 +2219,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 OS X.
|
||||
for \macos.
|
||||
|
||||
\value WindowOkButtonHint Adds an OK button to the window decoration of a dialog.
|
||||
Only supported for Windows CE.
|
||||
@ -3089,7 +3089,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, OS X, and iOS), Qt will keep millisecond accuracy
|
||||
On UNIX (including Linux, \macos, 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
|
||||
|
||||
@ -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 OS X and iOS: the file is a bundle; implies DirectoryType
|
||||
\value BundleType \macos 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).
|
||||
|
||||
|
||||
@ -240,7 +240,7 @@ QDateTime &QFileInfoPrivate::getFileTime(QAbstractFileEngine::FileTime request)
|
||||
isSymLink(). The symLinkTarget() function provides the name of the file
|
||||
the symlink points to.
|
||||
|
||||
On Unix (including OS X and iOS), the symlink has the same size() has
|
||||
On Unix (including \macos and iOS), the symlink has the same size() has
|
||||
the file it points to, because Unix handles symlinks
|
||||
transparently; similarly, opening a symlink using QFile
|
||||
effectively opens the link's target. For example:
|
||||
@ -760,7 +760,7 @@ QString QFileInfo::fileName() const
|
||||
\since 4.3
|
||||
Returns the name of the bundle.
|
||||
|
||||
On OS X and iOS this returns the proper localized name for a bundle if the
|
||||
On \macos 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:
|
||||
@ -1042,7 +1042,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 OS X and iOS; otherwise returns \c false.
|
||||
link to a bundle on \macos and iOS; otherwise returns \c false.
|
||||
|
||||
\sa isDir(), isSymLink(), isFile()
|
||||
*/
|
||||
@ -1063,7 +1063,7 @@ bool QFileInfo::isBundle() const
|
||||
Returns \c true if this object points to a symbolic link (or to a
|
||||
shortcut on Windows); otherwise returns \c false.
|
||||
|
||||
On Unix (including OS X and iOS), opening a symlink effectively opens
|
||||
On Unix (including \macos and iOS), opening a symlink effectively opens
|
||||
the \l{symLinkTarget()}{link's target}. On Windows, it opens the \c
|
||||
.lnk file itself.
|
||||
|
||||
|
||||
@ -191,7 +191,7 @@ void QFileSystemWatcherPrivate::_q_directoryChanged(const QString &path, bool re
|
||||
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. OS X uses a different backend and does not
|
||||
the total. \macos uses a different backend and does not
|
||||
suffer from this issue.
|
||||
|
||||
|
||||
|
||||
@ -895,7 +895,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 OS X, or console input / \c stdin on all platforms).
|
||||
Unix and \macos, or console input / \c stdin on all platforms).
|
||||
|
||||
\sa bytesAvailable(), read(), isSequential()
|
||||
*/
|
||||
|
||||
@ -141,7 +141,7 @@ static QBasicMutex fcntlLock;
|
||||
/*!
|
||||
\internal
|
||||
Checks that the OS isn't using POSIX locks to emulate flock().
|
||||
OS X is one of those.
|
||||
\macos is one of those.
|
||||
*/
|
||||
static bool fcntlWorksAfterFlock(const QString &fn)
|
||||
{
|
||||
|
||||
@ -183,7 +183,7 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift)
|
||||
by QStandardPaths::GenericConfigLocation, e.g.
|
||||
|
||||
\list
|
||||
\li on OS X and iOS: \c ~/Library/Preferences
|
||||
\li on \macos and iOS: \c ~/Library/Preferences
|
||||
\li on Unix: \c ~/.config, \c /etc/xdg
|
||||
\li on Windows: \c %LOCALAPPDATA%, \c %ProgramData%,
|
||||
\l QCoreApplication::applicationDirPath(),
|
||||
|
||||
@ -1951,7 +1951,7 @@ void QProcess::setProcessState(ProcessState state)
|
||||
|
||||
/*!
|
||||
This function is called in the child process context just before the
|
||||
program is executed on Unix or OS X (i.e., after \c fork(), but before
|
||||
program is executed on Unix or \macos (i.e., after \c fork(), but before
|
||||
\c execve()). Reimplement this function to do last minute initialization
|
||||
of the child process. Example:
|
||||
|
||||
@ -1962,7 +1962,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 OS X
|
||||
\warning This function is called by QProcess on Unix and \macos
|
||||
only. On Windows and QNX, it is not called.
|
||||
*/
|
||||
void QProcess::setupChildProcess()
|
||||
@ -2362,7 +2362,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 OS X the \c SIGTERM signal is sent.
|
||||
and \macos 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
|
||||
@ -2379,7 +2379,7 @@ void QProcess::terminate()
|
||||
/*!
|
||||
Kills the current process, causing it to exit immediately.
|
||||
|
||||
On Windows, kill() uses TerminateProcess, and on Unix and OS X, the
|
||||
On Windows, kill() uses TerminateProcess, and on Unix and \macos, the
|
||||
SIGKILL signal is sent to the process.
|
||||
|
||||
\sa terminate()
|
||||
|
||||
@ -1927,7 +1927,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 OS X and iOS. On Unix systems, in the
|
||||
and in property list files on \macos and iOS. On Unix systems, in the
|
||||
absence of a standard, many applications (including the KDE
|
||||
applications) use INI text files.
|
||||
|
||||
@ -1972,8 +1972,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 OS X and iOS instead of the
|
||||
organization name, since OS X and iOS applications conventionally use
|
||||
the Internet domain is set, it is used on \macos and iOS instead of the
|
||||
organization name, since \macos 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.)
|
||||
@ -2031,7 +2031,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 OS X and iOS uses case-sensitive keys. To
|
||||
CFPreferences API on \macos and iOS uses case-sensitive keys. To
|
||||
avoid portability problems, follow these simple rules:
|
||||
|
||||
\list 1
|
||||
@ -2205,7 +2205,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
|
||||
\li \c{/etc/xdg/MySoft.conf}
|
||||
\endlist
|
||||
|
||||
On Mac OS X versions 10.2 and 10.3, these files are used by
|
||||
On \macos versions 10.2 and 10.3, these files are used by
|
||||
default:
|
||||
|
||||
\list 1
|
||||
@ -2233,7 +2233,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, OS X, and iOS:
|
||||
used on Unix, \macos, and iOS:
|
||||
|
||||
\list 1
|
||||
\li \c{$HOME/.config/MySoft/Star Runner.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.ini})
|
||||
@ -2260,7 +2260,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, OS X, and iOS the user can override them by
|
||||
setPath(). On Unix, \macos, and iOS the user can override them by
|
||||
setting the \c XDG_CONFIG_HOME environment variable; see
|
||||
setPath() for details.
|
||||
|
||||
@ -2277,7 +2277,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
|
||||
You can then use the QSettings object to read and write settings
|
||||
in the file.
|
||||
|
||||
On OS X and iOS, you can access property list \c .plist files by passing
|
||||
On \macos 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
|
||||
@ -2331,13 +2331,13 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
|
||||
limitations is to store the settings using the IniFormat
|
||||
instead of the NativeFormat.
|
||||
|
||||
\li On OS X and iOS, allKeys() will return some extra keys for global
|
||||
\li On \macos 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 OS X and iOS, the CFPreferences API used by QSettings expects
|
||||
\li On \macos 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
|
||||
@ -2354,7 +2354,7 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
|
||||
|
||||
\snippet code/src_corelib_io_qsettings.cpp 7
|
||||
|
||||
\li On OS X, permissions to access settings not belonging to the
|
||||
\li On \macos, 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
|
||||
@ -2383,7 +2383,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 OS X and iOS, this means the CFPreferences
|
||||
on \macos 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
|
||||
@ -2556,7 +2556,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 OS X and iOS, \a fileName is the name of a
|
||||
name of an INI file. On \macos and iOS, \a fileName is the name of a
|
||||
\c .plist file. On Windows, \a fileName is a path in the system
|
||||
registry.
|
||||
|
||||
@ -2609,7 +2609,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.
|
||||
|
||||
On OS X and iOS, if both a name and an Internet domain are specified
|
||||
On \macos and iOS, if both a name and an Internet domain are specified
|
||||
for the organization, the domain is preferred over the name. On
|
||||
other platforms, the name is preferred over the domain.
|
||||
|
||||
@ -3125,7 +3125,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 OS X and iOS uses
|
||||
keys, whereas the CFPreferences API on \macos and iOS uses
|
||||
case-sensitive keys. To avoid portability problems, see the
|
||||
\l{Section and Key Syntax} rules.
|
||||
|
||||
@ -3164,7 +3164,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 OS X and iOS uses
|
||||
keys, whereas the CFPreferences API on \macos and iOS uses
|
||||
case-sensitive keys. To avoid portability problems, see the
|
||||
\l{Section and Key Syntax} rules.
|
||||
|
||||
@ -3199,7 +3199,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 OS X and iOS uses
|
||||
keys, whereas the CFPreferences API on \macos and iOS uses
|
||||
case-sensitive keys. To avoid portability problems, see the
|
||||
\l{Section and Key Syntax} rules.
|
||||
|
||||
@ -3261,7 +3261,7 @@ bool QSettings::event(QEvent *event)
|
||||
returned.
|
||||
|
||||
Note that the Windows registry and INI files use case-insensitive
|
||||
keys, whereas the CFPreferences API on OS X and iOS uses
|
||||
keys, whereas the CFPreferences API on \macos and iOS uses
|
||||
case-sensitive keys. To avoid portability problems, see the
|
||||
\l{Section and Key Syntax} rules.
|
||||
|
||||
@ -3364,18 +3364,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} OS X and iOS \li{1,2} IniFormat \li UserScope \li \c $HOME/.config
|
||||
\row \li{1,2} \macos 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, OS X, and iOS (\c
|
||||
The default UserScope paths on Unix, \macos, 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, OS X, and iOS (\c /etc/xdg) can be overridden when
|
||||
paths on Unix, \macos, 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, OS X, and iOS has no
|
||||
Setting the NativeFormat paths on Windows, \macos, and iOS has no
|
||||
effect.
|
||||
|
||||
\warning This function doesn't affect existing QSettings objects.
|
||||
|
||||
@ -153,7 +153,7 @@ QT_BEGIN_NAMESPACE
|
||||
paths, if any, represent non-writable locations.
|
||||
|
||||
\table
|
||||
\header \li Path type \li OS X \li Windows
|
||||
\header \li Path type \li \macos \li Windows
|
||||
\row \li DesktopLocation
|
||||
\li "~/Desktop"
|
||||
\li "C:/Users/<USER>/Desktop"
|
||||
@ -609,7 +609,7 @@ QString QStandardPaths::displayName(StandardLocation type)
|
||||
On Unix, \c XDG_DATA_HOME is set to \e ~/.qttest/share, \c XDG_CONFIG_HOME is
|
||||
set to \e ~/.qttest/config, and \c XDG_CACHE_HOME is set to \e ~/.qttest/cache.
|
||||
|
||||
On OS X, data goes to \e ~/.qttest/Application Support, cache goes to
|
||||
On \macos, data goes to \e ~/.qttest/Application Support, cache goes to
|
||||
\e ~/.qttest/Cache, and config goes to \e ~/.qttest/Preferences.
|
||||
|
||||
On Windows, everything goes to a "qttest" directory under Application Data.
|
||||
|
||||
@ -256,7 +256,7 @@ QByteArray QStorageInfo::fileSystemType() const
|
||||
/*!
|
||||
Returns the device for this volume.
|
||||
|
||||
For example, on Unix filesystems (including OS X), this returns the
|
||||
For example, on Unix filesystems (including \macos), 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).
|
||||
|
||||
|
||||
@ -187,7 +187,13 @@ bool QStringListModel::setData(const QModelIndex &index, const QVariant &value,
|
||||
if (index.row() >= 0 && index.row() < lst.size()
|
||||
&& (role == Qt::EditRole || role == Qt::DisplayRole)) {
|
||||
lst.replace(index.row(), value.toString());
|
||||
emit dataChanged(index, index, QVector<int>(1, role));
|
||||
QVector<int> roles;
|
||||
roles.reserve(2);
|
||||
roles.append(Qt::DisplayRole);
|
||||
roles.append(Qt::EditRole);
|
||||
emit dataChanged(index, index, roles);
|
||||
// once Q_COMPILER_UNIFORM_INIT can be used, change to:
|
||||
// emit dataChanged(index, index, {Qt::DisplayRole, Qt::EditRole});
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@ -687,7 +687,7 @@ QCoreApplication::QCoreApplication(QCoreApplicationPrivate &p)
|
||||
|
||||
If you are doing graphical changes inside a loop that does not
|
||||
return to the event loop on asynchronous window systems like X11
|
||||
or double buffered window systems like Quartz (OS X and iOS), and you want to
|
||||
or double buffered window systems like Quartz (\macos and iOS), and you want to
|
||||
visualize these changes immediately (e.g. Splash Screens), call
|
||||
this function.
|
||||
|
||||
@ -2072,7 +2072,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 OS X and iOS this will point to the directory actually containing
|
||||
On \macos and iOS this will point to the directory actually containing
|
||||
the executable, which may be inside an application bundle (if the
|
||||
application is bundled).
|
||||
|
||||
|
||||
@ -174,7 +174,7 @@ QT_BEGIN_NAMESPACE
|
||||
\value NonClientAreaMouseButtonPress A mouse button press occurred outside the client area.
|
||||
\value NonClientAreaMouseButtonRelease A mouse button release occurred outside the client area.
|
||||
\value NonClientAreaMouseMove A mouse move occurred outside the client area.
|
||||
\value MacSizeChange The user changed his widget sizes (OS X only).
|
||||
\value MacSizeChange The user changed his widget sizes (\macos only).
|
||||
\value MetaCall An asynchronous method invocation via QMetaObject::invokeMethod().
|
||||
\value ModifiedChange Widgets modification state has been changed.
|
||||
\value MouseButtonDblClick Mouse press again (QMouseEvent).
|
||||
@ -219,7 +219,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 OS X.
|
||||
\value ToolBarChange The toolbar button is toggled on \macos.
|
||||
\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).
|
||||
|
||||
@ -2722,7 +2722,7 @@ qlonglong QVariant::toLongLong(bool *ok) const
|
||||
}
|
||||
|
||||
/*!
|
||||
Returns the variant as as an unsigned long long int if the
|
||||
Returns the variant as an unsigned long long int if the
|
||||
variant has type() \l QMetaType::ULongLong, \l QMetaType::Bool,
|
||||
\l QMetaType::QByteArray, \l QMetaType::QChar, \l QMetaType::Double,
|
||||
\l QMetaType::Int, \l QMetaType::LongLong, \l QMetaType::QString, or
|
||||
|
||||
@ -246,7 +246,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, OS X, and iOS systems, Qt will use its own copy of it.
|
||||
on most Windows, \macos, 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.
|
||||
|
||||
@ -608,7 +608,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 OS X and iOS \li \c .dylib, \c .bundle, \c .so
|
||||
\row \li \macos and iOS \li \c .dylib, \c .bundle, \c .so
|
||||
\endtable
|
||||
|
||||
Trailing versioning numbers on Unix are ignored.
|
||||
@ -845,7 +845,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 OS X and iOS, and ".dll" on Windows. (See \l{fileName}.)
|
||||
".dylib" on \macos and iOS, and ".dll" on Windows. (See \l{fileName}.)
|
||||
*/
|
||||
QLibrary::QLibrary(const QString& fileName, QObject *parent)
|
||||
:QObject(parent), d(0), did_load(false)
|
||||
@ -862,7 +862,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 OS X and iOS, and ".dll" on Windows. (See \l{fileName}.)
|
||||
".dylib" on \macos 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)
|
||||
@ -878,7 +878,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 OS X and iOS, and ".dll" on Windows. (See \l{fileName}.)
|
||||
".dylib" on \macos 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)
|
||||
|
||||
@ -145,7 +145,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 OS X and iOS, and \c .dll on Windows. The suffix
|
||||
Unix, - \c .dylib on \macos and iOS, and \c .dll on Windows. The suffix
|
||||
can be verified with QLibrary::isLibrary().
|
||||
|
||||
\sa setFileName()
|
||||
|
||||
@ -52,6 +52,8 @@
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
extern void Q_CORE_EXPORT qt_call_post_routines();
|
||||
|
||||
typedef QHash<QString, int> NameHash_t;
|
||||
|
||||
class QCommandLineParserPrivate
|
||||
@ -586,6 +588,7 @@ void QCommandLineParser::process(const QStringList &arguments)
|
||||
{
|
||||
if (!d->parse(arguments)) {
|
||||
showParserMessage(errorText() + QLatin1Char('\n'), ErrorMessage);
|
||||
qt_call_post_routines();
|
||||
::exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
@ -997,6 +1000,7 @@ Q_NORETURN void QCommandLineParser::showVersion()
|
||||
showParserMessage(QCoreApplication::applicationName() + QLatin1Char(' ')
|
||||
+ QCoreApplication::applicationVersion() + QLatin1Char('\n'),
|
||||
UsageMessage);
|
||||
qt_call_post_routines();
|
||||
::exit(EXIT_SUCCESS);
|
||||
}
|
||||
|
||||
@ -1014,6 +1018,7 @@ Q_NORETURN void QCommandLineParser::showVersion()
|
||||
Q_NORETURN void QCommandLineParser::showHelp(int exitCode)
|
||||
{
|
||||
showParserMessage(d->helpText(), UsageMessage);
|
||||
qt_call_post_routines();
|
||||
::exit(exitCode);
|
||||
}
|
||||
|
||||
|
||||
@ -1722,11 +1722,9 @@ QDateTime QDateTimeParser::getMaximum() const
|
||||
|
||||
QString QDateTimeParser::getAmPmText(AmPm ap, Case cs) const
|
||||
{
|
||||
if (ap == AmText) {
|
||||
return (cs == UpperCase ? tr("AM") : tr("am"));
|
||||
} else {
|
||||
return (cs == UpperCase ? tr("PM") : tr("pm"));
|
||||
}
|
||||
const QLocale loc = locale();
|
||||
QString raw = ap == AmText ? loc.amText() : loc.pmText();
|
||||
return cs == UpperCase ? raw.toUpper() : raw.toLower();
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -137,7 +137,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 (OS X and iOS). This clock is monotonic and does not overflow.
|
||||
\value MachAbsoluteTime The Mach kernel's absolute time (\macos 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
|
||||
@ -179,8 +179,8 @@ QT_BEGIN_NAMESPACE
|
||||
\section2 MachAbsoluteTime
|
||||
|
||||
This clock type is based on the absolute time presented by Mach kernels,
|
||||
such as that found on OS X. This clock type is presented separately
|
||||
from MonotonicClock since OS X and iOS are also Unix systems and may support
|
||||
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
|
||||
a POSIX monotonic clock with values differing from the Mach absolute
|
||||
time.
|
||||
|
||||
|
||||
@ -145,7 +145,7 @@ qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW
|
||||
number of milliseconds since January 1st, 1970 at 0:00 UTC (that is, it
|
||||
is the Unix time expressed in milliseconds).
|
||||
|
||||
On Linux, Windows and OS X/iOS systems, this value is usually the time
|
||||
On Linux, Windows and Apple platforms, this value is usually the time
|
||||
since the system boot, though it usually does not include the time the
|
||||
system has spent in sleep states.
|
||||
|
||||
|
||||
@ -5495,7 +5495,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 OS X and iOS this function compares according the
|
||||
On \macos and iOS this function compares according the
|
||||
"Order for sorted lists" setting in the International preferences panel.
|
||||
|
||||
\sa compare(), QLocale
|
||||
@ -7989,7 +7989,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
|
||||
|
||||
Constructs a new QString containing a copy of the \a string CFString.
|
||||
|
||||
\note this function is only available on OS X and iOS.
|
||||
\note this function is only available on \macos and iOS.
|
||||
*/
|
||||
|
||||
/*! \fn CFStringRef QString::toCFString() const
|
||||
@ -7998,7 +7998,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
|
||||
Creates a CFString from a QString. The caller owns the CFString and is
|
||||
responsible for releasing it.
|
||||
|
||||
\note this function is only available on OS X and iOS.
|
||||
\note this function is only available on \macos and iOS.
|
||||
*/
|
||||
|
||||
/*! \fn QString QString::fromNSString(const NSString *string)
|
||||
@ -8006,7 +8006,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
|
||||
|
||||
Constructs a new QString containing a copy of the \a string NSString.
|
||||
|
||||
\note this function is only available on OS X and iOS.
|
||||
\note this function is only available on \macos and iOS.
|
||||
*/
|
||||
|
||||
/*! \fn NSString QString::toNSString() const
|
||||
@ -8014,7 +8014,7 @@ QString QString::multiArg(int numArgs, const QString **args) const
|
||||
|
||||
Creates a NSString from a QString. The NSString is autoreleased.
|
||||
|
||||
\note this function is only available on OS X and iOS.
|
||||
\note this function is only available on \macos and iOS.
|
||||
*/
|
||||
|
||||
/*! \fn bool QString::isSimpleText() const
|
||||
@ -9409,7 +9409,7 @@ QStringRef QStringRef::appendTo(QString *string) const
|
||||
platform-dependent manner. Use this function to present sorted
|
||||
lists of strings to the user.
|
||||
|
||||
On OS X and iOS, this function compares according the
|
||||
On \macos and iOS, this function compares according the
|
||||
"Order for sorted lists" setting in the International prefereces panel.
|
||||
|
||||
\sa compare(), QLocale
|
||||
|
||||
@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
|
||||
to replace or extend the default behavior of the static functions
|
||||
in QAccessible.
|
||||
|
||||
Qt supports Microsoft Active Accessibility (MSAA), OS X
|
||||
Qt supports Microsoft Active Accessibility (MSAA), \macos
|
||||
Accessibility, and the Unix/X11 AT-SPI standard. Other backends
|
||||
can be supported using QAccessibleBridge.
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
|
||||
\ingroup accessibility
|
||||
\inmodule QtWidgets
|
||||
|
||||
Qt supports Microsoft Active Accessibility (MSAA), OS X
|
||||
Qt supports Microsoft Active Accessibility (MSAA), \macos
|
||||
Accessibility, and the Unix/X11 AT-SPI standard. By subclassing
|
||||
QAccessibleBridge, you can support other backends than the
|
||||
predefined ones.
|
||||
|
||||
@ -399,7 +399,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 OS X uses the Cocoa Drag Manager. On X11, XDND uses MIME,
|
||||
Qt for \macos 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
|
||||
@ -408,6 +408,6 @@
|
||||
|
||||
Custom classes for translating proprietary clipboard formats can be
|
||||
registered by reimplementing QWinMime on Windows or
|
||||
QMacPasteboardMime on OS X.
|
||||
QMacPasteboardMime on \macos.
|
||||
|
||||
*/
|
||||
|
||||
@ -1247,7 +1247,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 OS X).
|
||||
menu icons on \macos).
|
||||
|
||||
\sa setIsMask()
|
||||
*/
|
||||
|
||||
@ -116,22 +116,22 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
\endlist
|
||||
|
||||
\section1 Notes for OS X Users
|
||||
\section1 Notes for \macos Users
|
||||
|
||||
OS X supports a separate find buffer that holds the current
|
||||
\macos 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 OS X Users
|
||||
\section1 Notes for Windows and \macos Users
|
||||
|
||||
\list
|
||||
|
||||
\li Windows and OS X do not support the global mouse
|
||||
\li Windows and \macos 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 OS X does not have the concept of ownership;
|
||||
\li Windows and \macos does not have the concept of ownership;
|
||||
the clipboard is a fully global resource so all applications are
|
||||
notified of changes.
|
||||
|
||||
@ -187,7 +187,7 @@ QClipboard::~QClipboard()
|
||||
|
||||
This signal is emitted when the clipboard data is changed.
|
||||
|
||||
On OS X and with Qt version 4.3 or higher, clipboard
|
||||
On \macos and with Qt version 4.3 or higher, clipboard
|
||||
changes made by other applications will only be detected
|
||||
when the application is activated.
|
||||
|
||||
@ -199,7 +199,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 OS X don't support selections.
|
||||
Windows and \macos don't support selections.
|
||||
|
||||
\sa dataChanged(), findBufferChanged(), changed()
|
||||
*/
|
||||
@ -209,7 +209,7 @@ QClipboard::~QClipboard()
|
||||
\since 4.2
|
||||
|
||||
This signal is emitted when the find buffer is changed. This only
|
||||
applies to OS X.
|
||||
applies to \macos.
|
||||
|
||||
With Qt version 4.3 or higher, clipboard changes made by other
|
||||
applications will only be detected when the application is activated.
|
||||
@ -232,7 +232,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 OS X.
|
||||
the Find buffer. This mode is used for holding search strings on \macos.
|
||||
|
||||
\omitvalue LastMode
|
||||
|
||||
|
||||
@ -226,7 +226,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 OS X, the drag and drop operation
|
||||
\b{Note:} On Linux and \macos, 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
|
||||
@ -250,7 +250,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 OS X, the drag and drop operation
|
||||
\b{Note:} On Linux and \macos, 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
|
||||
|
||||
@ -660,7 +660,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 OS X. If that is the
|
||||
have high-resolution trackpads, such as \macos. If that is the
|
||||
case, source() will return Qt::MouseEventSynthesizedBySystem.
|
||||
|
||||
The functions pos() and globalPos() return the mouse cursor's
|
||||
@ -949,7 +949,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
|
||||
|
||||
Returns the scrolling distance in pixels on screen. This value is
|
||||
provided on platforms that support high-resolution pixel-based
|
||||
delta values, such as OS X. The value should be used directly
|
||||
delta values, such as \macos. The value should be used directly
|
||||
to scroll content on screen.
|
||||
|
||||
Example:
|
||||
@ -1090,7 +1090,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
|
||||
Returns the scrolling phase of this wheel event.
|
||||
|
||||
\note The Qt::ScrollBegin and Qt::ScrollEnd phases are currently
|
||||
supported only on OS X.
|
||||
supported only on \macos.
|
||||
*/
|
||||
|
||||
|
||||
@ -1708,7 +1708,7 @@ QCloseEvent::~QCloseEvent()
|
||||
\ingroup events
|
||||
|
||||
Icon drag events are sent to widgets when the main icon of a window
|
||||
has been dragged away. On OS X, this happens when the proxy
|
||||
has been dragged away. On \macos, 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
|
||||
@ -2719,15 +2719,15 @@ Qt::MouseButtons QTabletEvent::buttons() const
|
||||
\row
|
||||
\li Qt::ZoomNativeGesture
|
||||
\li Magnification delta in percent.
|
||||
\li OS X: Two-finger pinch.
|
||||
\li \macos: Two-finger pinch.
|
||||
\row
|
||||
\li Qt::SmartZoomNativeGesture
|
||||
\li Boolean magnification state.
|
||||
\li OS X: Two-finger douple tap (trackpad) / One-finger douple tap (magic mouse).
|
||||
\li \macos: Two-finger douple tap (trackpad) / One-finger douple tap (magic mouse).
|
||||
\row
|
||||
\li Qt::RotateNativeGesture
|
||||
\li Rotation delta in degrees.
|
||||
\li OS X: Two-finger rotate.
|
||||
\li \macos: Two-finger rotate.
|
||||
\endtable
|
||||
|
||||
|
||||
@ -2750,7 +2750,7 @@ Qt::MouseButtons QTabletEvent::buttons() const
|
||||
gesture position relative to the receiving widget or item,
|
||||
window, and screen, respectively.
|
||||
|
||||
\a realValue is the OS X event parameter, \a sequenceId and \a intValue are the Windows event parameters.
|
||||
\a realValue is the \macos event parameter, \a sequenceId and \a intValue are the Windows event parameters.
|
||||
*/
|
||||
QNativeGestureEvent::QNativeGestureEvent(Qt::NativeGestureType type, const QPointF &localPos, const QPointF &windowPos,
|
||||
const QPointF &screenPos, qreal realValue, ulong sequenceId, quint64 intValue)
|
||||
@ -3487,16 +3487,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 OS X.
|
||||
clicking on an file icon in the Finder on \macos.
|
||||
|
||||
This event is only used to notify the application of a request.
|
||||
It may be safely ignored.
|
||||
|
||||
\note This class is currently supported for OS X only.
|
||||
\note This class is currently supported for \macos only.
|
||||
|
||||
\section1 OS X Example
|
||||
\section1 \macos Example
|
||||
|
||||
In order to trigger the event on OS X, the application must be configured
|
||||
In order to trigger the event on \macos, 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
|
||||
@ -3573,13 +3573,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 OS X.
|
||||
sent whenever a the toolbar button is clicked on \macos.
|
||||
|
||||
\ingroup events
|
||||
\inmodule QtGui
|
||||
|
||||
The QToolBarChangeEvent is sent when the toolbar button is clicked. On Mac
|
||||
OS X, this is the long oblong button on the right side of the window
|
||||
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
|
||||
title bar. The default implementation is to toggle the appearance (hidden or
|
||||
shown) of the associated toolbars for the window.
|
||||
*/
|
||||
|
||||
@ -1049,7 +1049,7 @@ QWindow *QGuiApplication::topLevelAt(const QPoint &pos)
|
||||
|
||||
\list
|
||||
\li \c android
|
||||
\li \c cocoa is a platform plugin for OS X.
|
||||
\li \c cocoa is a platform plugin for \macos.
|
||||
\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
|
||||
|
||||
@ -124,7 +124,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 OS X, iOS and Wayland.
|
||||
that (may) have an OS scale factor include \macos, 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
|
||||
|
||||
@ -153,7 +153,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 OS X, it is off. When this feature is off
|
||||
on by default; on \macos, it is off. When this feature is off
|
||||
(that is, when \a b is false), QKeySequence::mnemonic() always
|
||||
returns an empty string.
|
||||
|
||||
@ -217,7 +217,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 OS X, the
|
||||
produces human-readable strings for use in menus. On \macos, the
|
||||
appropriate symbols are used to describe keyboard shortcuts using special
|
||||
keys on the Macintosh keyboard.
|
||||
|
||||
@ -225,12 +225,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 OS X, references to "Ctrl", Qt::CTRL, Qt::Key_Control
|
||||
\note On \macos, 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
|
||||
OS X can use the same shortcut descriptions across all platforms,
|
||||
and their applications will automatically work as expected on OS X.
|
||||
\macos can use the same shortcut descriptions across all platforms,
|
||||
and their applications will automatically work as expected on \macos.
|
||||
|
||||
\section1 Standard Shortcuts
|
||||
|
||||
@ -239,18 +239,18 @@ 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 OS X, the \uicontrol Ctrl value corresponds to the \uicontrol
|
||||
that on \macos, 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 OS X \li KDE \li GNOME
|
||||
\header \li StandardKey \li Windows \li \macos \li KDE \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
|
||||
\row \li Close \li Ctrl+F4, Ctrl+W \li Ctrl+W, Ctrl+F4 \li Ctrl+W \li Ctrl+W
|
||||
\row \li Save \li Ctrl+S \li Ctrl+S \li Ctrl+S \li Ctrl+S
|
||||
\row \li Quit \li \li Ctrl+Q \li Qtrl+Q \li Qtrl+Q
|
||||
\row \li Quit \li \li Ctrl+Q \li Ctrl+Q \li Ctrl+Q
|
||||
\row \li SaveAs \li \li Ctrl+Shift+S \li \li Ctrl+Shift+S
|
||||
\row \li New \li Ctrl+N \li Ctrl+N \li Ctrl+N \li Ctrl+N
|
||||
\row \li Delete \li Del \li Del, Meta+D \li Del, Ctrl+D \li Del, Ctrl+D
|
||||
@ -726,7 +726,7 @@ static const struct {
|
||||
\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 OS X.
|
||||
\value MoveToEndOfBlock Move cursor to end of block. This shortcut is only used on the \macos.
|
||||
\value MoveToEndOfDocument Move cursor to end of document.
|
||||
\value MoveToEndOfLine Move cursor to end of line.
|
||||
\value MoveToNextChar Move cursor to next character.
|
||||
@ -737,7 +737,7 @@ static const struct {
|
||||
\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 OS X.
|
||||
\value MoveToStartOfBlock Move cursor to start of a block. This shortcut is only used on \macos.
|
||||
\value MoveToStartOfDocument Move cursor to start of document.
|
||||
\value MoveToStartOfLine Move cursor to start of line.
|
||||
\value New Create new document.
|
||||
@ -755,7 +755,7 @@ static const struct {
|
||||
\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 OS X.
|
||||
\value SelectEndOfBlock Extend selection to the end of a text block. This shortcut is only used on \macos.
|
||||
\value SelectEndOfDocument Extend selection to end of document.
|
||||
\value SelectEndOfLine Extend selection to end of line.
|
||||
\value SelectNextChar Extend selection to next character.
|
||||
@ -766,7 +766,7 @@ static const struct {
|
||||
\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 OS X.
|
||||
\value SelectStartOfBlock Extend selection to the start of a text block. This shortcut is only used on \macos.
|
||||
\value SelectStartOfDocument Extend selection to start of document.
|
||||
\value SelectStartOfLine Extend selection to start of line.
|
||||
\value Underline Underline text.
|
||||
@ -1523,7 +1523,7 @@ bool QKeySequence::isDetached() const
|
||||
|
||||
If the key sequence has no keys, an empty string is returned.
|
||||
|
||||
On OS X, the string returned resembles the sequence that is
|
||||
On \macos, the string returned resembles the sequence that is
|
||||
shown in the menu bar.
|
||||
|
||||
\sa fromString()
|
||||
|
||||
@ -67,6 +67,7 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
class QOpenGLFunctions;
|
||||
class QOpenGLContext;
|
||||
class QOpenGLFramebufferObject;
|
||||
class QOpenGLMultiGroupSharedResource;
|
||||
|
||||
class Q_GUI_EXPORT QOpenGLSharedResource
|
||||
@ -210,6 +211,7 @@ public:
|
||||
, workaround_missingPrecisionQualifiers(false)
|
||||
, active_engine(0)
|
||||
, qgl_current_fbo_invalid(false)
|
||||
, qgl_current_fbo(Q_NULLPTR)
|
||||
, defaultFboRedirect(0)
|
||||
{
|
||||
requestedFormat = QSurfaceFormat::defaultFormat();
|
||||
@ -248,6 +250,11 @@ public:
|
||||
|
||||
bool qgl_current_fbo_invalid;
|
||||
|
||||
// Set and unset in QOpenGLFramebufferObject::bind()/unbind().
|
||||
// (Only meaningful for QOGLFBO since an FBO might be bound by other means)
|
||||
// Saves us from querying the driver for the current FBO in most paths.
|
||||
QOpenGLFramebufferObject *qgl_current_fbo;
|
||||
|
||||
QVariant nativeHandle;
|
||||
GLuint defaultFboRedirect;
|
||||
|
||||
|
||||
@ -388,7 +388,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 XP, Windows Vista, and the OS X
|
||||
case for both the Windows XP, Windows Vista, and the \macos
|
||||
styles.
|
||||
|
||||
\sa QApplication::setPalette(), QWidget::setPalette(), QColor
|
||||
|
||||
@ -1074,6 +1074,7 @@ bool QOpenGLFramebufferObject::bind()
|
||||
d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
|
||||
|
||||
QOpenGLContextPrivate::get(current)->qgl_current_fbo_invalid = true;
|
||||
QOpenGLContextPrivate::get(current)->qgl_current_fbo = this;
|
||||
|
||||
if (d->format.samples() == 0) {
|
||||
// Create new textures to replace the ones stolen via takeTexture().
|
||||
@ -1113,7 +1114,9 @@ bool QOpenGLFramebufferObject::release()
|
||||
if (current) {
|
||||
d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, current->defaultFramebufferObject());
|
||||
|
||||
QOpenGLContextPrivate::get(current)->qgl_current_fbo_invalid = true;
|
||||
QOpenGLContextPrivate *contextPrv = QOpenGLContextPrivate::get(current);
|
||||
contextPrv->qgl_current_fbo_invalid = true;
|
||||
contextPrv->qgl_current_fbo = Q_NULLPTR;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@ -194,7 +194,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 OS X then you should ensure that you request a Core profile context via
|
||||
on \macos 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
|
||||
|
||||
@ -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 OS X, it is the backend for painting on QImage and it is
|
||||
X11 and \macos, 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 OS X's Quartz2D (CoreGraphics)
|
||||
\value QuickDraw OS X's QuickDraw
|
||||
\value CoreGraphics \macos's Quartz2D (CoreGraphics)
|
||||
\value QuickDraw \macos's QuickDraw
|
||||
\value QWindowSystem Qt for Embedded Linux
|
||||
\value PostScript (No longer supported)
|
||||
\value OpenGL
|
||||
|
||||
@ -943,7 +943,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 OS X).
|
||||
Only some platforms have these restrictions (Qt for Embedded Linux, X11 and \macos).
|
||||
\endomit
|
||||
*/
|
||||
|
||||
|
||||
@ -730,7 +730,7 @@ void QFont::setFamily(const QString &family)
|
||||
Returns the requested font style name, it will be used to match the
|
||||
font with irregular styles (that can't be normalized in other style
|
||||
properties). It depends on system font support, thus only works for
|
||||
OS X and X11 so far. On Windows irregular styles will be added
|
||||
\macos and X11 so far. On Windows irregular styles will be added
|
||||
as separate font families so there is no need for this.
|
||||
|
||||
\sa setFamily(), setStyle()
|
||||
@ -825,7 +825,7 @@ int QFont::pointSize() const
|
||||
\li Vertical hinting (light)
|
||||
\li Full hinting
|
||||
\row
|
||||
\li Cocoa on OS X
|
||||
\li Cocoa on \macos
|
||||
\li No hinting
|
||||
\li No hinting
|
||||
\li No hinting
|
||||
|
||||
@ -2045,7 +2045,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 OS X and iOS, where the system UI fonts are not
|
||||
This happens, for instance, on \macos 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.
|
||||
|
||||
@ -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 OS X. For other
|
||||
platforms, FreeType on Linux platforms and CoreText on \macos. For other
|
||||
font back-ends, the APIs will be disabled.
|
||||
|
||||
QRawFont can be constructed in a number of ways:
|
||||
|
||||
@ -1335,7 +1335,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 QStyle::SH_SpellCeckUnderlineStyle
|
||||
style hint of the QApplication style. By default this is mapped to
|
||||
WaveUnderline, on OS X it is mapped to DashDotLine.
|
||||
WaveUnderline, on \macos it is mapped to DashDotLine.
|
||||
|
||||
\sa Qt::PenStyle
|
||||
*/
|
||||
|
||||
@ -365,7 +365,7 @@ void QNetworkAddressEntry::setBroadcast(const QHostAddress &newBroadcast)
|
||||
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, OS X and the BSDs.
|
||||
on Windows, Linux, \macos and the BSDs.
|
||||
|
||||
\sa QNetworkAddressEntry
|
||||
*/
|
||||
|
||||
@ -1528,7 +1528,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 X, this function will obtain the proxy settings using the
|
||||
On \macos, 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
|
||||
@ -1547,7 +1547,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
|
||||
listed here.
|
||||
|
||||
\list
|
||||
\li On MacOS X, this function will ignore the Proxy Auto Configuration
|
||||
\li On \macos, 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
|
||||
|
||||
@ -427,7 +427,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 OS X, not sharing is the default behavior for binding
|
||||
On Unix and \macos, 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.
|
||||
|
||||
@ -437,7 +437,7 @@
|
||||
socket option.
|
||||
|
||||
\value DefaultForPlatform The default option for the current platform.
|
||||
On Unix and OS X, this is equivalent to (DontShareAddress
|
||||
On Unix and \macos, this is equivalent to (DontShareAddress
|
||||
+ ReuseAddressHint), and on Windows, its equivalent to ShareAddress.
|
||||
*/
|
||||
|
||||
|
||||
@ -147,7 +147,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 OS X, do not
|
||||
Other Unix-based operating systems, such as \macos, do not
|
||||
honor file permissions for Unix domain sockets and by default
|
||||
have WorldAccess and these permission flags will have no effect.
|
||||
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
addDefaultCaCertificates(), and QSslConfiguration::defaultConfiguration().setCaCertificates().
|
||||
\endlist
|
||||
|
||||
\note If available, root certificates on Unix (excluding OS X) will be
|
||||
\note If available, root certificates on Unix (excluding \macos) 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
|
||||
|
||||
@ -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 OS X
|
||||
must be created with another toolkit, such as Cocoa on the \macos
|
||||
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
|
||||
on both platforms.
|
||||
|
||||
|
||||
@ -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 OS X
|
||||
must be created with another toolkit, such as Cocoa on the \macos
|
||||
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
|
||||
on both platforms.
|
||||
|
||||
|
||||
@ -3696,7 +3696,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 OS X, when Qt is built with Cocoa support, a QGLWidget
|
||||
On \macos, 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.
|
||||
|
||||
|
||||
@ -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 OS X systems that provide the \c render_texture
|
||||
and \macos 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
|
||||
OS X, the pbuffer needs a shared context, i.e. the
|
||||
\macos, 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 OS X systems that support the
|
||||
An alternative on Windows and \macos systems that support the
|
||||
\c render_texture extension is to use bindToDynamicTexture() to
|
||||
get dynamic updates of the texture.
|
||||
|
||||
|
||||
@ -2085,7 +2085,6 @@ QVariantList AtSpiAdaptor::getAttributeValue(QAccessibleInterface *interface, in
|
||||
QSpiAttributeSet map;
|
||||
int startOffset;
|
||||
int endOffset;
|
||||
bool defined;
|
||||
|
||||
joined = interface->textInterface()->attributes(offset, &startOffset, &endOffset);
|
||||
attributes = joined.split (QLatin1Char(';'), QString::SkipEmptyParts, Qt::CaseSensitive);
|
||||
@ -2097,7 +2096,7 @@ QVariantList AtSpiAdaptor::getAttributeValue(QAccessibleInterface *interface, in
|
||||
map[attribute.name] = attribute.value;
|
||||
}
|
||||
mapped = map[attributeName];
|
||||
defined = mapped.isEmpty();
|
||||
const bool defined = !mapped.isEmpty();
|
||||
QVariantList list;
|
||||
list << mapped << startOffset << endOffset << defined;
|
||||
return list;
|
||||
|
||||
@ -550,8 +550,11 @@ static void quitQtAndroidPlugin(JNIEnv *env, jclass /*clazz*/)
|
||||
|
||||
static void terminateQt(JNIEnv *env, jclass /*clazz*/)
|
||||
{
|
||||
sem_wait(&m_terminateSemaphore);
|
||||
sem_destroy(&m_terminateSemaphore);
|
||||
// QAndroidEventDispatcherStopper is stopped when the user uses the task manager to kill the application
|
||||
if (!QAndroidEventDispatcherStopper::instance()->stopped()) {
|
||||
sem_wait(&m_terminateSemaphore);
|
||||
sem_destroy(&m_terminateSemaphore);
|
||||
}
|
||||
env->DeleteGlobalRef(m_applicationClass);
|
||||
env->DeleteGlobalRef(m_classLoaderObject);
|
||||
if (m_resourcesObj)
|
||||
@ -571,8 +574,11 @@ static void terminateQt(JNIEnv *env, jclass /*clazz*/)
|
||||
m_androidPlatformIntegration = nullptr;
|
||||
delete m_androidAssetsFileEngineHandler;
|
||||
m_androidAssetsFileEngineHandler = nullptr;
|
||||
sem_post(&m_exitSemaphore);
|
||||
pthread_join(m_qtAppThread, nullptr);
|
||||
|
||||
if (!QAndroidEventDispatcherStopper::instance()->stopped()) {
|
||||
sem_post(&m_exitSemaphore);
|
||||
pthread_join(m_qtAppThread, nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
static void setSurface(JNIEnv *env, jobject /*thiz*/, jint id, jobject jSurface, jint w, jint h)
|
||||
|
||||
@ -758,7 +758,7 @@ QString qt_mac_removeAmpersandEscapes(QString s)
|
||||
returned if it can't be obtained. It is the caller's responsibility to
|
||||
CGContextRelease the context when finished using it.
|
||||
|
||||
\warning This function is only available on OS X.
|
||||
\warning This function is only available on \macos.
|
||||
\warning This function is duplicated in qmacstyle_mac.mm
|
||||
*/
|
||||
CGContextRef qt_mac_cg_context(QPaintDevice *pdev)
|
||||
|
||||
@ -2036,16 +2036,27 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||
return target->mapFromGlobal(source->mapToGlobal(point));
|
||||
}
|
||||
|
||||
- (NSDragOperation) draggingSourceOperationMaskForLocal:(BOOL)isLocal
|
||||
- (NSDragOperation)draggingSession:(NSDraggingSession *)session
|
||||
sourceOperationMaskForDraggingContext:(NSDraggingContext)context
|
||||
{
|
||||
Q_UNUSED(isLocal);
|
||||
Q_UNUSED(session);
|
||||
Q_UNUSED(context);
|
||||
QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag();
|
||||
return qt_mac_mapDropActions(nativeDrag->currentDrag()->supportedActions());
|
||||
}
|
||||
|
||||
- (BOOL) ignoreModifierKeysWhileDragging
|
||||
- (BOOL)ignoreModifierKeysForDraggingSession:(NSDraggingSession *)session
|
||||
{
|
||||
return NO;
|
||||
Q_UNUSED(session);
|
||||
// According to the "Dragging Sources" chapter on Cocoa DnD Programming
|
||||
// (https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/DragandDrop/Concepts/dragsource.html),
|
||||
// if the control, option, or command key is pressed, the source’s
|
||||
// operation mask is filtered to only contain a reduced set of operations.
|
||||
//
|
||||
// Since Qt already takes care of tracking the keyboard modifiers, we
|
||||
// don't need (or want) Cocoa to filter anything. Instead, we'll let
|
||||
// the application do the actual filtering.
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)wantsPeriodicDraggingUpdates
|
||||
@ -2202,27 +2213,27 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||
return response.isAccepted();
|
||||
}
|
||||
|
||||
- (void)draggedImage:(NSImage*) img endedAt:(NSPoint) point operation:(NSDragOperation) operation
|
||||
- (void)draggingSession:(NSDraggingSession *)session
|
||||
endedAtPoint:(NSPoint)screenPoint
|
||||
operation:(NSDragOperation)operation
|
||||
{
|
||||
Q_UNUSED(img);
|
||||
Q_UNUSED(session);
|
||||
Q_UNUSED(operation);
|
||||
QWindow *target = findEventTargetWindow(m_window);
|
||||
if (!target)
|
||||
return;
|
||||
|
||||
// keep our state, and QGuiApplication state (buttons member) in-sync,
|
||||
// or future mouse events will be processed incorrectly
|
||||
// keep our state, and QGuiApplication state (buttons member) in-sync,
|
||||
// or future mouse events will be processed incorrectly
|
||||
NSUInteger pmb = [NSEvent pressedMouseButtons];
|
||||
for (int buttonNumber = 0; buttonNumber < 32; buttonNumber++) { // see cocoaButton2QtButton() for the 32 value
|
||||
if (!(pmb & (1 << buttonNumber)))
|
||||
m_buttons &= ~cocoaButton2QtButton(buttonNumber);
|
||||
}
|
||||
|
||||
NSPoint windowPoint = [self convertPoint: point fromView: nil];
|
||||
NSPoint windowPoint = [self.window convertRectFromScreen:NSMakeRect(screenPoint.x, screenPoint.y, 1, 1)].origin;
|
||||
QPoint qtWindowPoint(windowPoint.x, windowPoint.y);
|
||||
|
||||
NSWindow *window = [self window];
|
||||
NSPoint screenPoint = [window convertRectToScreen:NSMakeRect(point.x, point.y, 0, 0)].origin;
|
||||
QPoint qtScreenPoint = QPoint(screenPoint.x, qt_mac_flipYCoordinate(screenPoint.y));
|
||||
|
||||
QWindowSystemInterface::handleMouseEvent(target, mapWindowCoordinates(m_window, target, qtWindowPoint), qtScreenPoint, m_buttons);
|
||||
|
||||
@ -393,13 +393,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 OS X, the native print dialog is used, which means that
|
||||
On Windows and \macos, 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 OS X does not support setting printer options,
|
||||
The native print dialog on \macos 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
|
||||
OS X. This is no longer supported in Qt 4.5. If you want this
|
||||
\macos. This is no longer supported in Qt 4.5. If you want this
|
||||
functionality, use QPrintDialog::open().
|
||||
|
||||
\sa QPageSetupDialog, QPrinter
|
||||
@ -459,7 +459,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
|
||||
OS X and Windows platforms, because the dialog is required to be modal
|
||||
\macos and Windows platforms, because the dialog is required to be modal
|
||||
and only the user can close it.
|
||||
|
||||
\sa QDialog::done()
|
||||
|
||||
@ -56,12 +56,12 @@ QT_BEGIN_NAMESPACE
|
||||
\ingroup printing
|
||||
\inmodule QtPrintSupport
|
||||
|
||||
On Windows and OS X the page setup dialog is implemented using
|
||||
On Windows and \macos the page setup dialog is implemented using
|
||||
the native page setup dialogs.
|
||||
|
||||
Note that on Windows and OS X custom paper sizes won't be
|
||||
Note that on Windows and \macos 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 OS X
|
||||
page margins set on a QPrinter won't show in the native \macos
|
||||
page setup dialog.
|
||||
|
||||
\sa QPrinter, QPrintDialog
|
||||
|
||||
@ -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 OS X, QPrinter uses
|
||||
When printing directly to a printer on Windows or \macos, 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,
|
||||
@ -916,7 +916,7 @@ QString QPrinter::outputFileName() const
|
||||
|
||||
QPrinter uses Qt's cross-platform PDF print engines
|
||||
respectively. If you can produce this format natively, for example
|
||||
OS X can generate PDF's from its print engine, set the output format
|
||||
\macos can generate PDF's from its print engine, set the output format
|
||||
back to NativeFormat.
|
||||
|
||||
\sa outputFileName(), setOutputFormat()
|
||||
@ -1386,7 +1386,7 @@ QPrinter::ColorMode QPrinter::colorMode() const
|
||||
\obsolete
|
||||
Returns the number of copies to be printed. The default value is 1.
|
||||
|
||||
On Windows, OS X and X11 systems that support CUPS, this will always
|
||||
On Windows, \macos and X11 systems that support CUPS, this will always
|
||||
return 1 as these operating systems can internally handle the number
|
||||
of copies.
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@
|
||||
\target building
|
||||
\section1 Building the Drivers Using Configure
|
||||
|
||||
On Unix and OS X, the Qt \c configure script tries to
|
||||
On Unix and \macos, the Qt \c configure script tries to
|
||||
automatically detect the available client libraries on your
|
||||
machine. Run \c{configure -help} to see what drivers can be
|
||||
built. You should get an output similar to this:
|
||||
@ -139,7 +139,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 OS X
|
||||
\section3 How to Build the QMYSQL Plugin on Unix and \macos
|
||||
|
||||
You need the MySQL header files and as well as the shared library
|
||||
\c{libmysqlclient.so}. Depending on your Linux distribution you may
|
||||
@ -208,7 +208,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 OS X
|
||||
\section3 How to Build the OCI Plugin on Unix and \macos
|
||||
|
||||
For Oracle 10g, all you need is the "Instant Client Package - Basic" and
|
||||
"Instant Client Package - SDK". For Oracle prior to 10g, you require
|
||||
@ -343,7 +343,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 OS X
|
||||
\section3 How to Build the ODBC Plugin on Unix and \macos
|
||||
|
||||
It is recommended that you use unixODBC. You can find the latest
|
||||
version and ODBC drivers at \l http://www.unixodbc.org.
|
||||
@ -400,7 +400,7 @@
|
||||
Binary Large Objects are supported through the \c BYTEA field type in
|
||||
PostgreSQL server versions >= 7.1.
|
||||
|
||||
\section3 How to Build the QPSQL Plugin on Unix and OS X
|
||||
\section3 How to Build the QPSQL Plugin on Unix and \macos
|
||||
|
||||
You need the PostgreSQL client library and headers installed.
|
||||
|
||||
@ -440,7 +440,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 OS X
|
||||
\section3 How to Build the QTDS Plugin on Unix and \macos
|
||||
|
||||
Under Unix, two libraries are available which support the TDS protocol:
|
||||
|
||||
@ -493,7 +493,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 OS X
|
||||
\section3 How to Build the QDB2 Plugin on Unix and \macos
|
||||
|
||||
\snippet code/doc_src_sql-driver.qdoc 18
|
||||
|
||||
@ -643,7 +643,7 @@
|
||||
|
||||
\snippet code/doc_src_sql-driver.cpp 26
|
||||
|
||||
\section3 How to Build the QIBASE Plugin on Unix and OS X
|
||||
\section3 How to Build the QIBASE Plugin on Unix and \macos
|
||||
|
||||
The following assumes InterBase or Firebird is installed in
|
||||
\c{/opt/interbase}:
|
||||
|
||||
@ -317,7 +317,7 @@
|
||||
\li All platforms
|
||||
\row \li CPU tick counter
|
||||
\li -tickcounter
|
||||
\li Windows, OS X, Linux, many UNIX-like systems.
|
||||
\li Windows, \macos, Linux, many UNIX-like systems.
|
||||
\row \li Event Counter
|
||||
\li -eventcounter
|
||||
\li All platforms
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.0 KiB |
@ -541,8 +541,8 @@ 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 Mac
|
||||
OS X platform. If you still require this function, use the
|
||||
\note This function does not apply to the Native Color Dialog on the
|
||||
\macos platform. If you still require this function, use the
|
||||
QColorDialog::DontUseNativeDialog option.
|
||||
*/
|
||||
void QColorDialog::setCustomColor(int index, QColor color)
|
||||
@ -563,8 +563,8 @@ 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 Mac
|
||||
OS X platform. If you still require this function, use the
|
||||
\note This function does not apply to the Native Color Dialog on the
|
||||
\macos platform. If you still require this function, use the
|
||||
QColorDialog::DontUseNativeDialog option.
|
||||
*/
|
||||
void QColorDialog::setStandardColor(int index, QColor color)
|
||||
|
||||
@ -2076,7 +2076,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 OS X, this static function will use the
|
||||
On Windows, and \macos, 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
|
||||
@ -2187,7 +2187,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 OS X, this static function will use the
|
||||
On Windows, and \macos, 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
|
||||
@ -2310,12 +2310,12 @@ QList<QUrl> QFileDialog::getOpenFileUrls(QWidget *parent,
|
||||
The dialog's caption is set to \a caption. If \a caption is not specified,
|
||||
a default caption will be used.
|
||||
|
||||
On Windows, and OS X, this static function will use the
|
||||
On Windows, and \macos, 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 0 then it will position the
|
||||
dialog just below the parent's title bar. On OS X, with its native file
|
||||
dialog just below the parent's title bar. On \macos, with its native file
|
||||
dialog, the filter argument is ignored.
|
||||
|
||||
On Unix/X11, the normal behavior of the file dialog is to resolve and
|
||||
@ -2418,7 +2418,7 @@ QUrl QFileDialog::getSaveFileUrl(QWidget *parent,
|
||||
pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must
|
||||
be set.
|
||||
|
||||
On Windows and OS X, this static function will use the
|
||||
On Windows and \macos, 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
|
||||
|
||||
@ -584,7 +584,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}
|
||||
{OS X Guidelines}. Similar guidelines apply for the other
|
||||
{\macos Guidelines}. Similar guidelines apply for the other
|
||||
platforms, but note the different ways the
|
||||
\l{QMessageBox::informativeText} {informative text} is handled for
|
||||
different platforms.
|
||||
@ -799,7 +799,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 OS X, if you want your message box to appear
|
||||
On \macos, 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.
|
||||
@ -821,7 +821,7 @@ QMessageBox::QMessageBox(QWidget *parent)
|
||||
The message box is an \l{Qt::ApplicationModal} {application modal}
|
||||
dialog box.
|
||||
|
||||
On OS X, if \a parent is not 0 and you want your message box
|
||||
On \macos, if \a parent is not 0 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.
|
||||
@ -989,7 +989,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 OS X only, if there is exactly one button with the role
|
||||
\li On \macos only, if there is exactly one button with the role
|
||||
QMessageBox::RejectRole, it is made the escape button.
|
||||
\endlist
|
||||
|
||||
@ -1800,7 +1800,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 OS X, the
|
||||
The about box has a single button labelled "OK". On \macos, the
|
||||
about box is popped up as a modeless window; on other platforms,
|
||||
it is currently application modal.
|
||||
|
||||
@ -1854,7 +1854,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
|
||||
|
||||
QApplication provides this functionality as a slot.
|
||||
|
||||
On OS X, the about box is popped up as a modeless window; on
|
||||
On \macos, the about box is popped up as a modeless window; on
|
||||
other platforms, it is currently application modal.
|
||||
|
||||
\sa QApplication::aboutQt()
|
||||
@ -2616,8 +2616,8 @@ void QMessageBox::setInformativeText(const QString &text)
|
||||
|
||||
This function shadows QWidget::setWindowTitle().
|
||||
|
||||
Sets the title of the message box to \a title. On OS X,
|
||||
the window title is ignored (as required by the OS X
|
||||
Sets the title of the message box to \a title. On \macos,
|
||||
the window title is ignored (as required by the \macos
|
||||
Guidelines).
|
||||
*/
|
||||
void QMessageBox::setWindowTitle(const QString &title)
|
||||
@ -2638,7 +2638,7 @@ void QMessageBox::setWindowTitle(const QString &title)
|
||||
|
||||
Sets the modality of the message box to \a windowModality.
|
||||
|
||||
On OS X, if the modality is set to Qt::WindowModal and the message box
|
||||
On \macos, 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.
|
||||
*/
|
||||
|
||||
@ -1823,7 +1823,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
|
||||
|
||||
\inmodule QtWidgets
|
||||
|
||||
A wizard (also called an assistant on OS X) is a special type
|
||||
A wizard (also called an assistant on \macos) 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
|
||||
@ -2121,10 +2121,10 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
|
||||
|
||||
This enum specifies the buttons in a wizard.
|
||||
|
||||
\value BackButton The \uicontrol Back button (\uicontrol {Go Back} on OS X)
|
||||
\value NextButton The \uicontrol Next button (\uicontrol Continue on OS X)
|
||||
\value BackButton The \uicontrol Back button (\uicontrol {Go Back} on \macos)
|
||||
\value NextButton The \uicontrol Next button (\uicontrol Continue on \macos)
|
||||
\value CommitButton The \uicontrol Commit button
|
||||
\value FinishButton The \uicontrol Finish button (\uicontrol Done on OS X)
|
||||
\value FinishButton The \uicontrol Finish button (\uicontrol Done on \macos)
|
||||
\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)
|
||||
@ -2164,7 +2164,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
|
||||
|
||||
\value ClassicStyle Classic Windows look
|
||||
\value ModernStyle Modern Windows look
|
||||
\value MacStyle OS X look
|
||||
\value MacStyle \macos look
|
||||
\value AeroStyle Windows Aero look
|
||||
|
||||
\omitvalue NStyles
|
||||
@ -2637,7 +2637,7 @@ bool QWizard::testOption(WizardOption option) const
|
||||
|
||||
\list
|
||||
\li Windows: HelpButtonOnRight.
|
||||
\li OS X: NoDefaultButton and NoCancelButton.
|
||||
\li \macos: NoDefaultButton and NoCancelButton.
|
||||
\li X11 and QWS (Qt for Embedded Linux): none.
|
||||
\endlist
|
||||
|
||||
@ -2681,7 +2681,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 OS X, the \uicontrol Next button is called \uicontrol
|
||||
example, on \macos, the \uicontrol Next button is called \uicontrol
|
||||
Continue.
|
||||
|
||||
To add extra buttons to the wizard (e.g., a \uicontrol Print button),
|
||||
@ -2713,7 +2713,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 OS X, the \uicontrol Next button is called \uicontrol
|
||||
example, on \macos, the \uicontrol Next button is called \uicontrol
|
||||
Continue.
|
||||
|
||||
\sa button(), setButton(), setButtonText(), QWizardPage::buttonText(),
|
||||
@ -2899,7 +2899,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
|
||||
OS X.
|
||||
\macos.
|
||||
|
||||
\sa QWizardPage::pixmap(), {Elements of a Wizard Page}
|
||||
*/
|
||||
@ -3810,7 +3810,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 OS X, the \uicontrol Next button is called \uicontrol
|
||||
For example, on \macos, the \uicontrol Next button is called \uicontrol
|
||||
Continue.
|
||||
|
||||
\sa setButtonText(), QWizard::buttonText(), QWizard::setButtonText()
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
//! [0]
|
||||
setCellWidget(index, new QLineEdit);
|
||||
setCellWidget(row, column, new QLineEdit);
|
||||
...
|
||||
setCellWidget(index, new QTextEdit);
|
||||
setCellWidget(row, column, new QTextEdit);
|
||||
//! [0]
|
||||
|
||||
@ -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 OS X.
|
||||
Qt::Drawer flags that are common on \macos.
|
||||
|
||||
\section3 QGraphicsLayout
|
||||
|
||||
|
||||
@ -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 OS X and X11, it's handled by
|
||||
widget that has keyboard focus. On \macos 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, OS X, and X11.
|
||||
Windows, \macos, and X11.
|
||||
|
||||
\section2 The User Moves the Focus to This Window
|
||||
|
||||
|
||||
@ -115,7 +115,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
|
||||
OS X), but it isn't mandatory.
|
||||
\macos), 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
|
||||
|
||||
@ -80,7 +80,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 XP and OS X) by the
|
||||
platforms' guidelines and (on Windows XP and \macos) by the
|
||||
native theme engine.
|
||||
|
||||
Style sheets let you perform all kinds of customizations that are
|
||||
@ -121,7 +121,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 OS X
|
||||
\li Pagefold theme running on \macos
|
||||
\endtable
|
||||
|
||||
When a style sheet is active, the QStyle returned by QWidget::style()
|
||||
@ -130,7 +130,7 @@
|
||||
otherwise forwards the drawing operations to the underlying,
|
||||
platform-specific style (e.g., QWindowsXPStyle on Windows XP).
|
||||
|
||||
Since Qt 4.5, Qt style sheets fully supports OS X.
|
||||
Since Qt 4.5, Qt style sheets fully supports \macos.
|
||||
|
||||
*/
|
||||
|
||||
@ -3807,7 +3807,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 OS X, you can use the following
|
||||
(instead of the edges) like on \macos, you can use the following
|
||||
stylesheet:
|
||||
\snippet code/doc_src_stylesheet.qdoc 136
|
||||
|
||||
|
||||
@ -110,7 +110,7 @@
|
||||
make sure that the executable is on your path, or enter its
|
||||
full location.
|
||||
|
||||
\li On Linux/Unix and OS X, type \c make and press
|
||||
\li On Linux/Unix and \macos, type \c make and press
|
||||
\uicontrol{Return}; on Windows with Visual Studio, type \c nmake and
|
||||
press \uicontrol{Return}.
|
||||
|
||||
|
||||
@ -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 OS X, this means the menu button was pressed.
|
||||
Windows and \macos, 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).
|
||||
|
||||
@ -255,7 +255,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 OS X.
|
||||
This enum describes how an action should be moved into the application menu on \macos.
|
||||
|
||||
\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
|
||||
@ -264,7 +264,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 OS X - Deployment}).
|
||||
\c{Info.plist} file in the application's bundle (See \l{Qt for macOS - 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.
|
||||
|
||||
@ -1237,12 +1237,12 @@ void QAction::activate(ActionEvent event)
|
||||
\brief the action's menu role
|
||||
\since 4.2
|
||||
|
||||
This indicates what role the action serves in the application menu on Mac
|
||||
OS X. By default all actions have the TextHeuristicRole, which means that
|
||||
This indicates what role the action serves in the application menu on
|
||||
\macos. 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 OS X (usually just before the first application window is
|
||||
bar in \macos (usually just before the first application window is
|
||||
shown).
|
||||
*/
|
||||
void QAction::setMenuRole(MenuRole menuRole)
|
||||
|
||||
@ -1535,7 +1535,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 XP,
|
||||
Windows Vista, and OS X styles.
|
||||
Windows Vista, and \macos styles.
|
||||
|
||||
\sa QWidget::setPalette(), palette(), QStyle::polish()
|
||||
*/
|
||||
@ -4016,7 +4016,7 @@ bool QApplication::keypadNavigationEnabled()
|
||||
|
||||
Currently this function does nothing on Qt for Embedded Linux.
|
||||
|
||||
On OS X, this works more at the application level and will cause the
|
||||
On \macos, 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
|
||||
|
||||
@ -149,7 +149,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 OS X, or the task bar on Windows). The default screen is used if
|
||||
on \macos, or the task bar on Windows). The default screen is used if
|
||||
\a screen is -1.
|
||||
|
||||
\sa screenNumber(), screenGeometry()
|
||||
|
||||
@ -1019,7 +1019,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}{Mac OS X Aqua} and KDE guidelines specify that the
|
||||
\l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macos Aqua} and KDE guidelines specify that the
|
||||
labels should be right-aligned, whereas Windows and GNOME
|
||||
applications normally use left-alignment.
|
||||
|
||||
@ -1062,7 +1062,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}{Mac OS X Aqua} guidelines. Labels are right-aligned,
|
||||
\l{http://developer.apple.com/library/mac/#documentation/UserExperience/Conceptual/AppleHIGuidelines/Intro/Intro.html}{\macos 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
|
||||
|
||||
@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
\note Calling QSurfaceFormat::setDefaultFormat() before constructing
|
||||
the QApplication instance is mandatory on some platforms (for example,
|
||||
OS X) when an OpenGL core profile context is requested. This is to
|
||||
\macos) 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. OS X) too. The stable,
|
||||
certain desktop platforms (e.g. \macos) too. The stable,
|
||||
cross-platform solution is always QOpenGLWidget.
|
||||
|
||||
\e{OpenGL is a trademark of Silicon Graphics, Inc. in the United States and other
|
||||
|
||||
@ -247,7 +247,7 @@ QSizePolicy::ControlType QSizePolicy::controlType() const
|
||||
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 Mac OS X Aqua guidelines specify that push buttons should be
|
||||
the \macos Aqua guidelines specify that push buttons should be
|
||||
separated by 12 pixels, whereas vertically stacked radio buttons
|
||||
only require 6 pixels.
|
||||
|
||||
|
||||
@ -2521,7 +2521,7 @@ QWidget *QWidget::find(WId id)
|
||||
If a widget is non-native (alien) and winId() is invoked on it, that widget
|
||||
will be provided a native handle.
|
||||
|
||||
On OS X, the type returned depends on which framework Qt was linked
|
||||
On \macos, the type returned depends on which framework Qt was linked
|
||||
against. If Qt is using Carbon, the {WId} is actually an HIViewRef. If Qt
|
||||
is using Cocoa, {WId} is a pointer to an NSView.
|
||||
|
||||
@ -2648,7 +2648,7 @@ QWindow *QWidget::windowHandle() 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 OS X.
|
||||
Since Qt 4.5, Qt style sheets fully supports \macos.
|
||||
|
||||
\warning Qt style sheets are currently not supported for custom QStyle
|
||||
subclasses. We plan to address this in some future release.
|
||||
@ -5141,7 +5141,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 OS X the widget will be
|
||||
\note The \a painter must be active. On \macos the widget will be
|
||||
rendered into a QPixmap and then drawn by the \a painter.
|
||||
|
||||
\sa QPainter::device()
|
||||
@ -6285,7 +6285,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 OS X, this has an added benefit that it sets the
|
||||
Additionally, on \macos, 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.
|
||||
|
||||
@ -11330,7 +11330,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, OS X, Windows,
|
||||
This feature is available on Embedded Linux, \macos, Windows,
|
||||
and X11 platforms that support the Composite extension.
|
||||
|
||||
This feature is not available on Windows CE.
|
||||
@ -11393,7 +11393,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 OS X the close button will have a
|
||||
varied by the platform. On \macos the close button will have a
|
||||
modified look; on other platforms, the window title will have an
|
||||
'*' (asterisk).
|
||||
|
||||
@ -12542,7 +12542,7 @@ static void releaseMouseGrabOfWidget(QWidget *widget)
|
||||
|
||||
\note On Windows, grabMouse() only works when the mouse is inside a window
|
||||
owned by the process.
|
||||
On OS X, grabMouse() only works when the mouse is inside the frame of that widget.
|
||||
On \macos, grabMouse() only works when the mouse is inside the frame of that widget.
|
||||
|
||||
\sa releaseMouse(), grabKeyboard(), releaseKeyboard()
|
||||
*/
|
||||
@ -13014,7 +13014,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
|
||||
This function will return 0 if no painter context can be established, or if the handle
|
||||
could not be created.
|
||||
|
||||
\warning This function is only available on OS X.
|
||||
\warning This function is only available on \macos.
|
||||
*/
|
||||
/*! \fn Qt::HANDLE QWidget::macQDHandle() const
|
||||
\internal
|
||||
@ -13023,7 +13023,7 @@ QDebug operator<<(QDebug debug, const QWidget *widget)
|
||||
This function will return 0 if QuickDraw is not supported, or if the handle could
|
||||
not be created.
|
||||
|
||||
\warning This function is only available on OS X.
|
||||
\warning This function is only available on \macos.
|
||||
*/
|
||||
/*! \fn const QX11Info &QWidget::x11Info() const
|
||||
\internal
|
||||
|
||||
@ -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 {OS X}: If you add a widget to a menu in the application's menu
|
||||
bar on OS X, the widget will be added and it will function but with some
|
||||
\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
|
||||
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 Mac OS X 10.4 (known bug acknowledged
|
||||
dialog will cause a crash in \macos 10.4 (known bug acknowledged
|
||||
by Apple), a workaround is to use a QueuedConnection instead of a
|
||||
DirectConnection.
|
||||
\endlist
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
|
||||
/*!
|
||||
\class QMacStyle
|
||||
\brief The QMacStyle class provides a OS X style using the Apple Appearance Manager.
|
||||
\brief The QMacStyle class provides a \macos style using the Apple Appearance Manager.
|
||||
|
||||
\ingroup appearance
|
||||
\inmodule QtWidgets
|
||||
@ -36,10 +36,10 @@
|
||||
|
||||
This class is implemented as a wrapper to the HITheme
|
||||
APIs, allowing applications to be styled according to the current
|
||||
theme in use on OS X. This is done by having primitives
|
||||
in QStyle implemented in terms of what OS X would normally theme.
|
||||
theme in use on \macos. This is done by having primitives
|
||||
in QStyle implemented in terms of what \macos would normally theme.
|
||||
|
||||
\warning This style is only available on OS X because it relies on the
|
||||
\warning This style is only available on \macos because it relies on the
|
||||
HITheme APIs.
|
||||
|
||||
There are additional issues that should be taken
|
||||
@ -56,7 +56,7 @@
|
||||
involve horizontal and vertical widget alignment and widget size
|
||||
(covered below).
|
||||
|
||||
\li Widget size - OS X allows widgets to have specific fixed sizes. Qt
|
||||
\li Widget size - \macos allows widgets to have specific fixed sizes. Qt
|
||||
does not fully implement this behavior so as to maintain cross-platform
|
||||
compatibility. As a result some widgets sizes may be inappropriate (and
|
||||
subsequently not rendered correctly by the HITheme APIs).The
|
||||
@ -75,7 +75,7 @@
|
||||
There are other issues that need to be considered in the feel of
|
||||
your application (including the general color scheme to match the
|
||||
Aqua colors). The Guidelines mentioned above will remain current
|
||||
with new advances and design suggestions for OS X.
|
||||
with new advances and design suggestions for \macos.
|
||||
|
||||
Note that the functions provided by QMacStyle are
|
||||
reimplementations of QStyle functions; see QStyle for their
|
||||
|
||||
@ -7197,7 +7197,7 @@ static CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *paintD
|
||||
returned if it can't be obtained. It is the caller's responsibility to
|
||||
CGContextRelease the context when finished using it.
|
||||
|
||||
\warning This function is only available on OS X.
|
||||
\warning This function is only available on \macos.
|
||||
\warning This function is duplicated in the Cocoa platform plugin.
|
||||
*/
|
||||
|
||||
|
||||
@ -104,7 +104,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 OS X),
|
||||
special effects (such as animated default buttons on \macos),
|
||||
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.
|
||||
@ -203,7 +203,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 OS X), but it isn't
|
||||
(such as animated default buttons on \macos), 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.
|
||||
|
||||
@ -1731,7 +1731,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 OS X), or if the
|
||||
to move towards the submenu (like it is on \macos), or if the
|
||||
cursor can move in any direction as long as it reaches the
|
||||
submenu before the sloppy timeout.
|
||||
|
||||
|
||||
@ -1750,7 +1750,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 OS X).
|
||||
\value Scroller A popup menu scroller (currently only used on \macos).
|
||||
\value TearOff A tear-off handle for the menu.
|
||||
\value Margin The margin of the menu.
|
||||
\value EmptyArea The empty area of the menu.
|
||||
|
||||
@ -564,7 +564,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 OS X.
|
||||
windowing system, for example on \macos.
|
||||
*/
|
||||
QPointF QScroller::pixelPerMeter() const
|
||||
{
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user