diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 06:48:28 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 06:48:28 (GMT) |
commit | bc331aca61a2f212a347708c9d44a4fb092183fd (patch) | |
tree | c378747bdbb3e87272a15b6f67b28133a9fc7232 /demos | |
parent | bd3d16fcebdeaf1948e33af9fbf54871aadc5fc5 (diff) | |
parent | 0c494b2c3d05a00f0cb167daed24730a2cc5815e (diff) | |
download | Qt-bc331aca61a2f212a347708c9d44a4fb092183fd.zip Qt-bc331aca61a2f212a347708c9d44a4fb092183fd.tar.gz Qt-bc331aca61a2f212a347708c9d44a4fb092183fd.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed wrong casing of a Symbian library.
Fixed wrong static library extension on Symbian.
Fixed library casing.
Remove dependencies to pre-Symbian3 platforms from Symbian3 packages
Fix qt.sis platform dependencies for Symbian^3 builds.
Fix few QFileDialog static method issues in Symbian^3
Make emulator deployment depend on post linking in symbian-sbsv2.
Diffstat (limited to 'demos')
-rw-r--r-- | demos/qmediaplayer/qmediaplayer.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro index d283ec8..fbf06d2 100644 --- a/demos/qmediaplayer/qmediaplayer.pro +++ b/demos/qmediaplayer/qmediaplayer.pro @@ -33,7 +33,7 @@ symbian { include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - LIBS += -lCommDb + LIBS += -lcommdb TARGET.CAPABILITY="NetworkServices" } |