diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-10-25 14:32:09 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-28 08:39:07 +0100 |
| commit | 5dcc36b15c479f532ffd0b5c1330e683fcf8781e (patch) | |
| tree | 3905c0e38dde332e253c3e3c967bbc32022d4b57 /src/corelib/global | |
| parent | 24539dc3d8054e7cb6862e5601586f837d1e21c3 (diff) | |
Add a -libexecdir option to the configures
User applications are those that users run directly, whether it be for
development or not. The executable binaries that the user does not
usually run but is still required for proper functioning are called
"program executables" in Autoconf and they are placed in libexec.
This commit adds support for "program executables" in Qt by adding the
-libexecdir option to the configures, the qmake variable
QT_INSTALL_LIBEXECS (note the plural, to match all other properties),
and QLibraryInfo::LibraryExecutables.
At the time of this commit, the only expected "program executable" is
the QtWebProcess, the WebKit2 helper process from QtWebKit.
Change-Id: I66c3a3e0cf7f9d93b5f88f55f18e957faff608fc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a756577311..a8dc086b55 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -267,12 +267,13 @@ QLibraryInfo::isDebugBuild() */ static const struct { - char key[14], value[13]; + char key[19], value[13]; } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc { "Headers", "include" }, { "Libraries", "lib" }, + { "LibraryExecutables", "libexec" }, // should be ${ArchData}/libexec { "Binaries", "bin" }, { "Plugins", "plugins" }, // should be ${ArchData}/plugins { "Imports", "imports" }, // should be ${ArchData}/imports @@ -452,6 +453,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) \value DocumentationPath The location for documentation upon install. \value HeadersPath The location for all headers. \value LibrariesPath The location of installed libraries. + \value LibraryExecutablesPath The location of installed executables required by libraries at runtime. \value BinariesPath The location of installed Qt binaries (tools and applications). \value PluginsPath The location of installed Qt plugins. \value ImportsPath The location of installed QML extensions to import (QML 1.x). diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 5d6e42965f..a574b4b04a 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -67,6 +67,7 @@ public: DocumentationPath, HeadersPath, LibrariesPath, + LibraryExecutablesPath, BinariesPath, PluginsPath, ImportsPath, |