diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 15:34:24 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-02 15:34:24 (GMT) |
commit | ba8892c1a833899c23703a5da1978cbfe7c92725 (patch) | |
tree | ab491c30801efc5ee226e4963df9edc265b582a5 /src/corelib/kernel | |
parent | 57d33781bd8e02904a85de7fc54f8f4e8bd299e6 (diff) | |
parent | 64581bfcb285a2c51e5bb0facd9dc82fb53c6875 (diff) | |
download | Qt-ba8892c1a833899c23703a5da1978cbfe7c92725.zip Qt-ba8892c1a833899c23703a5da1978cbfe7c92725.tar.gz Qt-ba8892c1a833899c23703a5da1978cbfe7c92725.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (23 commits)
Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"
Revert "Using RunFast mode for RVCT" until compilation
New Symbian signed sqlite3.sis with backup_registration.xml
Fixed def files on Symbian.
Added some missing documentation.
Fixed text rendering via scaled QPainter on rasterPaintEngine / Symbian
Documented limitations of add/setLibraryPath(s) on Symbian OS
Deployed QtMultimedia.dll on Symbian
Fixed the URL of known issues wiki page in docs
Fixing benchmark to be runnable on Symbian device
Fixing test to be runnable on Symbian devices.
Fixed no-timeout case for QProcess::waitForFinished in Symbian
Add visibility-inlines-hidden for GCCE on Symbian OS
Catch by reference rather than by value
Fixing benchmark for Symbian
Remove warning about Symbian DEF files when running configure for Windows
List item margins are too small due to invalid pixel metric value
Remove left over forward declarations
Avoided the loss of preedit text when losing focus on Symbian.
Added support for ifdeffing for manufacturer in generated pkg files
...
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 005dedc..e3137f0 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2267,6 +2267,10 @@ QStringList QCoreApplication::libraryPaths() \a paths. All existing paths will be deleted and the path list will consist of the paths given in \a paths. + In Symbian this function is only useful for setting paths for + finding Qt extension plugin stubs, since the OS can only + load libraries from the \c{/sys/bin} directory. + \sa libraryPaths(), addLibraryPath(), removeLibraryPath(), QLibrary */ void QCoreApplication::setLibraryPaths(const QStringList &paths) @@ -2290,6 +2294,10 @@ void QCoreApplication::setLibraryPaths(const QStringList &paths) is \c INSTALL/plugins, where \c INSTALL is the directory where Qt was installed. + In Symbian this function is only useful for adding paths for + finding Qt extension plugin stubs, since the OS can only + load libraries from the \c{/sys/bin} directory. + \sa removeLibraryPath(), libraryPaths(), setLibraryPaths() */ void QCoreApplication::addLibraryPath(const QString &path) |