diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 15:55:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-31 15:55:58 (GMT) |
| commit | c955e16d611c5463ee9ad4d04537c0d2006e9263 (patch) | |
| tree | 41898c204d22bacaa265a0abb538a5e84d5b5250 /examples | |
| parent | 0373325dd1390682922dd07614214c453d473ce3 (diff) | |
| parent | 152c6f2deeaa4caa384561c0d865d13b50d44a42 (diff) | |
| download | Qt-c955e16d611c5463ee9ad4d04537c0d2006e9263.zip Qt-c955e16d611c5463ee9ad4d04537c0d2006e9263.tar.gz Qt-c955e16d611c5463ee9ad4d04537c0d2006e9263.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:
Fix regression on Symbian
Fix broken test case
Cleanup the deployment code
Fix 'make sis' finding the dll on symbian
Re-add line that was lost during webkit update.
Work around bad naming of exported class in symbian sdk causing conflict
Fix building on public symbian SDK.
Fix qmake with the symbian makespec failing when project has a dash in it
Make s60main static lib not depend on QtCore
Remove stray non-latin1 character
Fix out-of-source symbian build for external apps
Update EABI def files for 4.7
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/declarative/declarative.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 5fc1cf0..db776b3 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -8,6 +8,9 @@ SUBDIRS = \ plugins \ widgets +# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name +symbian:SUBDIRS -= plugins + # These examples contain no C++ and can simply be copied sources.files = \ animations \ |