diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 17:42:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-03 17:42:03 +0200 |
| commit | 8b99445755bac9c1bc1c2ce84a6e21edadca1f11 (patch) | |
| tree | 8a0f4f4fb3ec2837a23b7d6a3b9774d1ab9458d6 /src/corelib | |
| parent | b2d7168313a5d64ff1cf0061e94f9b2eba074af4 (diff) | |
| parent | a4121a21c010d8b9d3a80d9c4cfe5e5c72f5f0fa (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/doc/src/objectmodel/properties.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/doc/src/objectmodel/properties.qdoc b/src/corelib/doc/src/objectmodel/properties.qdoc index 65e23d9dc7..d1690c5908 100644 --- a/src/corelib/doc/src/objectmodel/properties.qdoc +++ b/src/corelib/doc/src/objectmodel/properties.qdoc @@ -195,7 +195,7 @@ Suppose we have a class MyClass, which is derived from QObject and which uses the Q_OBJECT macro in its private section. We want to - declare a property in MyClass to keep track of a priorty + declare a property in MyClass to keep track of a priority value. The name of the property will be \e priority, and its type will be an enumeration type named \e Priority, which is defined in MyClass. diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 747fd87207..5fb9640b19 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -273,7 +273,11 @@ static const struct { { "Documentation", "doc" }, // should be ${Data}/doc { "Headers", "include" }, { "Libraries", "lib" }, +#ifdef Q_OS_WIN + { "LibraryExecutables", "bin" }, +#else { "LibraryExecutables", "libexec" }, // should be ${ArchData}/libexec +#endif { "Binaries", "bin" }, { "Plugins", "plugins" }, // should be ${ArchData}/plugins { "Imports", "imports" }, // should be ${ArchData}/imports |