Merge pull request #53 from neochapay/master

Fix conflict with nemo-qml-plugin-models

rpm/qtquickcontrols-nemo.spec

@@ -63,7 +63,7 @@ desktop-file-install --delete-original       \
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/qt5/qml/org/nemomobile/models/
+%{_libdir}/qt5/qml/Nemo/UX/Models
 %{_libdir}/qt5/qml/QtQuick/Controls/Nemo
 %{_libdir}/qt5/qml/QtQuick/Controls/Styles/Nemo
 

src/controls/DatePicker.qml

@@ -32,7 +32,7 @@
 import QtQuick 2.6
 import QtQuick.Controls.Nemo 1.0
 
-import Nemo.Models 1.0
+import Nemo.UX.Models 1.0
 
 Item {
     id: datePicker

src/models/models.pro

 TEMPLATE = lib
-TARGET = nemomodels
+TARGET = nemouxmodels
 
-PLUGIN_IMPORT_PATH = Nemo/Models
+PLUGIN_IMPORT_PATH = Nemo/UX/Models
 
 QT -= gui
 QT += qml

src/models/plugin.cpp

@@ -34,12 +34,12 @@ public:
 
     void initializeEngine(QQmlEngine *, const char *uri)
     {
-        Q_ASSERT(uri == QLatin1String("Nemo.Models") || uri == QLatin1String("org.nemomobile.models"));
+        Q_ASSERT(uri == QLatin1String("Nemo.UX.Models") || uri == QLatin1String("org.nemomobile.uxmodels"));
     }
 
     void registerTypes(const char *uri)
     {
-        Q_ASSERT(uri == QLatin1String("Nemo.Models") || uri == QLatin1String("org.nemomobile.models"));
+        Q_ASSERT(uri == QLatin1String("Nemo.UX.Models") || uri == QLatin1String("org.nemomobile.uxmodels"));
         qmlRegisterType<CalendarModel>(uri, 1, 0, "CalendarModel");
     }
 };

src/models/qmldir

-module Nemo.Models
-plugin nemomodels
+module Nemo.UX.Models
+plugin nemouxmodels