Don't run configuration checks for CLI launches
This commit is contained in:
parent
fad197fdce
commit
37b9b6ed9e
2 changed files with 12 additions and 9 deletions
|
|
@ -51,17 +51,19 @@ ApplicationWindow {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display any modal dialogs for configuration warnings
|
// Display any modal dialogs for configuration warnings
|
||||||
if (SystemProperties.isWow64) {
|
if (runConfigChecks) {
|
||||||
wow64Dialog.open()
|
if (SystemProperties.isWow64) {
|
||||||
}
|
wow64Dialog.open()
|
||||||
|
}
|
||||||
|
|
||||||
if (SystemProperties.unmappedGamepads) {
|
if (SystemProperties.unmappedGamepads) {
|
||||||
unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
|
unmappedGamepadDialog.unmappedGamepads = SystemProperties.unmappedGamepads
|
||||||
unmappedGamepadDialog.open()
|
unmappedGamepadDialog.open()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hardware acceleration is checked asynchronously
|
// Hardware acceleration is checked asynchronously
|
||||||
SystemProperties.hasHardwareAccelerationChanged.connect(hasHardwareAccelerationChanged)
|
SystemProperties.hasHardwareAccelerationChanged.connect(hasHardwareAccelerationChanged)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function hasHardwareAccelerationChanged() {
|
function hasHardwareAccelerationChanged() {
|
||||||
|
|
|
||||||
|
|
@ -926,6 +926,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
if (hasGUI) {
|
if (hasGUI) {
|
||||||
engine.rootContext()->setContextProperty("initialView", initialView);
|
engine.rootContext()->setContextProperty("initialView", initialView);
|
||||||
|
engine.rootContext()->setContextProperty("runConfigChecks", commandLineParserResult == GlobalCommandLineParser::NormalStartRequested);
|
||||||
|
|
||||||
// Load the main.qml file
|
// Load the main.qml file
|
||||||
engine.load(QUrl(QStringLiteral("qrc:/gui/main.qml")));
|
engine.load(QUrl(QStringLiteral("qrc:/gui/main.qml")));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue