diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 00:00:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 00:00:31 (GMT) |
| commit | 0bd5f5969c556f89bf146211772a315f25a23e99 (patch) | |
| tree | f75c573eba1ed9c64519cbb2d9630a1ce41ea83d | |
| parent | e12448b0e00a70377591fbe9b3180dcb5f37e533 (diff) | |
| parent | 362641ec2bdf5e05b4adfc54275c1c4869759d56 (diff) | |
| download | Qt-0bd5f5969c556f89bf146211772a315f25a23e99.zip Qt-0bd5f5969c556f89bf146211772a315f25a23e99.tar.gz Qt-0bd5f5969c556f89bf146211772a315f25a23e99.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: typo fixed in qlibraryinfo.cpp
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index a9ea44a..4b56efc 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -467,7 +467,7 @@ QLibraryInfo::location(LibraryLocation loc) \value PrefixPath The default prefix for all paths. \value DocumentationPath The location for documentation upon install. \value HeadersPath The location for all headers. - \value LibrariesPath The location of installed librarires. + \value LibrariesPath The location of installed libraries. \value BinariesPath The location of installed Qt binaries (tools and applications). \value PluginsPath The location of installed Qt plugins. \value DataPath The location of general Qt data. |