Changeset 5531d6

Timestamp:

01/13/12 14:36:38 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

aadc4554fc97f0caac4d591e1b9f8197e02d94f0

Parents:

ab436a212fb4158c66b118c557ab4b4f8275033d

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-13 14:36:38+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-13 14:36:38+01:00

Message:

Add QtComponents to the QML plugin

Location:

telldus-gui/Plugins/QML

Files:

• CMakeLists.txt (modified) (1 diff)
• qmlview.cpp (modified) (2 diffs)

telldus-gui/Plugins/QML/CMakeLists.txt

@@ -24 +24 @@
 
 INCLUDE( ../TelldusCenterPlugin.cmake NO_POLICY_SCOPE )
+
+SET(QT_COMPONENTS_OUTPUT_DIR "${CMAKE_BINARY_DIR}/TelldusCenter/Plugins/declarative")
+INCLUDE( ${CMAKE_SOURCE_DIR}/3rdparty/qt-components-desktop.cmake NO_POLICY_SCOPE )

telldus-gui/Plugins/QML/qmlview.cpp

@@ -3 +3 @@
 #include <QDeclarativeContext>
 #include <QScriptValueIterator>
+#include <QDeclarativeEngine>
 #include <QVariant>
+#include <QApplication>
 
 class QMLView::PrivateData {
@@ -16 +18 @@
         setAttribute(Qt::WA_TranslucentBackground);
         setStyleSheet("background:transparent;");
+
+        QDeclarativeEngine *eng = this->engine();
+        QStringList paths(eng->importPathList());
+        QDir pluginsDir = QDir(qApp->applicationDirPath());
+
+#if defined(Q_OS_MAC)
+        if (pluginsDir.dirName() == "MacOS") {
+                pluginsDir.cdUp();
+        }
+#endif
+
+        if (pluginsDir.cd("Plugins/declarative")) {
+                paths << pluginsDir.absolutePath();
+        }
+
+        eng->setImportPathList(paths);
 
         d = new PrivateData;