summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-18 08:22:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-18 08:22:26 (GMT)
commit61caa759298e5dd43d9cad3a6cfb396d5b258dd1 (patch)
tree34311b4db0c3fb9b14f6660c8f1d2a6e5cc2bf3e /examples
parent379b4dc81177b95c15de30c5925efca1136e4041 (diff)
parent8665f4ba8cbf63740cfb379c8f98d8d68d089bf5 (diff)
downloadQt-61caa759298e5dd43d9cad3a6cfb396d5b258dd1.zip
Qt-61caa759298e5dd43d9cad3a6cfb396d5b258dd1.tar.gz
Qt-61caa759298e5dd43d9cad3a6cfb396d5b258dd1.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 weatherinfo and flightinfo to only request WLAN connection once Fix 'chapter5_plugins.dll.sym contains initialized writable data' Fix generation of stub sis files Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks Shadow building on Symbian fixes: part 3 - unchanged source tree Shadow building on Symbian fixes: part 2 - populate bin dir correctly Shadow building on Symbian fixes: part 1 - files to right place Re-enable suppression of --export_all_vtbl for static libraries Omit building declarative/painting benchmark if no OpenGL configured Fix requires keyword handling in qmake in Symbian Support device aliases in EPOCDEVICE Update Symbian DEF files for WINSCW and EABI Fix spurious mouse click when dismissing a native menu Add 'runonphone' target for symbian / makefile Double-click support for virtual cursor in Symbian
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro5
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro b/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
index 7ec68e9..a8fb565 100644
--- a/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
+++ b/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
@@ -13,3 +13,8 @@ SOURCES += musician.cpp \
DESTDIR = lib
OBJECTS_DIR = tmp
MOC_DIR = tmp
+
+symbian {
+ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+ TARGET.EPOCALLOWDLLDATA = 1
+}