diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 14:45:59 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 14:45:59 +1000 |
| commit | 9bcea0318cae2f7fbfd24195ff9272cb369cb6e5 (patch) | |
| tree | b5b6b2f79c29bc9a339dcc7a918524ee7ab66016 /examples/declarative/cppextensions | |
| parent | 124b71128feb596b136a545eb128c3b0e7093bf7 (diff) | |
| parent | 1cf2984ea74f837d4e8ae476dac2622f0a049eab (diff) | |
Merge branch 'master' into qtquick2
Conflicts:
src/declarative/qml/qdeclarativeengine.cpp
Diffstat (limited to 'examples/declarative/cppextensions')
3 files changed, 3 insertions, 0 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index 034ef2f2eb..eaa48cd901 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -26,3 +26,4 @@ symbian:{ importFiles.path = ImageProviderCore DEPLOYMENT += importFiles } +maemo5: CONFIG += qt_example diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 6d774abfdb..03f7294131 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -27,3 +27,4 @@ symbian { CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } +maemo5: CONFIG += qt_example diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 2c74c05bb4..d7e6f9318a 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -22,3 +22,4 @@ symbian:{ DEPLOYMENT += importFiles } +maemo5: CONFIG += qt_example |