Merge lp:~kalikiana/dee-qt/deevarianttext into lp:dee-qt/0.2

[Cris Dywan]

[lp:~kalikiana/dee-qt/deevarianttext]

97. By Cris Dywan on 2012-12-04

Merge lp:~saviq/dee-qt/rename-libs

98. By Cris Dywan on 2012-12-06

Fix running deevarianttexttest

99. By Cris Dywan on 2012-12-06

Add insertRemoveTest (needs improvement)

100. By Cris Dywan on 2012-12-06

Fixup insertRemoveTest

101. By Cris Dywan on 2013-01-17

Use QSignalSpy instead of manual callbacks to verify signals

102. By Cris Dywan on 2013-01-17

Expose append/ remove to QML to allow hosting new models

For now only in test models and no API to set the schema.

103. By Cris Dywan on 2013-01-17

Emit layoutChanged in addition to countChanged

104. By Cris Dywan on 2013-01-23

Use SignalSpy in QML - preliminary text delegate testing

105. By Cris Dywan on 2013-01-23

Use QT_INSTALL_QML (QtQuick2) instead of QT_INSTALL_IMPORTS (QtQuick1)

See http://doc-snapshot.qt-project.org/5.0/qtcore/qlibraryinfo.html#LibraryLocation-enum

106. By Cris Dywan on 2013-03-08

Drop delegate test, the approach is wrong

107. By Cris Dywan on 2013-03-08

Drop remaining pieces of delegate approach as well

Unmerged revisions

107. By Cris Dywan on 2013-03-08

Drop remaining pieces of delegate approach as well

106. By Cris Dywan on 2013-03-08

Drop delegate test, the approach is wrong

105. By Cris Dywan on 2013-01-23

Use QT_INSTALL_QML (QtQuick2) instead of QT_INSTALL_IMPORTS (QtQuick1)

See http://doc-snapshot.qt-project.org/5.0/qtcore/qlibraryinfo.html#LibraryLocation-enum

104. By Cris Dywan on 2013-01-23

Use SignalSpy in QML - preliminary text delegate testing

103. By Cris Dywan on 2013-01-17

Emit layoutChanged in addition to countChanged

102. By Cris Dywan on 2013-01-17

Expose append/ remove to QML to allow hosting new models

For now only in test models and no API to set the schema.

101. By Cris Dywan on 2013-01-17

Use QSignalSpy instead of manual callbacks to verify signals

100. By Cris Dywan on 2012-12-06

Fixup insertRemoveTest

99. By Cris Dywan on 2012-12-06

Add insertRemoveTest (needs improvement)

98. By Cris Dywan on 2012-12-06

Fix running deevarianttexttest

=== modified file '.bzrignore'
--- .bzrignore	2010-11-22 08:03:37 +0000
+++ .bzrignore	2012-12-04 18:48:20 +0000
@@ -2,7 +2,20 @@
 CMakeFiles
 Makefile
 cmake_install.cmake
+install_manifest.txt
+libdee-qt.so*
+libdee-qt5.so*
 libQtDee.so*
-moc_*.cxx
-test
-install_manifest.txt
+moc_*.cpp
+*.moc
+*_automoc.cpp
+*.pc
+CTestTestfile.cmake
+*Test.log
+Testing
+conversiontest
+deelistmodeltest
+deevarianttexttest
+plugintest
+test-helper
+*-xunit.xml
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-12-04 18:48:20 +0000
+++ CMakeLists.txt	2012-12-04 18:48:20 +0000
@@ -1,4 +1,4 @@
-project(libqtdee)
+project(dee-qt)
 cmake_minimum_required(VERSION 2.8.6)
 
 # Instruct CMake to run moc automatically when needed.
@@ -10,22 +10,15 @@
   message("Building Qt5 version")
 
   find_package(Qt5Core REQUIRED)
-  find_package(Qt5Quick REQUIRED)
-  find_package(Qt5Test REQUIRED)
   find_package(Qt5DBus REQUIRED)
 
   add_definitions(-DWITHQT5=1)
 
-  set(QTDEE_LIBNAME QtDee-qt5)
-  set(OUR_QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Quick_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
+  set(DEE_QT_LIBNAME dee-qt5)
+  set(OUR_QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS})
   set(OUR_QT_CORE_LIB ${Qt5Core_LIBRARIES})
-  set(OUR_QT_TEST_LIB ${Qt5Test_LIBRARIES})
-  set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
   set(OUR_QT_DBUS_LIB ${Qt5DBus_LIBRARIES})
-  # FIXME: find a way to deterime that
-  set(IMPORT_INSTALL_DIR /opt/qt5/imports/dee)
   set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtQuick")
-  set(QT_DEE_PKGCONFIG_FILE libqtdee-qt5.pc)
 else ()
   message("Building Qt4 version")
 
@@ -33,94 +26,67 @@
 
   add_definitions(-DWITHQT5=0)
 
-  set(QTDEE_LIBNAME QtDee)
-  set(OUR_QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTDECLARATIVE_INCLUDE_DIR} ${QT_QTTEST_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR})
+  set(DEE_QT_LIBNAME dee-qt)
+  set(OUR_QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTDBUS_INCLUDE_DIR})
   set(OUR_QT_CORE_LIB ${QT_QTCORE_LIBRARIES})
