whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert all QT_VERSION checks to compare against QT_VERSION_CHECK() 

The result is generally more readable.

Change-Id: I507f67954ecd38516de1b7a6f8244c233ee45ddf
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Edward Welbourne 2021-09-17 15:40:08 +02:00
parent 298e41b830
commit 8511c8b02f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/kernel/qcoreapplication.cpp
View File

@ -141,10 +141,11 @@ QT_BEGIN_NAMESPACE
extern QString qAppFileName();
#endif
#if QT_VERSION >= 0x070000
# error "Bump QCoreApplicatoinPrivate::app_compile_version to 0x070000"
#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0)
# error "Bump QCoreApplicatoinPrivate::app_compile_version to QT_VERSION_CHECK(7, 0, 0)"
#endif
int QCoreApplicationPrivate::app_compile_version = 0x060000; //we don't know exactly, but it's at least 6.0.0
// We don't know exactly, but it's at least 6.0.0:
int QCoreApplicationPrivate::app_compile_version = QT_VERSION_CHECK(6, 0, 0);
bool QCoreApplicationPrivate::setuidAllowed = false;

4
src/corelib/serialization/qdatastream.h
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
@ -101,7 +101,7 @@ public:
Qt_6_2 = Qt_6_0,
Qt_6_3 = Qt_6_0,
Qt_DefaultCompiledVersion = Qt_6_3
#if QT_VERSION >= 0x060400
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
#error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion
#endif
};