diff --git a/Sachesi.pro b/Sachesi.pro index 5b2e77c..0f3f27a 100644 --- a/Sachesi.pro +++ b/Sachesi.pro @@ -4,7 +4,7 @@ TARGET="Sachesi" win32: RC_ICONS += assets/sachesi-114.ico else:mac: ICON = assets/sachesi-114.icns else: ICON = assets/sachesi-114.png -VERSION = 1.6.1 +VERSION = 1.6.2 # Global specific CONFIG += c++11 @@ -30,8 +30,8 @@ win32 { !mingw { DEFINES += NOMINMAX _CRT_SECURE_NO_WARNINGS - static: LIBS += -L$$OPENSSL_PATH\\lib\\VC\\static -llibeay32MT -lssleay32MT -lGDI32 -lAdvapi32 - else: LIBS += -L$$OPENSSL_PATH\\lib -llibeay32 + static: LIBS += -L$$OPENSSL_PATH\\lib -llibeay32MT -lssleay32MT -lGDI32 -lAdvapi32 + else: LIBS += -L$$OPENSSL_PATH\\lib -llibeay32MT -lGDI32 # Hardcoded lib folder for winsocks LIBS+= -L"C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\x86" -lWSock32 -lUser32 -lCrypt32 } diff --git a/qml/generic/Title.qml b/qml/generic/Title.qml index 0369dba..8368176 100644 --- a/qml/generic/Title.qml +++ b/qml/generic/Title.qml @@ -7,7 +7,7 @@ import "UI" 1.0 ApplicationWindow { id: window // TODO: Send version from C++ - title: "Sachesi 1.6.1" + title: "Sachesi 1.6.2" width: 520 height: 480 minimumHeight: 520 @@ -19,7 +19,6 @@ ApplicationWindow { property alias y: window.y property alias width: window.width property alias height: window.height - property alias tab: titleRow.currentIndex property url installFolder property url backupFolder } @@ -70,6 +69,8 @@ ApplicationWindow { title: "Install"; Installer { anchors.fill: parent } } + // HACK: Reset tab with timer otherwise it has no tab on Windows + Timer { running: true; onTriggered: titleRow.currentIndex = 1 + p.hasBootAccess } Component.onCompleted: { if (p.hasBootAccess) titleRow.addTab("Boot", Qt.createComponent("Boot.qml") )