-  set(OUR_QT_TEST_LIB ${QT_QTTEST_LIBRARIES})
-  set(OUR_QT_QUICK_LIB ${QT_QTDECLARATIVE_LIBRARIES})
   set(OUR_QT_DBUS_LIB ${QT_QTDBUS_LIBRARIES})
-  set(IMPORT_INSTALL_DIR lib/qt4/imports/dee)
-  set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtDBus QtDeclarative")
-  set(QT_DEE_PKGCONFIG_FILE libqtdee.pc)
+  set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtDBus")
 endif ()
+
+set(QT_DEE_PKGCONFIG_FILE lib${DEE_QT_LIBNAME}.pc)
+
 pkg_check_modules(DEE REQUIRED dee-1.0)
 
 # Build flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wundef -std=c++0x")
 
 # Sources
-## QtDee
-set(QtDee_SRCS
+set(DEE_QT_SRCS
     deelistmodel.cpp
-    )
-
-set(QtDee_MOC_HDRS
-    deelistmodel.h
-    )
-
+    deevarianttext.cpp
+    )
 
 ## QtDeeQml
 set(QtDeeQml_SRCS
     plugin.cpp
     )
 
-set(QtDeeQml_MOC_HDRS
-    plugin.h
-    )
-
 # Build
 add_definitions(-DQT_NO_KEYWORDS)
 
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${OUR_QT_INCLUDES}
     ${DEE_INCLUDE_DIRS}
     )
 
-## QtDee
-add_library(${QTDEE_LIBNAME} SHARED ${QtDee_SRCS} ${QtDee_MOC_SRCS})
-target_link_libraries(${QTDEE_LIBNAME}
+add_library(${DEE_QT_LIBNAME} SHARED ${DEE_QT_SRCS})
+target_link_libraries(${DEE_QT_LIBNAME}
     ${OUR_QT_CORE_LIB}
     ${DEE_LDFLAGS}
     )
 
-set_target_properties(${QTDEE_LIBNAME} PROPERTIES
-  SOVERSION 2
-  VERSION 2.0.0
-  )
-
-## QtDeeQml
-add_library(QtDeeQml SHARED ${QtDeeQml_SRCS} ${QtDeeQml_MOC_SRCS})
-
-target_link_libraries(QtDeeQml
-  ${QTDEE_LIBNAME}
-  ${OUR_QT_QUICK_LIB}
-  )
-
-## test
-set(test_SRCS
-    test.cpp
-    )
-
-set(test_MOC_HDRS
-    test.h
-    )
-
-add_executable(test ${test_SRCS} ${test_MOC_SRCS})
-set_target_properties(test PROPERTIES COMPILE_FLAGS -fPIC)
-target_link_libraries(test
-  ${QTDEE_LIBNAME}
-  )
+set_target_properties(${DEE_QT_LIBNAME} PROPERTIES
+  SOVERSION 3
+  VERSION 3.0.0
+  )
+
+# Unit-Test
+enable_testing()
+
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} CTEST_OUTPUT_ON_FAILURE=1)
+add_subdirectory(modules)
+add_subdirectory(tests)
 
 # Install
-set(INCLUDE_INSTALL_DIR include/QtDee)
+set(INCLUDE_INSTALL_DIR include/lib${DEE_QT_LIBNAME})
 
