← Back to team overview

uonedb-qt team mailing list archive

[Merge] lp:~kalikiana/u1db-qt/examples-pkg into lp:u1db-qt

 

Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/examples-pkg into lp:u1db-qt.

Commit message:
Add -examples package containing the QML examples

Requested reviews:
  U1DB Qt developers (uonedb-qt)

For more details, see:
https://code.launchpad.net/~kalikiana/u1db-qt/examples-pkg/+merge/158618

Add -examples package containing the QML examples
-- 
https://code.launchpad.net/~kalikiana/u1db-qt/examples-pkg/+merge/158618
Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/examples-pkg into lp:u1db-qt.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-12 12:26:52 +0000
+++ CMakeLists.txt	2013-04-12 13:53:30 +0000
@@ -79,6 +79,7 @@
     WORKING_DIRECTORY "documentation")
 add_subdirectory(modules)
 add_subdirectory(tests)
+add_subdirectory(examples)
 
 # Install
 set(INCLUDE_INSTALL_DIR include/lib${U1DB_QT_LIBNAME})

=== modified file 'debian/control'
--- debian/control	2013-04-09 12:41:08 +0000
+++ debian/control	2013-04-12 13:53:30 +0000
@@ -35,3 +35,14 @@
  Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
  .
  This package contains the developer headers for the Qt binding for U1DB
+
+Package: libu1db-qt5-examples
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         libu1db-qt5-1 (= ${binary:Version})
+Description: Qt5 binding and QtQuick2 plugin for U1DB - examples
+ Simple Qt5 binding and QtQuick2 plugin for U1DB (https://launchpad.net/u1db).
+ .
+ This package contains the examples demonstrating the use of the Qt binding for U1DB
+

=== added file 'debian/libu1db-qt5-examples.install'
--- debian/libu1db-qt5-examples.install	1970-01-01 00:00:00 +0000
+++ debian/libu1db-qt5-examples.install	2013-04-12 13:53:30 +0000
@@ -0,0 +1,1 @@
+usr/share/u1db-qt/examples/*.qml

=== added file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ examples/CMakeLists.txt	2013-04-12 13:53:30 +0000
@@ -0,0 +1,5 @@
+file(GLOB ALL_EXAMPLES *-*/*.qml)
+install(FILES ${ALL_EXAMPLES}
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/u1db-qt/examples
+    )
+


Follow ups