Skip to content

Commit 8abab89

Browse files
committed
App: fix compile error
1 parent 13cb245 commit 8abab89

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

App/Main.cpp

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,24 @@ Module Name:
1313
This file contains main implement.
1414
*/
1515

16-
#ifdef RABBITCOMMON
17-
#include "RabbitCommonTools.h"
18-
#include "FrmUpdater.h"
19-
#endif
20-
#include "MainWindow.h"
16+
#include <QtGlobal>
2117
#include <QApplication>
2218
#include <QDir>
23-
#include "Global/Global.h"
19+
#include <QLoggingCategory>
2420
#if defined(Q_OS_ANDROID) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
25-
#include <QtAndroidExtras/QtAndroid>
21+
#include <QtAndroidExtras/QtAndroid>
2622
#endif
23+
24+
#include "Global/Global.h"
2725
#ifdef BUILD_QUIWidget
2826
#include "QUIWidget/QUIWidget.h"
2927
#endif
28+
#ifdef RABBITCOMMON
29+
#include "RabbitCommonTools.h"
30+
#include "FrmUpdater.h"
31+
#endif
32+
#include "MainWindow.h"
3033

31-
#include <QLoggingCategory>
3234
static Q_LOGGING_CATEGORY(log, "main")
3335

3436
int main(int argc, char *argv[])
@@ -68,8 +70,14 @@ int main(int argc, char *argv[])
6870
#ifdef HAVE_UPDATE
6971
QSharedPointer<CFrmUpdater> pUpdater;
7072
// Check update version
73+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
7174
if(qEnvironmentVariable("SNAP").isEmpty()
72-
&& qEnvironmentVariable("FLATPAK_ID").isEmpty()) {
75+
&& qEnvironmentVariable("FLATPAK_ID").isEmpty())
76+
#else
77+
if(qgetenv("SNAP").isEmpty()
78+
&& qgetenv("FLATPAK_ID").isEmpty())
79+
#endif
80+
{
7381
pUpdater = QSharedPointer<CFrmUpdater>(new CFrmUpdater());
7482
if(pUpdater) {
7583
pUpdater->setAttribute(Qt::WA_DeleteOnClose, false);

0 commit comments

Comments
 (0)