-## QtDee
-install(TARGETS ${QTDEE_LIBNAME}
+install(TARGETS ${DEE_QT_LIBNAME}
     LIBRARY DESTINATION lib${LIB_SUFFIX}
     )
 
-install(FILES deelistmodel.h
+install(FILES deelistmodel.h deevarianttext.h
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 
@@ -128,36 +94,10 @@
 set (PREFIX "${CMAKE_INSTALL_PREFIX}")
 set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
 
-configure_file (libqtdee.pc.in
+configure_file (libdee-qt.pc.in
     ${CMAKE_CURRENT_BINARY_DIR}/${QT_DEE_PKGCONFIG_FILE} @ONLY)
 
 install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${QT_DEE_PKGCONFIG_FILE}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
     )
 
-## QtDeeQml
-install(TARGETS QtDeeQml
-    LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
-    )
-
-install(FILES qmldir
-    DESTINATION ${IMPORT_INSTALL_DIR}
-    )
-
-## Unit-Test
-enable_testing()
-add_executable(conversiontest conversiontest.cpp)
-target_link_libraries(conversiontest ${OUR_QT_TEST_LIB} ${QTDEE_LIBNAME})
-set_target_properties(conversiontest PROPERTIES COMPILE_FLAGS -fPIC)
-add_test(NAME conversiontest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/conversiontest" "-p" "-xunitxml" "-p" "-o" "-p" "conversiontest-xunit.xml")
-set_property(TEST conversiontest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
-
-add_executable(test-helper test-helper.cpp)
-target_link_libraries(test-helper ${OUR_QT_CORE_LIB} ${OUR_QT_DBUS_LIB} ${DEE_LDFLAGS})
-set_target_properties(test-helper PROPERTIES COMPILE_FLAGS -fPIC)
-
-add_executable(deelistmodeltest deelistmodeltest.cpp)
-target_link_libraries(deelistmodeltest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${QTDEE_LIBNAME})
-set_target_properties(deelistmodeltest PROPERTIES COMPILE_FLAGS -fPIC)
-add_test(NAME deelistmodeltest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/test-helper" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deelistmodeltest" "-p" "-xunitxml" "-p" "-o" "-p" "deelistmodeltest-xunit.xml")
-set_property(TEST deelistmodeltest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-12-04 18:48:20 +0000
+++ debian/changelog	2012-12-04 18:48:20 +0000
@@ -1,3 +1,16 @@
+dee-qt (3.0-0ubuntu1) quantal; urgency=low
+
+  * new release
+  * rename the source package to dee-qt
+  * rename libqtdee to libdee-qt
+  * rename libqtdee-qt5 to libdee-qt5
+  * separate plugin out into "modules" directory
+  * separate tests out
+  * drop obsolete test.cpp
+  * rename dee 0.1 QML plugin to Dee 3.0
+
+ -- Michał Sawicz <[e-mail]>  Fri, 30 Nov 2012 12:32:41 +0100
+
 libqtdee (0.2.4-0ubuntu4) quantal; urgency=low
 
   * debian/rules
 
=== modified file 'debian/control'
--- debian/control	2012-12-04 18:48:20 +0000
+++ debian/control	2012-12-04 18:48:20 +0000
@@ -1,4 +1,4 @@
-Source: libqtdee
+Source: dee-qt
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -15,7 +15,7 @@
 # just go ahead.  ~unity-team will notice and sync up the code again.
 Vcs-Bzr: http://bazaar.launchpad.net/~unity-2d-team/dee-qt/trunk
 
-Package: libqtdee2
+Package: libdee-qt-3
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -24,31 +24,33 @@
 Description: Qt binding and QML plugin for Dee - shared library
  Simple Qt binding and QML plugin for Dee (https://launchpad.net/dee).
 
-Package: libqtdee-dev
+Package: libdee-qt-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libqtdee2 (= ${binary:Version}),
+         libdee-qt-3 (= ${binary:Version}),
          libqt4-dev (>= 4.7),
+         libdee-dev (>= 1.0.0),
 Description: Qt binding and QML plugin for Dee - development files
  Simple Qt binding and QML plugin for Dee (https://launchpad.net/dee).
  .
  This package contains the developer headers for the Qt binding for Dee
 
-Package: libqtdee-qt5
+Package: libdee-qt5-3
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Description: Qt5 binding and QtQuick2 plugin for Dee - shared library
  Simple Qt5 binding and QtQuick2 plugin for Dee (https://launchpad.net/dee).
 
-Package: libqtdee-qt5-dev
+Package: libdee-qt5-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
-         libqtdee-qt5 (= ${binary:Version}),
+         libdee-qt5-3 (= ${binary:Version}),
          qtbase,
          qtdeclarative,
+         libdee-dev (>= 1.0.0),
 Description: Qt5 binding and QtQuick2 plugin for Dee - development files
  Simple Qt5 binding and QtQuick2 plugin for Dee (https://launchpad.net/dee).
  .
 
=== renamed file 'debian/libqtdee2.install' => 'debian/libdee-qt-3.install'
--- debian/libqtdee2.install	2011-01-28 05:27:37 +0000
+++ debian/libdee-qt-3.install	2012-12-04 18:48:20 +0000
@@ -1,3 +1,3 @@
-usr/lib/libQtDee.so.*
-usr/lib/qt4/imports/dee/libQtDeeQml.so
-usr/lib/qt4/imports/dee/qmldir
+usr/lib/libdee-qt.so.*
+usr/lib/*/qt4/imports/Dee/libDeePlugin.so
+usr/lib/*/qt4/imports/Dee/qmldir
 
=== renamed file 'debian/libqtdee-dev.install' => 'debian/libdee-qt-dev.install'
--- debian/libqtdee-dev.install	2012-01-05 20:27:31 +0000
+++ debian/libdee-qt-dev.install	2012-12-04 18:48:20 +0000
@@ -1,3 +1,3 @@
-usr/lib/libQtDee.so
-usr/include/QtDee/*.h
-usr/lib/pkgconfig/libqtdee.pc
+usr/lib/libdee-qt.so
+usr/include/libdee-qt/*.h
+usr/lib/pkgconfig/libdee-qt.pc
 
=== renamed file 'debian/libqtdee-qt5.install' => 'debian/libdee-qt5-3.install'
--- debian/libqtdee-qt5.install	2012-12-04 18:48:20 +0000
+++ debian/libdee-qt5-3.install	2012-12-04 18:48:20 +0000
@@ -1,3 +1,3 @@
-usr/lib/libQtDee-qt5.so.*
-opt/qt5/imports/dee/libQtDeeQml.so
-opt/qt5/imports/dee/qmldir
+usr/lib/libdee-qt5.so.*
+opt/qt5/imports/Dee/libDeePlugin.so
+opt/qt5/imports/Dee/qmldir
 
=== renamed file 'debian/libqtdee-qt5-dev.install' => 'debian/libdee-qt5-dev.install'
--- debian/libqtdee-qt5-dev.install	2012-12-04 18:48:20 +0000
+++ debian/libdee-qt5-dev.install	2012-12-04 18:48:20 +0000
@@ -1,3 +1,3 @@
-usr/lib/libQtDee-qt5.so
-usr/include/QtDee/*.h
-usr/lib/pkgconfig/libqtdee-qt5.pc
+usr/lib/libdee-qt5.so
+usr/include/libdee-qt5/*.h
+usr/lib/pkgconfig/libdee-qt5.pc
 
=== modified file 'deelistmodel.cpp'
--- deelistmodel.cpp	2012-11-21 10:30:50 +0000
+++ deelistmodel.cpp	2012-12-04 18:48:20 +0000
@@ -21,13 +21,14 @@
 #include <QtCore/QByteArray>
 
 #include <dee.h>
-#include <glib-object.h>
 
 #include "deelistmodel.h"
+#include "deeprivate.h"
 
-static QVariant
+QVariant
 QVariantFromGVariant(GVariant *value)
 {
+    Q_ASSERT(value);
     switch (g_variant_classify(value)) {
         case G_VARIANT_CLASS_BOOLEAN:
             return QVariant((bool) g_variant_get_boolean(value));
@@ -62,13 +63,14 @@
             }
             return array;
         }
+        case G_VARIANT_CLASS_VARIANT:
+            return QVariant(QVariantFromGVariant(g_variant_get_variant(value)));
         default:
             /* Fallback on an empty QVariant.
                FIXME: Missing conversion of following GVariant types:
                 - G_VARIANT_CLASS_HANDLE
                 - G_VARIANT_CLASS_OBJECT_PATH
                 - G_VARIANT_CLASS_SIGNATURE
-                - G_VARIANT_CLASS_VARIANT
                 - G_VARIANT_CLASS_MAYBE
                 - G_VARIANT_CLASS_DICT_ENTRY
             */
@@ -84,7 +86,6 @@
     void connectToDeeModel();
     void connectToDeeModel(DeeModel *model);
     void disconnectFromDeeModel();
-    void createRoles();
     bool synchronized() const;
 
     /* GObject signal handlers for m_deeModel */
@@ -142,6 +143,7 @@
 void
 DeeListModelPrivate::connectToDeeModel(DeeModel *model)
 {
+    m_parent->beginResetModel();
     disconnectFromDeeModel();
 
     m_deeModel = (DeeModel*)g_object_ref (model);
@@ -150,15 +152,14 @@
     g_signal_connect(m_deeModel, "row-changed", G_CALLBACK(onRowChanged), m_parent);
     if (synchronized())
     {
-        createRoles();
         m_count = dee_model_get_n_rows(m_deeModel);
-        m_parent->reset();
         Q_EMIT m_parent->countChanged();
     }
     else
     {
         g_signal_connect(m_deeModel, "notify::synchronized", G_CALLBACK(onSynchronizedChanged), m_parent);
     }
+    m_parent->endResetModel();
 }
 
 bool
@@ -175,25 +176,24 @@
     }
 }
 
-void
-DeeListModelPrivate::createRoles()
+QHash<int, QByteArray>
+DeeListModel::roleNames()
 {
-    if (m_deeModel == NULL) {
-        return;
-    }
-
     QHash<int, QByteArray> roles;
+
+    if (d->m_deeModel == NULL) {
+        return roles;
+    }
+
     QString column;
-    guint n_columns = dee_model_get_n_columns(m_deeModel);
+    guint n_columns = dee_model_get_n_columns(d->m_deeModel);
 
     for (unsigned int index=0; index<n_columns; index++)
     {
         column = QString("column_%1").arg(index);
-        roles[index] = column.toAscii();
+        roles[index] = column.toUtf8();
     }
-
-    m_parent->setRoleNames(roles);
-    Q_EMIT m_parent->roleNamesChanged(roles);
+    return roles;
 }
 
 void
@@ -201,11 +201,11 @@
                                            GParamSpec *pspec,
                                            DeeListModel *model)
 {
-    model->d->createRoles();
+    model->beginResetModel();
     model->d->m_count = dee_model_get_n_rows(model->d->m_deeModel);
     model->synchronizedChanged(model->synchronized());
-    model->reset();
     Q_EMIT model->countChanged();
+    model->endResetModel();
 }
 
 void
@@ -271,8 +271,6 @@
     Q_EMIT model->dataChanged(index, index);
 }
 
-
-
 DeeListModel::DeeListModel(QObject *parent) :
     QAbstractListModel(parent), d(new DeeListModelPrivate(this))
 {
 
=== modified file 'deelistmodel.h'
--- deelistmodel.h	2012-01-31 17:49:00 +0000
+++ deelistmodel.h	2012-12-04 18:48:20 +0000
@@ -20,11 +20,12 @@
 #ifndef DEELISTMODEL_H
 #define DEELISTMODEL_H
 
+#include <QtCore/QObject>
 #include <QtCore/QAbstractListModel>
 
 class DeeListModelPrivate;
 typedef struct _DeeModel DeeModel;
-class __attribute__ ((visibility ("default"))) DeeListModel : public QAbstractListModel
+class Q_DECL_EXPORT DeeListModel : public QAbstractListModel
 {
     friend class DeeListModelPrivate;
 
@@ -52,11 +53,11 @@
     /* setters */
     void setName(const QString& name);
     void setModel(DeeModel* model);
+    QHash<int, QByteArray> roleNames();
 
 Q_SIGNALS:
     void nameChanged(const QString&);
     void synchronizedChanged(bool);
-    void roleNamesChanged(const QHash<int,QByteArray> &);
     void countChanged();
 
 private:
 
=== added file 'deeprivate.h'
--- deeprivate.h	1970-01-01 00:00:00 +0000
+++ deeprivate.h	2012-12-04 18:48:20 +0000
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib-object.h>
+
+QVariant QVariantFromGVariant(GVariant *value);
+
 
=== added file 'deevarianttext.cpp'
--- deevarianttext.cpp	1970-01-01 00:00:00 +0000
+++ deevarianttext.cpp	2012-12-04 18:48:20 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QDebug>
+
+#include "deevarianttext.h"
+#include "deeprivate.h"
+
+DeeVariantText::DeeVariantText(QObject *parent) :
+    m_text(""),
+    m_value(QVariant()),
+    m_type("")
+{
+}
+
+void
+DeeVariantText::setText(const QString& text)
+{
+    if (m_text == text)
+        return;
+
+    m_text = text;
+    GVariant *gvariant = g_variant_parse(NULL, text.toUtf8(), NULL, NULL, NULL);
+    if (!gvariant)
+    {
+        qDebug() << "Failed to parse " << text << " to QVariant";
+        m_value = QVariant();
+        m_type = "";
+    }
+    else
+    {
+        m_value = QVariantFromGVariant(gvariant);
+        m_type = g_variant_get_type_string(gvariant);
+    }
+    Q_EMIT textChanged(text);
+    Q_EMIT valueChanged(m_value);
+}
+
+QString
+DeeVariantText::getText()
+{
+    return m_text;
+}
+
+QVariant
+DeeVariantText::getValue()
+{
+    return m_value;
+}
+
+QVariant
+DeeVariantText::getType()
+{
+    return m_type;
+}
+
 
=== added file 'deevarianttext.h'
--- deevarianttext.h	1970-01-01 00:00:00 +0000
+++ deevarianttext.h	2012-12-04 18:48:20 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * Authors:
+ *  Christian Dywan <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DEEVARIANTTEXT_H
+#define DEEVARIANTTEXT_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+
+class Q_DECL_EXPORT DeeVariantText : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString text READ getText WRITE setText NOTIFY textChanged)
+    Q_PROPERTY(QVariant value READ getValue NOTIFY valueChanged)
+public:
+    DeeVariantText(QObject* parent = 0);
+    ~DeeVariantText() { }
+
+    QString getText();
+    QVariant getValue();
+    QVariant getType();
+    void setText(const QString& text);
+Q_SIGNALS:
+    void textChanged(const QString& text);
+    void valueChanged(const QVariant& value);
+private:
+    Q_DISABLE_COPY(DeeVariantText)
+    QString m_text;
+    QVariant m_value;
+    QString m_type;
+};
+
+#endif // DEEVARIANTTEXT_H
+
 
=== renamed file 'libqtdee.pc.in' => 'libdee-qt.pc.in'
--- libqtdee.pc.in	2012-12-04 18:48:20 +0000
+++ libdee-qt.pc.in	2012-12-04 18:48:20 +0000
@@ -1,12 +1,12 @@
 prefix=@PREFIX@
 exec_prefix=@EXEC_PREFIX@
 libdir=${exec_prefix}/lib
-includedir=${prefix}/include
+includedir=${prefix}/@INCLUDE_INSTALL_DIR@
 
-Name: libqtdee
+Name: @DEE_QT_LIBNAME@
 Description: Qt binding and QML plugin for Dee.
-Version: 0.2
+Version: 3.0
 
 Requires: @QT_PKGCONFIG_DEPENDENCIES@ dee-1.0
-Libs: -L${libdir} -l@QTDEE_LIBNAME@
-Cflags: -I${includedir}/QtDee
+Libs: -L${libdir} -l@DEE_QT_LIBNAME@
+Cflags: -I${includedir}
 
=== added directory 'modules'
=== added file 'modules/CMakeLists.txt'
--- modules/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/CMakeLists.txt	2012-12-04 18:48:20 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(Dee)
 
=== added directory 'modules/Dee'
=== added file 'modules/Dee/CMakeLists.txt'
--- modules/Dee/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/Dee/CMakeLists.txt	2012-12-04 18:48:20 +0000
@@ -0,0 +1,46 @@
+
+if (WITHQT5)
+  find_package(Qt5Quick REQUIRED)
+  set(OUR_QT_QUICK_LIB ${Qt5Quick_LIBRARIES})
+
+  get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+  exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_IMPORTS" OUTPUT_VARIABLE QT_IMPORTS_DIR)
+  file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
+
+  set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
+  LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "QtQuick")
+else ()
+  set(OUR_QT_QUICK_LIB ${QT_QTDECLARATIVE_LIBRARIES})
+  set(IMPORT_INSTALL_DIR lib/qt4/imports/Dee)
+  set(OUR_QT_QUICK_INCLUDE ${QT_QTDECLARATIVE_INCLUDE_DIR})
+  LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "QtDeclarative")
+endif ()
+
+set(DeePlugin_SRCS
+    plugin.cpp
+    )
+
+add_library(DeePlugin SHARED ${DeePlugin_SRCS})
+
+target_link_libraries(DeePlugin
+  ${DEE_QT_LIBNAME}
+  ${OUR_QT_QUICK_LIB}
+  )
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${OUR_QT_QUICK_INCLUDE}
+    )
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+install(TARGETS DeePlugin
+    LIBRARY DESTINATION ${QT_IMPORTS_DIR}/Dee
+    )
+
+install(FILES qmldir
+    DESTINATION ${QT_IMPORTS_DIR}/Dee
+    )
 
=== renamed file 'plugin.cpp' => 'modules/Dee/plugin.cpp'
--- plugin.cpp	2012-12-04 18:48:20 +0000
+++ modules/Dee/plugin.cpp	2012-12-04 18:48:20 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "deelistmodel.h"
+#include "deevarianttext.h"
 #include "plugin.h"
 #if WITHQT5
   #include <qqml.h>
@@ -25,11 +26,12 @@
   #include <QtDeclarative/qdeclarative.h>
 #endif
 
-void QtDeePlugin::registerTypes(const char *uri)
+void DeePlugin::registerTypes(const char *uri)
 {
-    qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
+    qmlRegisterType<DeeListModel>(uri, 3, 0, "DeeListModel");
+    qmlRegisterType<DeeVariantText>(uri, 3, 0, "DeeVariantText");
 }
 
 #if !WITHQT5
-  Q_EXPORT_PLUGIN2(QtDee, QtDeePlugin);
+  Q_EXPORT_PLUGIN2(Dee, DeePlugin);
 #endif
 
=== renamed file 'plugin.h' => 'modules/Dee/plugin.h'
--- plugin.h	2012-12-04 18:48:20 +0000
+++ modules/Dee/plugin.h	2012-12-04 18:48:20 +0000
@@ -26,7 +26,7 @@
   #include <QtDeclarative/QDeclarativeExtensionPlugin>
 #endif
 
-class QtDeePlugin :
+class DeePlugin :
 #if WITHQT5
   public QQmlExtensionPlugin
 #else
 
=== renamed file 'qmldir' => 'modules/Dee/qmldir'
--- qmldir	2011-01-13 16:05:58 +0000
+++ modules/Dee/qmldir	2012-12-04 18:48:20 +0000
@@ -1,1 +1,1 @@
-plugin QtDeeQml
+plugin DeePlugin
 
=== removed file 'test.cpp'
--- test.cpp	2011-01-24 04:05:02 +0000
+++ test.cpp	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "test.h"
-#include "deelistmodel.h"
-
-int main(int argc, char *argv[])
-{
-    TestApplication application(argc, argv);
-
-    DeeListModel* model = new DeeListModel;
-
-    QObject::connect(model, SIGNAL(synchronizedChanged(bool)), &application, SLOT(onSynchronizedChanged(bool)));
-    QObject::connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), &application, SLOT(onRowsInserted()));
-
-    model->setName("com.canonical.Unity.ApplicationsPlace.ResultsModel");
-
-    return application.exec();
-}
 
=== removed file 'test.h'
--- test.h	2012-01-04 23:52:05 +0000
+++ test.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Florian Boucault <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TEST_H
-#define TEST_H
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-
-#include "deelistmodel.h"
-
-class TestApplication : public QCoreApplication
-{
-    Q_OBJECT
-
-public:
-    TestApplication(int& argc, char** argv) : QCoreApplication(argc, argv) {}
-
-public Q_SLOTS:
-    void onSynchronizedChanged(bool synchronized) {
-        DeeListModel* model = (DeeListModel*)sender();
-        qDebug() << "Number of columns:" << model->roleNames().size();
-        qDebug() << "Number of rows:" << model->rowCount();
-
-        for(int i = 0; i < model->rowCount(); ++i) {
-            qDebug() << model->data(model->index(i));
-        }
-    }
-
-    void onRowsInserted() {
-        DeeListModel* model = (DeeListModel*)sender();
-        qDebug() << "Rows added, current number:" << model->rowCount();
-    }
-};
-
-#endif // TEST_H
 
=== removed file 'test_qtquick2.qml'
--- test_qtquick2.qml	2012-12-04 18:48:20 +0000
+++ test_qtquick2.qml	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-import QtQuick 2.0
-import dee 0.1
-
-ListView {
-    width: 200
-    height: 200
-    delegate: Text {
-        x: 66
-        y: 93
-        text: column_4
-    }
-    model: DeeListModel {
-        name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
-    }
-}
 
=== added directory 'tests'
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2012-12-04 18:48:20 +0000
@@ -0,0 +1,57 @@
+if (WITHQT5)
+  find_package(Qt5Test REQUIRED)
+  set(OUR_QT_TEST_LIB ${Qt5Test_LIBRARIES})
+  set(OUR_QT_TEST_INCLUDES ${Qt5Test_INCLUDE_DIRS})
+else ()
+  set(OUR_QT_TEST_LIB ${QT_QTTEST_LIBRARIES})
+  set(OUR_QT_TEST_INCLUDES ${QT_QTTEST_INCLUDE_DIR})
+  set(OUR_QT_QUICK_LIB ${QT_QTDECLARATIVE_LIBRARIES})
+  set(OUR_QT_QUICK_INCLUDE ${QT_QTDECLARATIVE_INCLUDE_DIR})
+endif ()
+
+if (WITHQT5)
+  add_test(NAME plugintest COMMAND "qmltestrunner" "-import" "../modules" "-xunitxml" "-o" "plugintest-xunit.xml" "-input" "${CMAKE_CURRENT_SOURCE_DIR}")
+else ()
+  add_executable(plugintest qtquick1plugintest.cpp)
+  target_link_libraries(plugintest ${OUR_QT_TEST_LIB} ${OUR_QT_QUICK_LIB})
+  set_target_properties(plugintest PROPERTIES COMPILE_FLAGS -fPIC)
+  add_test(NAME plugintest WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/plugintest" "-p" "-xunitxml" "-p" "-o" "-p" "${CMAKE_CURRENT_BINARY_DIR}/plugintest-xunit.xml")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "QT_GRAPHICSSYSTEM=raster")
+  set_property(TEST plugintest PROPERTY ENVIRONMENT "QML_IMPORT_PATH=${CMAKE_CURRENT_BINARY_DIR}/../modules")
+  add_dependencies(check plugintest)
+endif ()
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${OUR_QT_TEST_INCLUDES}
+    ${OUR_QT_QUICK_INCLUDE}
+    )
+
+add_executable(conversiontest conversiontest.cpp)
+target_link_libraries(conversiontest ${OUR_QT_WIDGETS_LIB} ${OUR_QT_TEST_LIB} ${OUR_QT_QUICK_LIB} ${DEE_QT_LIBNAME})
+set_target_properties(conversiontest PROPERTIES COMPILE_FLAGS -fPIC)
+add_test(NAME conversiontest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/conversiontest" "-p" "-xunitxml" "-p" "-o" "-p" "conversiontest-xunit.xml")
+set_property(TEST conversiontest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+set_property(TEST conversiontest PROPERTY ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+add_dependencies(check conversiontest)
+
+add_executable(test-helper test-helper.cpp)
+target_link_libraries(test-helper ${OUR_QT_CORE_LIB} ${OUR_QT_DBUS_LIB} ${DEE_LDFLAGS})
+set_target_properties(test-helper PROPERTIES COMPILE_FLAGS -fPIC)
+add_dependencies(conversiontest ${DEE_QT_LIBNAME} test-helper)
+
+add_executable(deelistmodeltest deelistmodeltest.cpp)
+target_link_libraries(deelistmodeltest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${DEE_QT_LIBNAME})
+set_target_properties(deelistmodeltest PROPERTIES COMPILE_FLAGS -fPIC)
+add_test(NAME deelistmodeltest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/test-helper" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deelistmodeltest" "-p" "-xunitxml" "-p" "-o" "-p" "deelistmodeltest-xunit.xml")
+set_property(TEST deelistmodeltest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+add_dependencies(check deelistmodeltest)
+
+add_executable(deevarianttexttest deevarianttexttest.cpp)
+target_link_libraries(deevarianttexttest ${OUR_QT_TEST_LIB} ${OUR_QT_DBUS_LIB} ${DEE_QT_LIBNAME})
+set_target_properties(deevarianttexttest PROPERTIES COMPILE_FLAGS -fPIC)
+add_test(NAME deevarianttexttest COMMAND "dbus-test-runner" "--task" "${CMAKE_CURRENT_BINARY_DIR}/test-helper" "--task" "${CMAKE_CURRENT_BINARY_DIR}/deelistmodeltest" "-p" "-xunitxml" "-p" "-o" "-p" "deelistmodeltest-xunit.xml")
+set_property(TEST deevarianttexttest PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=.")
+add_dependencies(check deevarianttexttest)
+
 
=== renamed file 'conversiontest.cpp' => 'tests/conversiontest.cpp'
--- conversiontest.cpp	2012-11-21 12:09:44 +0000
+++ tests/conversiontest.cpp	2012-12-04 18:48:20 +0000
@@ -18,6 +18,7 @@
 #include <QObject>
 
 #include "deelistmodel.h"
+#include "deevarianttext.h"
 
 #include <dee.h>
 
 
=== renamed file 'deelistmodeltest.cpp' => 'tests/deelistmodeltest.cpp'
=== added file 'tests/deevarianttexttest.cpp'
--- tests/deevarianttexttest.cpp	1970-01-01 00:00:00 +0000
+++ tests/deevarianttexttest.cpp	2012-12-04 18:48:20 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest>
+#include <QObject>
+
+#include "deevarianttext.h"
+
+#include <dee.h>
+
+class DeeVariantTextTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+      g_type_init();
+    }
+
+    void GVariantParseTest()
+    {
+        QHash<QString, QVariant> hash;
+        hash["[[1, 2, 3], [4, 5, 6]]"] = "aai";
+        hash["[[1, 2, 3], [4, 5, 6.0]]"] = "aad";
+        hash["[\"hello\", nothing]"] = "ams";
+        hash["{1: \"one\", 2: \"two\", 3: \"three\"}"] = "a{is}";
+        hash["[just 3, nothing]"] = "ami";
+        // hash["{\"title\": <\"frobit\">, \"enabled\": <true>, width: <800>}"] = "";
+        hash["@ms \"\""] = "ms";
+        QHashIterator<QString, QVariant> i(hash);
+        while (i.hasNext()) {
+            i.next();
+            QString input(i.key());
+            DeeVariantText dvariant;
+            dvariant.setText(input);
+            QCOMPARE(dvariant.getText(), input);
+            QCOMPARE(dvariant.getType(), i.value());
+        }
+    }
+};
+
+QTEST_MAIN(DeeVariantTextTest)
+
+#include "deevarianttexttest.moc"
 
=== added file 'tests/qtquick1plugintest.cpp'
--- tests/qtquick1plugintest.cpp	1970-01-01 00:00:00 +0000
+++ tests/qtquick1plugintest.cpp	2012-12-04 18:48:20 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <QtTest>
+#include <QObject>
+#include <QtDeclarative>
+
+class PluginTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+    }
+
+    void GVariantQMLTest()
+    {
+        // Dummy argc/v to avoid GCC confusing int with Display* on some systems
+        int argc = 0;
+        char *argv[0];
+        QApplication app(argc, argv);
+        QDeclarativeView view;
+        view.setSource(QUrl::fromLocalFile("test_qtquick1.qml"));
+        Q_ASSERT(view.errors().empty());
+        QObject *text2 = view.rootObject()->findChild<QObject*>("text2");
+        Q_ASSERT(text2);
+        QVariant text2text(text2->metaObject()->property(text2->metaObject()->indexOfProperty("text")).read(text2));
+        QCOMPARE(text2text.toString(), QString("4,1.1,0.1,0,0.3,3.6"));
+    }
+};
+
+QTEST_MAIN(PluginTest)
+
+#include "qtquick1plugintest.moc"
 
=== renamed file 'test-helper.cpp' => 'tests/test-helper.cpp'
=== renamed file 'test_qtquick1.qml' => 'tests/test_qtquick1.qml'
--- test_qtquick1.qml	2012-02-08 15:02:19 +0000
+++ tests/test_qtquick1.qml	2012-12-04 18:48:20 +0000
@@ -1,15 +1,40 @@
 import QtQuick 1.0
-import dee 0.1
-
-ListView {
-    width: 200
-    height: 200
-    delegate: Text {
-        x: 66
-        y: 93
-        text: column_4
-    }
-    model: DeeListModel {
-        name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
-    }
+import Dee 3.0
+
+Item {
+
+    ListView {
+        width: 200
+        height: 200
+        delegate: Text {
+            x: 66
+            y: 93
+            text: column_4
+        }
+        model: DeeListModel {
+            name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
+        }
+    }
+
+    DeeVariantText {
+        id: arrayOfInt
+        text: "[[1, 2, 3], [4, 5, 6]]"
+        Component.onCompleted: {
+            arrayOfInt.text = "[[4, 1.1, .1], [0, 0.3, 3.6]]"
+        }
+        onTextChanged: {
+            text2.text = arrayOfInt.value.toString()
+        }
+    }
+
+    Text {
+        text: arrayOfInt.value.toString()
+    }
+
+    Text {
+        id: text2
+        objectName: "text2"
+    }
+
 }
+
 
=== added file 'tests/tst_deelistmodel.qml'
--- tests/tst_deelistmodel.qml	1970-01-01 00:00:00 +0000
+++ tests/tst_deelistmodel.qml	2012-12-04 18:48:20 +0000
@@ -0,0 +1,22 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Dee 3.0
+
+TestCase {
+    name: "DeeListModel"
+
+    ListView {
+        width: 200
+        height: 200
+        delegate: Text {
+            x: 66
+            y: 93
+            text: column_4
+        }
+        model: DeeListModel {
+            name: "com.canonical.Unity.Lens.applications.T1313498309.Results"
+        }
+    }
+
+}
+
 
=== added file 'tests/tst_deevarianttext.qml'
--- tests/tst_deevarianttext.qml	1970-01-01 00:00:00 +0000
+++ tests/tst_deevarianttext.qml	2012-12-04 18:48:20 +0000
@@ -0,0 +1,60 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Dee 3.0
+
+TestCase {
+    name: "DeeVariantText"
+
+    function test_1_initialText () {
+        compare(arrayOfStr.value.toString(),"bar,foo")
+    }
+
+    function test_3_textAssigned () {
+        arrayOfInt.text = "[[4, 1.1, .1], [0, 0.3, 3.6]]"
+        compare(arrayOfInt.value.toString(),"4,1.1,0.1,0,0.3,3.6")
+    }
+
+    function test_4_textChanged () {
+        arrayOfInt.didChange = false
+        arrayOfInt.text = "@ams [nothing]"
+        compare(arrayOfInt.didChange,true)
+    }
+
+    function test_5_textNotChanged () {
+        arrayOfInt.text = "@ams [nothing]"
+        arrayOfInt.didChange = false
+        arrayOfInt.text = "@ams [nothing]"
+        compare(arrayOfInt.didChange,false)
+    }
+
+    function test_6_invalid () {
+        arrayOfInt.text = "[nothing]"
+        compare(arrayOfInt.value,undefined)
+    }
+
+    function test_7_unicode () {
+        arrayOfStr.text = "[\"١٢٣٤٥٦٧٨٩٠\", \"道具箱\", \"Котята\"]"
+        compare(arrayOfStr.value.toString(),"١٢٣٤٥٦٧٨٩٠,道具箱,Котята")
+    }
+
+    function test_8_gvariant () {
+        arrayOfStr.text = "[<\"test\">, <\"test2\">]"
+        compare(arrayOfStr.value.toString(), "test,test2")
+    }
+
+    DeeVariantText {
+        id: arrayOfStr
+        text: "[\"bar\", \"foo\"]"
+    }
+
+    DeeVariantText {
+        id: arrayOfInt
+        text: "[[1, 2, 3], [4, 5, 6]]"
+        property bool didChange: false
+        onTextChanged: {
+            didChange = true
+        }
+    }
+
+}
+