diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 15:43:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 15:43:39 +0200 |
| commit | a4121a21c010d8b9d3a80d9c4cfe5e5c72f5f0fa (patch) | |
| tree | c2618ca887eb02f5069c5577440881e6aa1150f6 /src/corelib/global | |
| parent | 448c3e85dddbfc5c101aceeeceb8584a3d41c913 (diff) | |
| parent | e777e3f1ecc72d0958386ac6975c45c8d36081f1 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 |