summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-05-30 17:32:27 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-05-30 17:32:27 +0200
commit8ca35943f1fbfd25cafb245999f5c817a7f62eb4 (patch)
tree34d0a3e26ce820b710407180232e879d622fa37e
parent81dbb350844c61d9a9bbaa40b465208967287cec (diff)
Enabled make install to copy directly to QTDIR
-rw-r--r--README4
-rw-r--r--presentation.pro16
-rw-r--r--src/Presentation.qml (renamed from Qt/labs/presentation/Presentation.qml)0
-rw-r--r--src/Slide.qml (renamed from Qt/labs/presentation/Slide.qml)0
-rw-r--r--src/qmldir (renamed from Qt/labs/presentation/qmldir)0
5 files changed, 18 insertions, 2 deletions
diff --git a/README b/README
index f69fb2d..a32574b 100644
--- a/README
+++ b/README
@@ -5,9 +5,9 @@ This is a slide presentation system written in QML.
Installing
----------
-No installation is required. Just add the root directory to your QML_IMPORT_PATH
-and run 'qmlscene' on your slides to run presentations.
+Do 'make install' in the root directory to install the files to QTDIR/imports
+Once that is done, all examples should run out of the box
Organization
diff --git a/presentation.pro b/presentation.pro
new file mode 100644
index 0000000..7bd47ab
--- /dev/null
+++ b/presentation.pro
@@ -0,0 +1,16 @@
+TARGETPATH=Qt/labs/presentation
+TEMPLATE=lib
+
+CONFIG += plugin
+
+qmldir.files += \
+ src/qmldir \
+ src/Presentation.qml \
+ src/Slide.qml
+
+qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+INSTALLS += qmldir
+
+
+
diff --git a/Qt/labs/presentation/Presentation.qml b/src/Presentation.qml
index c00dfb9..c00dfb9 100644
--- a/Qt/labs/presentation/Presentation.qml
+++ b/src/Presentation.qml
diff --git a/Qt/labs/presentation/Slide.qml b/src/Slide.qml
index b970211..b970211 100644
--- a/Qt/labs/presentation/Slide.qml
+++ b/src/Slide.qml
diff --git a/Qt/labs/presentation/qmldir b/src/qmldir
index 050905d..050905d 100644
--- a/Qt/labs/presentation/qmldir
+++ b/src/qmldir