diff options
author | axis <qt-info@nokia.com> | 2011-04-27 14:13:27 +0200 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-04-27 14:41:06 +0200 |
commit | 40b6a270a1f3b4c0bfb2d35cb96c4f929a7802ad (patch) | |
tree | 4b7f6d677530d690efc884dbd03a8c6518f5313d /examples | |
parent | a129444bb0156c936900dbd2f12bd9f427ff366c (diff) | |
parent | 10991179a60fae44b2446c408b16056db8b5d36d (diff) |
Merged master into qtquick2.
Diffstat (limited to 'examples')
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index ad35fc9495..034ef2f2eb 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -19,7 +19,7 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati INSTALLS = sources ImageProviderCore_sources target symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index c82c5eef4a..6d774abfdb 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -24,6 +24,6 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok INSTALLS += qdeclarativesources sources target symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 2302946a53..2c74c05bb4 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -14,7 +14,7 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins INSTALLS += sources target symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 1ffbf29925..f055c1b5ba 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -15,6 +15,6 @@ SOURCES += piechart.cpp \ chartsplugin.cpp symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } |