diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-25 15:12:09 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-26 09:49:22 +0100 |
| commit | b51c9d689d5f1d01f97e4ba151fafccc48e6766c (patch) | |
| tree | 9e6518155e612e365b479a85673a4c392cee7f65 /src/corelib/global | |
| parent | 11e9f1368be986d0e128e8f7b2423d9cc7dd5436 (diff) | |
qt.conf: default LibraryExecutables to bin/ on windows
this matches the platform-specific configure default.
as a "side effect", this fixes the in-builddir execution of webkit
examples, as the non-installed qmake now agrees with QLibraryInfo about
the location of QWebProcess.exe.
Task-number: QTBUG-30322
Change-Id: Id28f2c246e4bfda6d5f4d719a66a16f24bb7cdb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
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 |