From c6497e5edcfc533574d4066aa9650eb6967693bc Mon Sep 17 00:00:00 2001 From: "Xizhi Zhu (Steven)" Date: Mon, 23 Jan 2012 22:02:57 +0100 Subject: Remove Symbian specific code. Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266 Reviewed-by: Aaron Kennedy --- .../qtquick1/cppextensions/imageprovider/imageprovider.pro | 9 --------- .../declarative/qtquick1/cppextensions/plugins/plugins.pro | 5 ----- .../declarative/qtquick1/cppextensions/qwidgets/qwidgets.pro | 10 ---------- examples/declarative/qtquick1/qtquick1.pro | 3 --- .../tutorials/extending/chapter6-plugins/chapter6-plugins.pro | 5 ----- 5 files changed, 32 deletions(-) (limited to 'examples/declarative/qtquick1') diff --git a/examples/declarative/qtquick1/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/qtquick1/cppextensions/imageprovider/imageprovider.pro index 6f317b4141..5595ac6f2c 100644 --- a/examples/declarative/qtquick1/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/qtquick1/cppextensions/imageprovider/imageprovider.pro @@ -17,12 +17,3 @@ ImageProviderCore_sources.files = \ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore INSTALLS = sources ImageProviderCore_sources target - -symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCALLOWDLLDATA = 1 - - importFiles.sources = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir - importFiles.path = ImageProviderCore - DEPLOYMENT = importFiles -} diff --git a/examples/declarative/qtquick1/cppextensions/plugins/plugins.pro b/examples/declarative/qtquick1/cppextensions/plugins/plugins.pro index b7610a8823..816b9d05d6 100644 --- a/examples/declarative/qtquick1/cppextensions/plugins/plugins.pro +++ b/examples/declarative/qtquick1/cppextensions/plugins/plugins.pro @@ -22,8 +22,3 @@ sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample INSTALLS += qdeclarativesources sources target - -symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCALLOWDLLDATA = 1 -} diff --git a/examples/declarative/qtquick1/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/qtquick1/cppextensions/qwidgets/qwidgets.pro index 2e610f9914..292ac2c5f5 100644 --- a/examples/declarative/qtquick1/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/qtquick1/cppextensions/qwidgets/qwidgets.pro @@ -12,13 +12,3 @@ sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins INSTALLS += sources target - -symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCALLOWDLLDATA = 1 - - importFiles.sources = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir - importFiles.path = QWidgets - - DEPLOYMENT = importFiles -} diff --git a/examples/declarative/qtquick1/qtquick1.pro b/examples/declarative/qtquick1/qtquick1.pro index 0618705620..296637a6e0 100644 --- a/examples/declarative/qtquick1/qtquick1.pro +++ b/examples/declarative/qtquick1/qtquick1.pro @@ -6,9 +6,6 @@ SUBDIRS = \ modelviews \ tutorials -# 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 = \ animation \ diff --git a/examples/declarative/qtquick1/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/qtquick1/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 3533096b8b..4b3f4d1bcc 100644 --- a/examples/declarative/qtquick1/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/qtquick1/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -13,8 +13,3 @@ HEADERS += piechart.h \ SOURCES += piechart.cpp \ pieslice.cpp \ chartsplugin.cpp - -symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - TARGET.EPOCALLOWDLLDATA = 1 -} -- cgit v1.2.3