Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 07:22:25 +0000 (17:22 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 07:22:25 +0000 (17:22 +1000)
commit800c9df03328db934ccadb94fe75c684ed282aa1
treec7bf720b97daa2a99c738a6cde9f4488293de652
parent09b3ebb0693a7c1449bfb86885c13deca71d98b1
parent290dcfcbb93733f7308c7676f211bd67a775a56d
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.
src/corelib/plugin/qlibrary_unix.cpp