diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 22 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 23 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.h | 18 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 25 | ||||
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 11 |
8 files changed, 102 insertions, 18 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index f899d63a4d..41e11ea652 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -881,4 +881,26 @@ Q_UNUSED(valueOfExpression); /* the value may not be used if Q_ASSERT_X and Q_ASSUME_IMPL are noop */\ } while (0) + +/* + Sanitize compiler feature availability +*/ +#if !defined(Q_PROCESSOR_X86) +# undef QT_COMPILER_SUPPORTS_SSE2 +# undef QT_COMPILER_SUPPORTS_SSE3 +# undef QT_COMPILER_SUPPORTS_SSSE3 +# undef QT_COMPILER_SUPPORTS_SSE4_1 +# undef QT_COMPILER_SUPPORTS_SSE4_2 +# undef QT_COMPILER_SUPPORTS_AVX +# undef QT_COMPILER_SUPPORTS_AVX2 +#endif +#if !defined(Q_PROCESSOR_ARM) +# undef QT_COMPILER_SUPPORTS_IWMMXT +# undef QT_COMPILER_SUPPORTS_NEON +#endif +#if !defined(Q_PROCESSOR_MIPS) +# undef QT_COMPILER_SUPPORTS_MIPS_DSP +# undef QT_COMPILER_SUPPORTS_MIPS_DSPR2 +#endif + #endif // QCOMPILERDETECTION_H diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 85cb698afc..4ee4235278 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -934,7 +934,7 @@ bool qSharedBuild() Q_DECL_NOTHROW \endlist Some constants are defined only on certain platforms. You can use - the preprocessor symbols Q_OS_WIN and Q_OS_MACX to test that + the preprocessor symbols Q_OS_WIN and Q_OS_OSX to test that the application is compiled under Windows or OS X. \sa QLibraryInfo @@ -1077,18 +1077,20 @@ bool qSharedBuild() Q_DECL_NOTHROW \macro Q_OS_DARWIN \relates <QtGlobal> - Defined on Darwin OS (synonym for Q_OS_MAC). + Defined on Darwin-based operating systems such as OS X and iOS, + including any open source version(s) of Darwin. */ /*! \macro Q_OS_MAC \relates <QtGlobal> - Defined on OS X and iOS (synonym for Q_OS_DARWIN). + Defined on Darwin-based operating systems distributed by Apple, which + currently includes OS X and iOS, but not the open source version. */ /*! - \macro Q_OS_MACX + \macro Q_OS_OSX \relates <QtGlobal> Defined on OS X. diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index cde3e96ed1..f9629ff430 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -45,11 +45,11 @@ #include <stddef.h> -#define QT_VERSION_STR "5.1.2" +#define QT_VERSION_STR "5.2.0" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x050102 +#define QT_VERSION 0x050200 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ @@ -68,12 +68,15 @@ #define QT_STRINGIFY(x) QT_STRINGIFY2(x) #include <QtCore/qsystemdetection.h> -#include <QtCore/qcompilerdetection.h> #include <QtCore/qprocessordetection.h> +#include <QtCore/qcompilerdetection.h> #if defined (__ELF__) # define Q_OF_ELF #endif +#if defined (__MACH__) && defined (__APPLE__) +# define Q_OF_MACH_O +#endif #ifdef __cplusplus diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 2b305ef68b..61841cab76 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -78,6 +78,7 @@ struct QLibrarySettings QLibrarySettings(); QScopedPointer<QSettings> settings; #ifdef QT_BOOTSTRAPPED + bool haveEffectiveSourcePaths; bool haveEffectivePaths; bool havePaths; #endif @@ -99,8 +100,10 @@ public: static bool haveGroup(QLibraryInfo::PathGroup group) { QLibrarySettings *ls = qt_library_settings(); - return ls ? (group == QLibraryInfo::EffectivePaths - ? ls->haveEffectivePaths : ls->havePaths) : false; + return ls ? (group == QLibraryInfo::EffectiveSourcePaths + ? ls->haveEffectiveSourcePaths + : group == QLibraryInfo::EffectivePaths + ? ls->haveEffectivePaths : ls->havePaths) : false; } #endif static QSettings *configuration() @@ -122,7 +125,12 @@ QLibrarySettings::QLibrarySettings() // This code needs to be in the regular library, as otherwise a qt.conf that // works for qmake would break things for dynamically built Qt tools. QStringList children = settings->childGroups(); +#ifdef QT_BOOTSTRAPPED + haveEffectiveSourcePaths = children.contains(QLatin1String("EffectiveSourcePaths")); + haveEffectivePaths = haveEffectiveSourcePaths || children.contains(QLatin1String("EffectivePaths")); +#else haveEffectivePaths = children.contains(QLatin1String("EffectivePaths")); +#endif // Backwards compat: an existing but empty file is claimed to contain the Paths section. havePaths = !haveEffectivePaths || children.contains(QLatin1String("Paths")); #ifndef QT_BOOTSTRAPPED @@ -130,6 +138,9 @@ QLibrarySettings::QLibrarySettings() settings.reset(0); #else } else { +#ifdef QT_BOOTSTRAPPED + haveEffectiveSourcePaths = false; +#endif haveEffectivePaths = false; havePaths = false; #endif @@ -334,9 +345,12 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) // and qt.conf with that section is present, use it, otherwise fall back to // FinalPaths. For FinalPaths, use qt.conf if present and contains not only // [EffectivePaths], otherwise fall back to builtins. + // EffectiveSourcePaths falls back to EffectivePaths. if (!QLibraryInfoPrivate::haveGroup(group) - && (group == FinalPaths - || !(group = FinalPaths, QLibraryInfoPrivate::haveGroup(FinalPaths)))) + && !(group == EffectiveSourcePaths + && (group = EffectivePaths, QLibraryInfoPrivate::haveGroup(group))) + && !(group == EffectivePaths + && (group = FinalPaths, QLibraryInfoPrivate::haveGroup(group)))) #elif !defined(QT_NO_SETTINGS) if (!QLibraryInfoPrivate::configuration()) #endif @@ -368,6 +382,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group) QSettings *config = QLibraryInfoPrivate::configuration(); config->beginGroup(QLatin1String( #ifdef QT_BOOTSTRAPPED + group == EffectiveSourcePaths ? "EffectiveSourcePaths" : group == EffectivePaths ? "EffectivePaths" : #endif "Paths")); diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index b275e018a0..17864b555b 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -92,7 +92,7 @@ public: }; static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path() #ifdef QT_BOOTSTRAPPED - enum PathGroup { FinalPaths, EffectivePaths }; + enum PathGroup { FinalPaths, EffectivePaths, EffectiveSourcePaths }; static QString rawLocation(LibraryLocation, PathGroup); #endif diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 25c47d5d34..9b63166474 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -95,6 +95,7 @@ Qt { #endif Q_ENUMS(CursorMoveStyle) Q_ENUMS(TimerType) + Q_ENUMS(ScrollPhase) #endif // defined(Q_MOC_RUN) #if defined(Q_MOC_RUN) @@ -982,6 +983,14 @@ public: Key_MicMute = 0x01000113, + Key_Red = 0x01000114, + Key_Green = 0x01000115, + Key_Yellow = 0x01000116, + Key_Blue = 0x01000117, + + Key_ChannelUp = 0x01000118, + Key_ChannelDown = 0x01000119, + Key_MediaLast = 0x0100ffff, // Keypad navigation keys @@ -1173,7 +1182,8 @@ public: SystemLocaleShortDate, SystemLocaleLongDate, DefaultLocaleShortDate, - DefaultLocaleLongDate + DefaultLocaleLongDate, + RFC2822Date // RFC 2822 (+ 850 and 1036 during parsing) }; enum TimeSpec { @@ -1560,6 +1570,12 @@ public: CoarseTimer, VeryCoarseTimer }; + + enum ScrollPhase { + ScrollBegin = 1, + ScrollUpdate, + ScrollEnd + }; } #ifdef Q_MOC_RUN ; diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 677cddc87e..03ac8c6153 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -585,6 +585,10 @@ \value LocalDate \e{This enum value is deprecated.} Use Qt::SystemLocaleShortDate instead (or Qt::SystemLocaleLongDate if you want long dates). + \value RFC2822Date \l{RFC 2822}, \l{RFC 850} and \l{RFC 1036} format: either + \c{[ddd,] dd MMM yyyy hh:mm[:ss] +/-TZ} or \c{ddd MMM dd yyyy hh:mm[:ss] +/-TZ} + for combined dates and times. + \note For \c ISODate formats, each \c Y, \c M and \c D represents a single digit of the year, month and day used to specify the date. Each \c H, \c M and \c S represents a single digit of the hour, minute and second used to specify the time. @@ -1618,6 +1622,12 @@ \value Key_TouchpadOn \value Key_TouchpadOff \value Key_MicMute + \value Key_Red + \value Key_Green + \value Key_Yellow + \value Key_Blue + \value Key_ChannelUp + \value Key_ChannelDown \value Key_MediaLast \value Key_unknown @@ -2864,3 +2874,18 @@ nearest full second (e.g. an interval of 23500ms will be rounded to 24000ms, and 20300ms to 20000ms). */ + +/*! + \enum Qt::ScrollPhase + \since 5.2 + + This enum describes the phase of scrolling. + + \value ScrollBegin Scrolling is about to begin, but the scrolling + distance did not yet change. + + \value ScrollUpdate The scrolling distance has changed (default). + + \value ScrollEnd Scrolling has ended, but the scrolling distance + did not change anymore. +*/ diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index b638b4d509..dc9fa7383a 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -49,9 +49,9 @@ /* The operating system, must be one of: (Q_OS_x) - DARWIN - Darwin OS (synonym for Q_OS_MAC) - MAC - OS X or iOS (synonym for Q_OS_DARWIN) - MACX - OS X + DARWIN - Any Darwin system + MAC - OS X and iOS + OSX - OS X IOS - iOS MSDOS - MS-DOS and Windows OS2 - OS/2 @@ -186,8 +186,9 @@ # include <TargetConditionals.h> # if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE # define Q_OS_IOS -# else -# define Q_OS_MACX +# elif defined(TARGET_OS_MAC) && TARGET_OS_MAC +# define Q_OS_OSX +# define Q_OS_MACX // compatibility synonym # endif #endif |