diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 07:22:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 07:22:25 (GMT) |
| commit | 800c9df03328db934ccadb94fe75c684ed282aa1 (patch) | |
| tree | c7bf720b97daa2a99c738a6cde9f4488293de652 /src/corelib | |
| parent | 09b3ebb0693a7c1449bfb86885c13deca71d98b1 (diff) | |
| parent | 290dcfcbb93733f7308c7676f211bd67a775a56d (diff) | |
| download | Qt-800c9df03328db934ccadb94fe75c684ed282aa1.zip Qt-800c9df03328db934ccadb94fe75c684ed282aa1.tar.gz Qt-800c9df03328db934ccadb94fe75c684ed282aa1.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QLibrary: support .so file extension on AIX.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/plugin/qlibrary_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 0a7e841..a5aadac 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -135,12 +135,12 @@ bool QLibraryPrivate::load_sys() } else { suffixes << QLatin1String(".sl"); } -#elif defined(Q_OS_AIX) - suffixes << ".a"; - #elif defined(Q_OS_SYMBIAN) suffixes << QLatin1String(".dll"); #else +#ifdef Q_OS_AIX + suffixes << ".a"; +#endif // Q_OS_AIX if (!fullVersion.isEmpty()) { suffixes << QString::fromLatin1(".so.%1").arg(fullVersion); } else { |