-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PR #21553.
- Loading branch information
Showing
8 changed files
with
106 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
* Bittorrent Client using Qt and libtorrent. | ||
* Copyright (C) 2014-2023 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2014-2024 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2006 Christophe Dumez <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
|
@@ -58,10 +58,6 @@ | |
#include <QSplashScreen> | ||
#include <QTimer> | ||
|
||
#ifdef Q_OS_WIN | ||
#include <QOperatingSystemVersion> | ||
#endif | ||
|
||
#ifdef QBT_STATIC_QT | ||
#include <QtPlugin> | ||
Q_IMPORT_PLUGIN(QICOPlugin) | ||
|
@@ -189,11 +185,6 @@ int main(int argc, char *argv[]) | |
// We must save it here because QApplication constructor may change it | ||
const bool isOneArg = (argc == 2); | ||
|
||
#if !defined(DISABLE_GUI) && defined(Q_OS_WIN) | ||
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10) | ||
QApplication::setStyle(u"Fusion"_s); | ||
#endif | ||
|
||
// `app` must be declared out of try block to allow display message box in case of exception | ||
std::unique_ptr<Application> app; | ||
try | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
* Bittorrent Client using Qt and libtorrent. | ||
* Copyright (C) 2023 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2023-2024 Vladimir Golovnev <[email protected]> | ||
* Copyright (C) 2006 Christophe Dumez <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or | ||
|
@@ -143,6 +143,7 @@ private slots: | |
|
||
// General options | ||
void initializeLanguageCombo(); | ||
void initializeStyleCombo(); | ||
QString getLocale() const; | ||
bool isSplashScreenDisabled() const; | ||
#ifdef Q_OS_WIN | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters