diff options
author | Xizhi Zhu (Steven) <xizhi.zhu@gmail.com> | 2012-01-23 22:02:57 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-24 10:52:54 +0100 |
commit | c6497e5edcfc533574d4066aa9650eb6967693bc (patch) | |
tree | 55c15f97aa9cad0164fc2939c9121354bbddcbf5 /examples | |
parent | f42e12e591990496c38e9cd5ed7a6c1105461e87 (diff) |
Remove Symbian specific code.
Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'examples')
6 files changed, 0 insertions, 35 deletions
diff --git a/examples/declarative/qtquick1.pro b/examples/declarative/qtquick1.pro index e441d85eca..a04969bdc3 100644 --- a/examples/declarative/qtquick1.pro +++ b/examples/declarative/qtquick1.pro @@ -9,9 +9,6 @@ SUBDIRS = \ # OpenGL shader examples requires opengl and they contain some C++ and need to be built contains(QT_CONFIG, opengl): SUBDIRS += shadereffects -# 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/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 -} |