fly/flightgear
1
0
Fork 0
Code Activity

Launcher: use a more robust resource path

Browse source 
Some version of Qt seem to dislike the qrc:/// format, so use the
single-slash format here.
This commit is contained in:
James Turner 2018-08-28 23:35:38 +01:00
parent 47847a5a57
commit 7fe11b800a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/GUI/LauncherController.cxx
View file

@ -164,7 +164,7 @@ void LauncherController::initQML()
qmlRegisterType<RouteDiagram>("FlightGear", 1, 0, "RouteDiagram"); qmlRegisterType<RouteDiagram>("FlightGear", 1, 0, "RouteDiagram");
qmlRegisterType<QmlRadioButtonGroup>("FlightGear", 1, 0, "RadioButtonGroup"); qmlRegisterType<QmlRadioButtonGroup>("FlightGear", 1, 0, "RadioButtonGroup");
qmlRegisterSingletonType(QUrl("qrc:///qml/OverlayShared.qml"), "FlightGear", 1, 0, "OverlayShared"); qmlRegisterSingletonType(QUrl("qrc:/qml/OverlayShared.qml"), "FlightGear", 1, 0, "OverlayShared");
QNetworkDiskCache* diskCache = new QNetworkDiskCache(this); QNetworkDiskCache* diskCache = new QNetworkDiskCache(this);
SGPath cachePath = globals->get_fg_home() / "PreviewsCache"; SGPath cachePath = globals->get_fg_home() / "PreviewsCache";

4
src/GUI/qml/OverlayShared.qml
View file

@ -1,6 +1,6 @@
pragma Singleton pragma Singleton
import QtQuick 2.0 import QtQml 2.0
QtObject { QtObject {
property var globalOverlay property var globalOverlay: nil
} }