summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-05-24 03:40:11 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-05-24 03:40:11 (GMT)
commit941b44c2e36eeafe1acd1be5fd1cb27151db99d2 (patch)
treeb5ba03427d3379bbbbb1fd8bf032f3cf2a572d8a /examples
parent0fb9856548bdf08c0f51536eaf994af189e62f8d (diff)
downloadQt-941b44c2e36eeafe1acd1be5fd1cb27151db99d2.zip
Qt-941b44c2e36eeafe1acd1be5fd1cb27151db99d2.tar.gz
Qt-941b44c2e36eeafe1acd1be5fd1cb27151db99d2.tar.bz2
Clean up project files for c++ examples
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.pro15
-rw-r--r--examples/declarative/cppextensions/plugins/plugins.pro16
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.pro12
-rw-r--r--examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro8
4 files changed, 23 insertions, 28 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index 945a301..462f7d9d 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -1,12 +1,10 @@
TEMPLATE = lib
-TARGET = imageprovider
-QT += declarative
CONFIG += qt plugin
+QT += declarative
-TARGET = $$qtLibraryTarget($$TARGET)
DESTDIR = ImageProviderCore
+TARGET = imageprovider
-# Input
SOURCES += imageprovider.cpp
sources.files = $$SOURCES imageprovider.qml imageprovider.pro
@@ -18,8 +16,9 @@ ImageProviderCore_sources.files = \
ImageProviderCore/qmldir
ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovider/ImageProviderCore
-symbian:{
- TARGET.EPOCALLOWDLLDATA=1
-}
-
INSTALLS = sources ImageProviderCore_sources target
+
+symbian {
+ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+ TARGET.EPOCALLOWDLLDATA = 1
+}
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index b501ae3..d37ff40 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -1,9 +1,10 @@
TEMPLATE = lib
-DESTDIR = com/nokia/TimeExample
-TARGET = qtimeexampleqmlplugin
CONFIG += qt plugin
QT += declarative
+DESTDIR = com/nokia/TimeExample
+TARGET = qtimeexampleqmlplugin
+
SOURCES += plugin.cpp
qdeclarativesources.files += \
@@ -18,14 +19,11 @@ qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/noki
sources.files += plugins.pro plugin.cpp plugins.qml README
sources.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins
-
target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample
-symbian:{
- TARGET.EPOCALLOWDLLDATA=1
-}
-
-
INSTALLS += qdeclarativesources sources target
-symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+symbian {
+ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+ TARGET.EPOCALLOWDLLDATA = 1
+}
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index 37f313d..c5f8bcf 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
@@ -1,21 +1,19 @@
TEMPLATE = lib
-DESTDIR = QWidgets
-TARGET = qwidgetsplugin
CONFIG += qt plugin
QT += declarative
+DESTDIR = QWidgets
+TARGET = qwidgetsplugin
+
SOURCES += qwidgets.cpp
sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml
-
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)
-
-symbian:{
+symbian {
+ include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
TARGET.EPOCALLOWDLLDATA = 1
}
diff --git a/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro b/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
index a8fb565..483da8f 100644
--- a/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
+++ b/examples/declarative/tutorials/extending/chapter5-plugins/chapter5-plugins.pro
@@ -2,6 +2,10 @@ TEMPLATE = lib
CONFIG += qt plugin
QT += declarative
+DESTDIR = lib
+OBJECTS_DIR = tmp
+MOC_DIR = tmp
+
HEADERS += musician.h \
instrument.h \
musicplugin.h
@@ -10,10 +14,6 @@ SOURCES += musician.cpp \
instrument.cpp \
musicplugin.cpp
-DESTDIR = lib
-OBJECTS_DIR = tmp
-MOC_DIR = tmp
-
symbian {
include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
TARGET.EPOCALLOWDLLDATA = 1