From 0a1cf2ee74ecf2770f9f25781e39e8e74109d506 Mon Sep 17 00:00:00 2001 From: Oscar Andreasson Date: Thu, 18 Jun 2015 22:14:06 -0700 Subject: [PATCH] Fixed install of qmldir Proper title of page --- QmlMirror.qml | 2 +- weatherinfo/weatherinfo.pro | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/QmlMirror.qml b/QmlMirror.qml index 474e514..f9240be 100644 --- a/QmlMirror.qml +++ b/QmlMirror.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 1.1 import QtQuick.Window 2.0 ApplicationWindow { - title: qsTr("Hello World") + title: qsTr("MagicMirror") width: 1080 height: 1920 color: "black" diff --git a/weatherinfo/weatherinfo.pro b/weatherinfo/weatherinfo.pro index 47f2ec1..b04b7e4 100644 --- a/weatherinfo/weatherinfo.pro +++ b/weatherinfo/weatherinfo.pro @@ -4,19 +4,17 @@ TARGET = WeatherData CONFIG += qt plugin QT += core network positioning declarative qml quick +uri=net.frozentux.weatherinfo + SOURCES += appmodel.cpp \ weatherplugin.cpp HEADERS += appmodel.h \ weatherplugin.h -target.path = $$[QT_INSTALL_QML]/net/frozentux/weatherinfo -INSTALLS += target -uri=net.frozentux.weatherinfo - - -DISTFILES += \ - WeatherInfo.qml - +qmldirfile.path = $$[QT_INSTALL_QML]/net/frozentux/weatherinfo +qmldirfile.files = qmldir +INSTALLS += qmldirfile +#PRE_TARGETDEPS += install_qmldirfile RESOURCES += \ images.qrc