1.10.0
This commit is contained in:
parent
1c7b95914e
commit
fac92f5db7
|
@ -7,7 +7,7 @@
|
|||
#include <QUrlQuery>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include "QSbieAPI/Sandboxie/SbieTemplates.h"
|
||||
#include "../QSbieAPI/Sandboxie/SbieTemplates.h"
|
||||
#include <QtConcurrent>
|
||||
#include "../MiscHelpers/Archive/Archive.h"
|
||||
|
||||
|
@ -441,4 +441,4 @@ QString CAddon::GetLocalizedEntry(const QString& Name)
|
|||
return Data[Name + "_" + LangAux].toString();
|
||||
|
||||
return Data[Name].toString();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,7 +35,6 @@ HEADERS += ./stdafx.h \
|
|||
./Wizards/TemplateWizard.h \
|
||||
./Wizards/SetupWizard.h \
|
||||
./Wizards/BoxAssistant.h \
|
||||
./Windows/BoxImageWindow.h \
|
||||
./Engine/BoxEngine.h \
|
||||
./Engine/BoxObject.h \
|
||||
./Engine/IniObject.h \
|
||||
|
@ -47,6 +46,7 @@ HEADERS += ./stdafx.h \
|
|||
./AddonManager.h
|
||||
|
||||
SOURCES += ./main.cpp \
|
||||
../../SandboxieTools/Common/verify.c \
|
||||
./stdafx.cpp \
|
||||
./SandMan.cpp \
|
||||
./SbiePlusAPI.cpp \
|
||||
|
@ -80,7 +80,6 @@ SOURCES += ./main.cpp \
|
|||
./Wizards/TemplateWizard.cpp \
|
||||
./Wizards/SetupWizard.cpp \
|
||||
./Wizards/BoxAssistant.cpp \
|
||||
./Windows/BoxImageWindow.cpp \
|
||||
./Engine/BoxEngine.cpp \
|
||||
./Engine/BoxObject.cpp \
|
||||
./Engine/IniObject.cpp \
|
||||
|
|
|
@ -28,7 +28,7 @@ equals(MY_ARCH, ARM64) {
|
|||
CONFIG(debug, debug|release):!contains(QMAKE_HOST.arch, x86_64):LIBS += -L../Bin/Win32/Debug
|
||||
CONFIG(release, debug|release):!contains(QMAKE_HOST.arch, x86_64):LIBS += -L../Bin/Win32/Release
|
||||
|
||||
LIBS += -lNtdll -lAdvapi32 -lOle32 -lUser32 -lShell32 -lGdi32 -lQSbieAPI -lMiscHelpers -lqtsingleapp -lUGlobalHotkey
|
||||
LIBS += -lNtdll -lAdvapi32 -lOle32 -lUser32 -lShell32 -lGdi32 -lQSbieAPI -lMiscHelpers -lqtsingleapp -lUGlobalHotkey -lbcrypt
|
||||
|
||||
CONFIG(release, debug|release):{
|
||||
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
|
||||
|
|
|
@ -567,7 +567,7 @@ void CGroupPage::cleanupPage()
|
|||
{
|
||||
((CBoxAssistant*)wizard())->PopIssue();
|
||||
|
||||
QPointer w = wizard();
|
||||
QPointer<QWizard> w = wizard();
|
||||
QTimer::singleShot(10, [w]() {
|
||||
if (w && ((CBoxAssistant*)w.data())->m_NextCounter > 0)
|
||||
((CBoxAssistant*)w.data())->removePage(CBoxAssistant::Page_Next + ((CBoxAssistant*)w.data())->m_NextCounter--);
|
||||
|
@ -700,7 +700,7 @@ void CListPage::cleanupPage()
|
|||
{
|
||||
((CBoxAssistant*)wizard())->PopIssue();
|
||||
|
||||
QPointer w = wizard();
|
||||
QPointer<QWizard> w = wizard();
|
||||
QTimer::singleShot(10, [w]() {
|
||||
if (w && ((CBoxAssistant*)w.data())->m_NextCounter > 0)
|
||||
((CBoxAssistant*)w.data())->removePage(CBoxAssistant::Page_Next + ((CBoxAssistant*)w.data())->m_NextCounter--);
|
||||
|
|
Loading…
Reference in New Issue