diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 22 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-dist.h | 48 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-large.h | 140 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-medium.h | 241 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-minimal.h | 463 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-nacl.h | 233 | ||||
| -rw-r--r-- | src/corelib/global/qconfig-small.h | 281 | ||||
| -rw-r--r-- | src/corelib/global/qflags.h | 9 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 131 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 17 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 13 | ||||
| -rw-r--r-- | src/corelib/global/qlibraryinfo.h | 5 | ||||
| -rw-r--r-- | src/corelib/global/qlogging.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.h | 8 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 35 | ||||
| -rw-r--r-- | src/corelib/global/qnumeric_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qsysinfo.h | 18 | ||||
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 22 | ||||
| -rw-r--r-- | src/corelib/global/qt_windows.h | 13 |
19 files changed, 143 insertions, 1562 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 85613283f9..04f2084591 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1071,16 +1071,18 @@ # define Q_COMPILER_DEFAULT_DELETE_MEMBERS #endif -#if defined(__cpp_constexpr) && __cpp_constexpr-0 >= 201304 -# define Q_DECL_CONSTEXPR constexpr -# define Q_DECL_RELAXED_CONSTEXPR constexpr -# define Q_CONSTEXPR constexpr -# define Q_RELAXED_CONSTEXPR constexpr -#elif defined Q_COMPILER_CONSTEXPR -# define Q_DECL_CONSTEXPR constexpr -# define Q_DECL_RELAXED_CONSTEXPR -# define Q_CONSTEXPR constexpr -# define Q_RELAXED_CONSTEXPR const +#if defined Q_COMPILER_CONSTEXPR +# if defined(__cpp_constexpr) && __cpp_constexpr-0 >= 201304 +# define Q_DECL_CONSTEXPR constexpr +# define Q_DECL_RELAXED_CONSTEXPR constexpr +# define Q_CONSTEXPR constexpr +# define Q_RELAXED_CONSTEXPR constexpr +# else +# define Q_DECL_CONSTEXPR constexpr +# define Q_DECL_RELAXED_CONSTEXPR +# define Q_CONSTEXPR constexpr +# define Q_RELAXED_CONSTEXPR const +# endif #else # define Q_DECL_CONSTEXPR # define Q_DECL_RELAXED_CONSTEXPR diff --git a/src/corelib/global/qconfig-dist.h b/src/corelib/global/qconfig-dist.h deleted file mode 100644 index c9739db990..0000000000 --- a/src/corelib/global/qconfig-dist.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -/* - Empty leaves all features enabled. See doc/html/emb-features.html for choices. - - Note that disabling some features will produce a libqt that is not - compatible with other libqt builds. Such modifications are only - supported on Qt for Embedded Linux where reducing the library size is - important and where the application suite is often a fixed set. -*/ diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h deleted file mode 100644 index 270858e65b..0000000000 --- a/src/corelib/global/qconfig-large.h +++ /dev/null @@ -1,140 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Dialogs */ -#ifndef QT_NO_FILEDIALOG -# define QT_NO_FILEDIALOG -#endif -#ifndef QT_NO_FONTDIALOG -# define QT_NO_FONTDIALOG -#endif -#ifndef QT_NO_INPUTDIALOG -# define QT_NO_INPUTDIALOG -#endif -#ifndef QT_NO_PRINTDIALOG -# define QT_NO_PRINTDIALOG -#endif -#ifndef QT_NO_PROGRESSDIALOG -# define QT_NO_PROGRESSDIALOG -#endif - -/* Images */ -#ifndef QT_NO_IMAGEFORMAT_BMP -# define QT_NO_IMAGEFORMAT_BMP -#endif -#ifndef QT_NO_IMAGEFORMAT_PPM -# define QT_NO_IMAGEFORMAT_PPM -#endif - -/* Internationalization */ -#ifndef QT_NO_CODECS -# define QT_NO_CODECS -#endif -#ifndef QT_NO_TRANSLATION -# define QT_NO_TRANSLATION -#endif - -/* ItemViews */ -#ifndef QT_NO_TABLEVIEW -# define QT_NO_TABLEVIEW -#endif -#ifndef QT_NO_TREEVIEW -# define QT_NO_TREEVIEW -#endif - -/* Kernel */ -#ifndef QT_NO_CLIPBOARD -# define QT_NO_CLIPBOARD -#endif -#ifndef QT_NO_DRAGANDDROP -# define QT_NO_DRAGANDDROP -#endif -#ifndef QT_NO_EFFECTS -# define QT_NO_EFFECTS -#endif -#ifndef QT_NO_PROPERTIES -# define QT_NO_PROPERTIES -#endif - -/* Networking */ -#ifndef QT_NO_HTTP -# define QT_NO_HTTP -#endif -#ifndef QT_NO_UDPSOCKET -# define QT_NO_UDPSOCKET -#endif -#ifndef QT_NO_FTP -# define QT_NO_FTP -#endif - -/* Painting */ -#ifndef QT_NO_COLORNAMES -# define QT_NO_COLORNAMES -#endif -#ifndef QT_NO_PICTURE -# define QT_NO_PICTURE -#endif -#ifndef QT_NO_PRINTER -# define QT_NO_PRINTER -#endif -#ifndef QT_NO_CUPS -# define QT_NO_CUPS -#endif - -/* Styles */ -#ifndef QT_NO_STYLE_STYLESHEET -# define QT_NO_STYLE_STYLESHEET -#endif - -/* Widgets */ -#ifndef QT_NO_CALENDARWIDGET -# define QT_NO_CALENDARWIDGET -#endif -#ifndef QT_NO_DATETIMEEDIT -# define QT_NO_DATETIMEEDIT -#endif -#ifndef QT_NO_DIAL -# define QT_NO_DIAL -#endif -#ifndef QT_NO_TABLEWIDGET -# define QT_NO_TABLEWIDGET -#endif -#ifndef QT_NO_TREEWIDGET -# define QT_NO_TREEWIDGET -#endif diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h deleted file mode 100644 index 830e936924..0000000000 --- a/src/corelib/global/qconfig-medium.h +++ /dev/null @@ -1,241 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Dialogs */ -#ifndef QT_NO_COLORDIALOG -# define QT_NO_COLORDIALOG -#endif -#ifndef QT_NO_FILEDIALOG -# define QT_NO_FILEDIALOG -#endif -#ifndef QT_NO_FONTDIALOG -# define QT_NO_FONTDIALOG -#endif -#ifndef QT_NO_INPUTDIALOG -# define QT_NO_INPUTDIALOG -#endif -#ifndef QT_NO_PRINTDIALOG -# define QT_NO_PRINTDIALOG -#endif -#ifndef QT_NO_PROGRESSDIALOG -# define QT_NO_PROGRESSDIALOG -#endif - -/* Images */ -#ifndef QT_NO_IMAGEFORMAT_BMP -# define QT_NO_IMAGEFORMAT_BMP -#endif -#ifndef QT_NO_IMAGEFORMAT_PPM -# define QT_NO_IMAGEFORMAT_PPM -#endif -#ifndef QT_NO_MOVIE -# define QT_NO_MOVIE -#endif - -/* Internationalization */ -#ifndef QT_NO_BIG_CODECS -# define QT_NO_BIG_CODECS -#endif -#ifndef QT_NO_TEXTCODEC -# define QT_NO_TEXTCODEC -#endif -#ifndef QT_NO_CODECS -# define QT_NO_CODECS -#endif -#ifndef QT_NO_TRANSLATION -# define QT_NO_TRANSLATION -#endif - -/* ItemViews */ -#ifndef QT_NO_TABLEVIEW -# define QT_NO_TABLEVIEW -#endif -#ifndef QT_NO_TREEVIEW -# define QT_NO_TREEVIEW -#endif - -/* Kernel */ -#ifndef QT_NO_ACTION -# define QT_NO_ACTION -#endif -#ifndef QT_NO_CLIPBOARD -# define QT_NO_CLIPBOARD -#endif -#ifndef QT_NO_DRAGANDDROP -# define QT_NO_DRAGANDDROP -#endif -#ifndef QT_NO_EFFECTS -# define QT_NO_EFFECTS -#endif -#ifndef QT_NO_PROPERTIES -# define QT_NO_PROPERTIES -#endif -#ifndef QT_NO_SESSIONMANAGER -# define QT_NO_SESSIONMANAGER -#endif -#ifndef QT_NO_SHORTCUT -# define QT_NO_SHORTCUT -#endif -#ifndef QT_NO_WHEELEVENT -# define QT_NO_WHEELEVENT -#endif - -/* Networking */ -#ifndef QT_NO_HTTP -# define QT_NO_HTTP -#endif -#ifndef QT_NO_NETWORKPROXY -# define QT_NO_NETWORKPROXY -#endif -#ifndef QT_NO_SOCKS5 -# define QT_NO_SOCKS5 -#endif -#ifndef QT_NO_UDPSOCKET -# define QT_NO_UDPSOCKET -#endif -#ifndef QT_NO_FTP -# define QT_NO_FTP -#endif - -/* Painting */ -#ifndef QT_NO_COLORNAMES -# define QT_NO_COLORNAMES -#endif -#ifndef QT_NO_PICTURE -# define QT_NO_PICTURE -#endif -#ifndef QT_NO_PRINTER -# define QT_NO_PRINTER -#endif -#ifndef QT_NO_CUPS -# define QT_NO_CUPS -#endif - -/* Styles */ -#ifndef QT_NO_STYLE_STYLESHEET -# define QT_NO_STYLE_STYLESHEET -#endif - -/* Utilities */ -#ifndef QT_NO_UNDOCOMMAND -# define QT_NO_UNDOCOMMAND -#endif -#ifndef QT_NO_UNDOGROUP -# define QT_NO_UNDOGROUP -#endif -#ifndef QT_NO_UNDOSTACK -# define QT_NO_UNDOSTACK -#endif -#ifndef QT_NO_UNDOVIEW -# define QT_NO_UNDOVIEW -#endif -#ifndef QT_NO_GESTURES -# define QT_NO_GESTURES -#endif - -/* Widgets */ -#ifndef QT_NO_LCDNUMBER -# define QT_NO_LCDNUMBER -#endif -#ifndef QT_NO_CALENDARWIDGET -# define QT_NO_CALENDARWIDGET -#endif -#ifndef QT_NO_DATETIMEEDIT -# define QT_NO_DATETIMEEDIT -#endif -#ifndef QT_NO_MENU -# define QT_NO_MENU -#endif -#ifndef QT_NO_CONTEXTMENU -# define QT_NO_CONTEXTMENU -#endif -#ifndef QT_NO_MAINWINDOW -# define QT_NO_MAINWINDOW -#endif -#ifndef QT_NO_DOCKWIDGET -# define QT_NO_DOCKWIDGET -#endif -#ifndef QT_NO_TOOLBAR -# define QT_NO_TOOLBAR -#endif -#ifndef QT_NO_MENUBAR -# define QT_NO_MENUBAR -#endif -#ifndef QT_NO_PROGRESSBAR -# define QT_NO_PROGRESSBAR -#endif -#ifndef QT_NO_SIZEGRIP -# define QT_NO_SIZEGRIP -#endif -#ifndef QT_NO_DIAL -# define QT_NO_DIAL -#endif -#ifndef QT_NO_STACKEDWIDGET -# define QT_NO_STACKEDWIDGET -#endif -#ifndef QT_NO_TABWIDGET -# define QT_NO_TABWIDGET -#endif -#ifndef QT_NO_STATUSBAR -# define QT_NO_STATUSBAR -#endif -#ifndef QT_NO_STATUSTIP -# define QT_NO_STATUSTIP -#endif -#ifndef QT_NO_TABLEWIDGET -# define QT_NO_TABLEWIDGET -#endif -#ifndef QT_NO_TOOLBUTTON -# define QT_NO_TOOLBUTTON -#endif -#ifndef QT_NO_TABBAR -# define QT_NO_TABBAR -#endif -#ifndef QT_NO_TOOLBOX -# define QT_NO_TOOLBOX -#endif -#ifndef QT_NO_WHATSTHIS -# define QT_NO_WHATSTHIS -#endif -#ifndef QT_NO_TOOLTIP -# define QT_NO_TOOLTIP -#endif -#ifndef QT_NO_TREEWIDGET -# define QT_NO_TREEWIDGET -#endif diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h deleted file mode 100644 index 305655b1c9..0000000000 --- a/src/corelib/global/qconfig-minimal.h +++ /dev/null @@ -1,463 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Data structures */ -#ifndef QT_NO_TEXTDATE -# define QT_NO_TEXTDATE -#endif -#ifndef QT_NO_DATESTRING -# define QT_NO_DATESTRING -#endif - -/* Dialogs */ -#ifndef QT_NO_COLORDIALOG -# define QT_NO_COLORDIALOG -#endif -#ifndef QT_NO_ERRORMESSAGE -# define QT_NO_ERRORMESSAGE -#endif -#ifndef QT_NO_FILEDIALOG -# define QT_NO_FILEDIALOG -#endif -#ifndef QT_NO_FONTDIALOG -# define QT_NO_FONTDIALOG -#endif -#ifndef QT_NO_INPUTDIALOG -# define QT_NO_INPUTDIALOG -#endif -#ifndef QT_NO_MESSAGEBOX -# define QT_NO_MESSAGEBOX -#endif -#ifndef QT_NO_PRINTDIALOG -# define QT_NO_PRINTDIALOG -#endif -#ifndef QT_NO_PRINTPREVIEWDIALOG -# define QT_NO_PRINTPREVIEWDIALOG -#endif -#ifndef QT_NO_PROGRESSDIALOG -# define QT_NO_PROGRESSDIALOG -#endif -#ifndef QT_NO_WIZARD -# define QT_NO_WIZARD -#endif - -/* File I/O */ -#ifndef QT_NO_DOM -# define QT_NO_DOM -#endif -#ifndef QT_NO_FILESYSTEMWATCHER -# define QT_NO_FILESYSTEMWATCHER -#endif -#ifndef QT_NO_FILESYSTEMMODEL -# define QT_NO_FILESYSTEMMODEL -#endif -#ifndef QT_NO_PROCESS -# define QT_NO_PROCESS -#endif -#ifndef QT_NO_TEMPORARYFILE -# define QT_NO_TEMPORARYFILE -#endif -#ifndef QT_NO_SETTINGS -# define QT_NO_SETTINGS -#endif -#ifndef QT_NO_LIBRARY -# define QT_NO_LIBRARY -#endif - -/* Fonts */ -#ifndef QT_NO_FREETYPE -# define QT_NO_FREETYPE -#endif - -/* Images */ -#ifndef QT_NO_IMAGEFORMATPLUGIN -# define QT_NO_IMAGEFORMATPLUGIN -#endif -#ifndef QT_NO_IMAGEFORMAT_BMP -# define QT_NO_IMAGEFORMAT_BMP -#endif -#ifndef QT_NO_IMAGEFORMAT_JPEG -# define QT_NO_IMAGEFORMAT_JPEG -#endif -#ifndef QT_NO_IMAGEFORMAT_PNG -# define QT_NO_IMAGEFORMAT_PNG -#endif -#ifndef QT_NO_IMAGEFORMAT_PPM -# define QT_NO_IMAGEFORMAT_PPM -#endif -#ifndef QT_NO_IMAGEFORMAT_XBM -# define QT_NO_IMAGEFORMAT_XBM -#endif -#ifndef QT_NO_IMAGEFORMAT_XPM -# define QT_NO_IMAGEFORMAT_XPM -#endif -#ifndef QT_NO_IMAGE_HEURISTIC_MASK -# define QT_NO_IMAGE_HEURISTIC_MASK -#endif -#ifndef QT_NO_MOVIE -# define QT_NO_MOVIE -#endif - -/* Internationalization */ -#ifndef QT_NO_BIG_CODECS -# define QT_NO_BIG_CODECS -#endif -#ifndef QT_NO_TEXTCODEC -# define QT_NO_TEXTCODEC -#endif -#ifndef QT_NO_CODECS -# define QT_NO_CODECS -#endif -#ifndef QT_NO_TRANSLATION -# define QT_NO_TRANSLATION -#endif - -/* ItemViews */ -#ifndef QT_NO_ITEMVIEWS -# define QT_NO_ITEMVIEWS -#endif -#ifndef QT_NO_DATAWIDGETMAPPER -# define QT_NO_DATAWIDGETMAPPER -#endif -#ifndef QT_NO_DIRMODEL -# define QT_NO_DIRMODEL -#endif -#ifndef QT_NO_LISTVIEW -# define QT_NO_LISTVIEW -#endif -#ifndef QT_NO_COLUMNVIEW -# define QT_NO_COLUMNVIEW -#endif -#ifndef QT_NO_PROXYMODEL -# define QT_NO_PROXYMODEL -#endif -#ifndef QT_NO_SORTFILTERPROXYMODEL -# define QT_NO_SORTFILTERPROXYMODEL -#endif -#ifndef QT_NO_STANDARDITEMMODEL -# define QT_NO_STANDARDITEMMODEL -#endif -#ifndef QT_NO_STRINGLISTMODEL -# define QT_NO_STRINGLISTMODEL -#endif -#ifndef QT_NO_TABLEVIEW -# define QT_NO_TABLEVIEW -#endif -#ifndef QT_NO_TREEVIEW -# define QT_NO_TREEVIEW -#endif - -/* Kernel */ -#ifndef QT_NO_ACTION -# define QT_NO_ACTION -#endif -#ifndef QT_NO_CLIPBOARD -# define QT_NO_CLIPBOARD -#endif -#ifndef QT_NO_CSSPARSER -# define QT_NO_CSSPARSER -#endif -#ifndef QT_NO_CURSOR -# define QT_NO_CURSOR -#endif -#ifndef QT_NO_DRAGANDDROP -# define QT_NO_DRAGANDDROP -#endif -#ifndef QT_NO_EFFECTS -# define QT_NO_EFFECTS -#endif -#ifndef QT_NO_PROPERTIES -# define QT_NO_PROPERTIES -#endif -#ifndef QT_NO_SESSIONMANAGER -# define QT_NO_SESSIONMANAGER -#endif -#ifndef QT_NO_SHAREDMEMORY -# define QT_NO_SHAREDMEMORY -#endif -#ifndef QT_NO_SHORTCUT -# define QT_NO_SHORTCUT -#endif -#ifndef QT_NO_SYSTEMSEMAPHORE -# define QT_NO_SYSTEMSEMAPHORE -#endif -#ifndef QT_NO_TABLETEVENT -# define QT_NO_TABLETEVENT -#endif -#ifndef QT_NO_TEXTHTMLPARSER -# define QT_NO_TEXTHTMLPARSER -#endif -#ifndef QT_NO_CONCURRENT -# define QT_NO_CONCURRENT -#endif -#ifndef QT_NO_WHEELEVENT -# define QT_NO_WHEELEVENT -#endif -#ifndef QT_NO_XMLSTREAM -# define QT_NO_XMLSTREAM -#endif -#ifndef QT_NO_XMLSTREAMREADER -# define QT_NO_XMLSTREAMREADER -#endif -#ifndef QT_NO_XMLSTREAMWRITER -# define QT_NO_XMLSTREAMWRITER -#endif - -/* Networking */ -#ifndef QT_NO_HTTP -# define QT_NO_HTTP -#endif -#ifndef QT_NO_NETWORKPROXY -# define QT_NO_NETWORKPROXY -#endif -#ifndef QT_NO_SOCKS5 -# define QT_NO_SOCKS5 -#endif -#ifndef QT_NO_UDPSOCKET -# define QT_NO_UDPSOCKET -#endif -#ifndef QT_NO_FTP -# define QT_NO_FTP -#endif - -/* Painting */ -#ifndef QT_NO_COLORNAMES -# define QT_NO_COLORNAMES -#endif -#ifndef QT_NO_PAINT_DEBUG -# define QT_NO_PAINT_DEBUG -#endif -#ifndef QT_NO_PICTURE -# define QT_NO_PICTURE -#endif -#ifndef QT_NO_PRINTER -# define QT_NO_PRINTER -#endif -#ifndef QT_NO_CUPS -# define QT_NO_CUPS -#endif - -/* Styles */ -#ifndef QT_NO_STYLE_FUSION -# define QT_NO_STYLE_FUSION -#endif -#ifndef QT_NO_STYLE_STYLESHEET -# define QT_NO_STYLE_STYLESHEET -#endif -#ifndef QT_NO_STYLE_WINDOWSCE -# define QT_NO_STYLE_WINDOWSCE -#endif -#ifndef QT_NO_STYLE_WINDOWSMOBILE -# define QT_NO_STYLE_WINDOWSMOBILE -#endif -#ifndef QT_NO_STYLE_WINDOWSVISTA -# define QT_NO_STYLE_WINDOWSVISTA -#endif -#ifndef QT_NO_STYLE_WINDOWSXP -# define QT_NO_STYLE_WINDOWSXP -#endif - -/* Utilities */ -#ifndef QT_NO_ACCESSIBILITY -# define QT_NO_ACCESSIBILITY -#endif -#ifndef QT_NO_COMPLETER -# define QT_NO_COMPLETER -#endif -#ifndef QT_NO_DESKTOPSERVICES -# define QT_NO_DESKTOPSERVICES -#endif -#ifndef QT_NO_MIMETYPE -# define QT_NO_MIMETYPE -#endif -#ifndef QT_NO_SYSTEMTRAYICON -# define QT_NO_SYSTEMTRAYICON -#endif -#ifndef QT_NO_UNDOCOMMAND -# define QT_NO_UNDOCOMMAND -#endif -#ifndef QT_NO_UNDOGROUP -# define QT_NO_UNDOGROUP -#endif -#ifndef QT_NO_UNDOSTACK -# define QT_NO_UNDOSTACK -#endif -#ifndef QT_NO_UNDOVIEW -# define QT_NO_UNDOVIEW -#endif -#ifndef QT_NO_GESTURES -# define QT_NO_GESTURES -#endif - -/* Widgets */ -#ifndef QT_NO_GROUPBOX -# define QT_NO_GROUPBOX -#endif -#ifndef QT_NO_BUTTONGROUP -# define QT_NO_BUTTONGROUP -#endif -#ifndef QT_NO_LCDNUMBER -# define QT_NO_LCDNUMBER -#endif -#ifndef QT_NO_LINEEDIT -# define QT_NO_LINEEDIT -#endif -#ifndef QT_NO_COMBOBOX -# define QT_NO_COMBOBOX -#endif -#ifndef QT_NO_FONTCOMBOBOX -# define QT_NO_FONTCOMBOBOX -#endif -#ifndef QT_NO_SPINBOX -# define QT_NO_SPINBOX -#endif -#ifndef QT_NO_CALENDARWIDGET -# define QT_NO_CALENDARWIDGET -#endif -#ifndef QT_NO_DATETIMEEDIT -# define QT_NO_DATETIMEEDIT -#endif -#ifndef QT_NO_LISTWIDGET -# define QT_NO_LISTWIDGET -#endif -#ifndef QT_NO_MENU -# define QT_NO_MENU -#endif -#ifndef QT_NO_CONTEXTMENU -# define QT_NO_CONTEXTMENU -#endif -#ifndef QT_NO_MAINWINDOW -# define QT_NO_MAINWINDOW -#endif -#ifndef QT_NO_DOCKWIDGET -# define QT_NO_DOCKWIDGET -#endif -#ifndef QT_NO_TOOLBAR -# define QT_NO_TOOLBAR -#endif -#ifndef QT_NO_MENUBAR -# define QT_NO_MENUBAR -#endif -#ifndef QT_NO_PROGRESSBAR -# define QT_NO_PROGRESSBAR -#endif -#ifndef QT_NO_RESIZEHANDLER -# define QT_NO_RESIZEHANDLER -#endif -#ifndef QT_NO_RUBBERBAND -# define QT_NO_RUBBERBAND -#endif -#ifndef QT_NO_SPLITTER -# define QT_NO_SPLITTER -#endif -#ifndef QT_NO_SIZEGRIP -# define QT_NO_SIZEGRIP -#endif -#ifndef QT_NO_SLIDER -# define QT_NO_SLIDER -#endif -#ifndef QT_NO_DIAL -# define QT_NO_DIAL -#endif -#ifndef QT_NO_SCROLLBAR -# define QT_NO_SCROLLBAR -#endif -#ifndef QT_NO_SCROLLAREA -# define QT_NO_SCROLLAREA -#endif -#ifndef QT_NO_GRAPHICSVIEW -# define QT_NO_GRAPHICSVIEW -#endif -#ifndef QT_NO_PRINTPREVIEWWIDGET -# define QT_NO_PRINTPREVIEWWIDGET -#endif -#ifndef QT_NO_MDIAREA -# define QT_NO_MDIAREA -#endif -#ifndef QT_NO_TEXTEDIT -# define QT_NO_TEXTEDIT -#endif -#ifndef QT_NO_SYNTAXHIGHLIGHTER -# define QT_NO_SYNTAXHIGHLIGHTER -#endif -#ifndef QT_NO_TEXTBROWSER -# define QT_NO_TEXTBROWSER -#endif -#ifndef QT_NO_SPINWIDGET -# define QT_NO_SPINWIDGET -#endif -#ifndef QT_NO_SPLASHSCREEN -# define QT_NO_SPLASHSCREEN -#endif -#ifndef QT_NO_STACKEDWIDGET -# define QT_NO_STACKEDWIDGET -#endif -#ifndef QT_NO_TABWIDGET -# define QT_NO_TABWIDGET -#endif -#ifndef QT_NO_STATUSBAR -# define QT_NO_STATUSBAR -#endif -#ifndef QT_NO_STATUSTIP -# define QT_NO_STATUSTIP -#endif -#ifndef QT_NO_TABLEWIDGET -# define QT_NO_TABLEWIDGET -#endif -#ifndef QT_NO_TOOLBUTTON -# define QT_NO_TOOLBUTTON -#endif -#ifndef QT_NO_TABBAR -# define QT_NO_TABBAR -#endif -#ifndef QT_NO_TOOLBOX -# define QT_NO_TOOLBOX -#endif -#ifndef QT_NO_WHATSTHIS -# define QT_NO_WHATSTHIS -#endif -#ifndef QT_NO_TOOLTIP -# define QT_NO_TOOLTIP -#endif -#ifndef QT_NO_TREEWIDGET -# define QT_NO_TREEWIDGET -#endif -#ifndef QT_NO_VALIDATOR -# define QT_NO_VALIDATOR -#endif diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h deleted file mode 100644 index 10292c05c3..0000000000 --- a/src/corelib/global/qconfig-nacl.h +++ /dev/null @@ -1,233 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#if 0 -#pragma qt_sync_stop_processing -#endif - -#define QT_FONTS_ARE_RESOURCES - -/* Data structures */ -#ifndef QT_NO_TEXTDATE -# define QT_NO_TEXTDATE -#endif -#ifndef QT_NO_DATESTRING -# define QT_NO_DATESTRING -#endif - -/* Dialogs */ -#ifndef QT_NO_FILEDIALOG -# define QT_NO_FILEDIALOG -#endif -#ifndef QT_NO_PRINTDIALOG -# define QT_NO_PRINTDIALOG -#endif -#ifndef QT_NO_PRINTPREVIEWDIALOG -# define QT_NO_PRINTPREVIEWDIALOG -#endif - - -/* File I/O */ -#ifndef QT_NO_DOM -# define QT_NO_DOM -#endif -#ifndef QT_NO_FILESYSTEMWATCHER -# define QT_NO_FILESYSTEMWATCHER -#endif -#ifndef QT_NO_FILESYSTEMMODEL -# define QT_NO_FILESYSTEMMODEL -#endif -#ifndef QT_NO_FILESYSTEMMODEL -# define QT_NO_FILESYSTEMMODEL -#endif -#ifndef QT_NO_PROCESS -# define QT_NO_PROCESS -#endif -#ifndef QT_NO_TEMPORARYFILE -# define QT_NO_TEMPORARYFILE -#endif -#ifndef QT_NO_SETTINGS -# define QT_NO_SETTINGS -#endif -#ifndef QT_NO_LIBRARY -# define QT_NO_LIBRARY -#endif - -/* Images */ -#ifndef QT_NO_IMAGEFORMATPLUGIN -# define QT_NO_IMAGEFORMATPLUGIN -#endif -#ifndef QT_NO_IMAGE_HEURISTIC_MASK -# define QT_NO_IMAGE_HEURISTIC_MASK -#endif -#ifndef QT_NO_MOVIE -# define QT_NO_MOVIE -#endif - -/* Internationalization */ -#ifndef QT_NO_BIG_CODECS -# define QT_NO_BIG_CODECS -#endif -#ifndef QT_NO_TEXTCODEC -# define QT_NO_TEXTCODEC -#endif -#ifndef QT_NO_CODECS -# define QT_NO_CODECS -#endif -#ifndef QT_NO_TRANSLATION -# define QT_NO_TRANSLATION -#endif - -/* ItemViews */ - -#ifndef QT_NO_DIRMODEL -# define QT_NO_DIRMODEL -#endif - -/* Kernel */ -#ifndef QT_NO_CLIPBOARD -# define QT_NO_CLIPBOARD -#endif -#ifndef QT_NO_CSSPARSER -# define QT_NO_CSSPARSER -#endif -#ifndef QT_NO_CURSOR -# define QT_NO_CURSOR -#endif -#ifndef QT_NO_DRAGANDDROP -# define QT_NO_DRAGANDDROP -#endif -#ifndef QT_NO_EFFECTS -# define QT_NO_EFFECTS -#endif -#ifndef QT_NO_SESSIONMANAGER -# define QT_NO_SESSIONMANAGER -#endif -#ifndef QT_NO_SHAREDMEMORY -# define QT_NO_SHAREDMEMORY -#endif -#ifndef QT_NO_SYSTEMLOCALE -# define QT_NO_SYSTEMSEMAPHORE -#endif -#ifndef QT_NO_SYSTEMSEMAPHORE -# define QT_NO_SYSTEMSEMAPHORE -#endif -#ifndef QT_NO_TABLETEVENT -# define QT_NO_TABLETEVENT -#endif -#ifndef QT_NO_CRASHHANDLER -# define QT_NO_CRASHHANDLER -#endif -#ifndef QT_NO_CONCURRENT -# define QT_NO_CONCURRENT -#endif -#ifndef QT_NO_XMLSTREAM -# define QT_NO_XMLSTREAM -#endif -#ifndef QT_NO_XMLSTREAMREADER -# define QT_NO_XMLSTREAMREADER -#endif -#ifndef QT_NO_XMLSTREAMWRITER -# define QT_NO_XMLSTREAMWRITER -#endif - -/* Networking */ -#ifndef QT_NO_HTTP -# define QT_NO_HTTP -#endif -#ifndef QT_NO_NETWORKPROXY -# define QT_NO_NETWORKPROXY -#endif -#ifndef QT_NO_SOCKS5 -# define QT_NO_SOCKS5 -#endif -#ifndef QT_NO_UDPSOCKET -# define QT_NO_UDPSOCKET -#endif -#ifndef QT_NO_FTP -# define QT_NO_FTP -#endif - -/* Painting */ -#ifndef QT_NO_COLORNAMES -# define QT_NO_COLORNAMES -#endif -#ifndef QT_NO_PAINT_DEBUG -# define QT_NO_PAINT_DEBUG -#endif -#ifndef QT_NO_PICTURE -# define QT_NO_PICTURE -#endif -#ifndef QT_NO_PRINTER -# define QT_NO_PRINTER -#endif -#ifndef QT_NO_CUPS -# define QT_NO_CUPS -#endif - -/* Styles */ -#ifndef QT_NO_STYLE_STYLESHEET -# define QT_NO_STYLE_STYLESHEET -#endif -#ifndef QT_NO_STYLE_WINDOWSCE -# define QT_NO_STYLE_WINDOWSCE -#endif -#ifndef QT_NO_STYLE_WINDOWSMOBILE -# define QT_NO_STYLE_WINDOWSMOBILE -#endif -#ifndef QT_NO_STYLE_WINDOWSVISTA -# define QT_NO_STYLE_WINDOWSVISTA -#endif -#ifndef QT_NO_STYLE_WINDOWSXP -# define QT_NO_STYLE_WINDOWSXP -#endif - -/* Utilities */ -#ifndef QT_NO_ACCESSIBILITY -# define QT_NO_ACCESSIBILITY -#endif -#ifndef QT_NO_COMPLETER -# define QT_NO_COMPLETER -#endif -#ifndef QT_NO_DESKTOPSERVICES -# define QT_NO_DESKTOPSERVICES -#endif -#ifndef QT_NO_SYSTEMTRAYICON -# define QT_NO_SYSTEMTRAYICON -#endif diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h deleted file mode 100644 index 1f1bff91a3..0000000000 --- a/src/corelib/global/qconfig-small.h +++ /dev/null @@ -1,281 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Dialogs */ -#ifndef QT_NO_COLORDIALOG -# define QT_NO_COLORDIALOG -#endif -#ifndef QT_NO_ERRORMESSAGE -# define QT_NO_ERRORMESSAGE -#endif -#ifndef QT_NO_FILEDIALOG -# define QT_NO_FILEDIALOG -#endif -#ifndef QT_NO_FONTDIALOG -# define QT_NO_FONTDIALOG -#endif -#ifndef QT_NO_INPUTDIALOG -# define QT_NO_INPUTDIALOG -#endif -#ifndef QT_NO_MESSAGEBOX -# define QT_NO_MESSAGEBOX -#endif -#ifndef QT_NO_PRINTDIALOG -# define QT_NO_PRINTDIALOG -#endif -#ifndef QT_NO_PROGRESSDIALOG -# define QT_NO_PROGRESSDIALOG -#endif - -/* File I/O */ -#ifndef QT_NO_SETTINGS -# define QT_NO_SETTINGS -#endif -#ifndef QT_NO_LIBRARY -# define QT_NO_LIBRARY -#endif - -/* Fonts */ -#ifndef QT_NO_FREETYPE -# define QT_NO_FREETYPE -#endif - -/* Images */ -#ifndef QT_NO_IMAGEFORMATPLUGIN -# define QT_NO_IMAGEFORMATPLUGIN -#endif -#ifndef QT_NO_IMAGEFORMAT_BMP -# define QT_NO_IMAGEFORMAT_BMP -#endif -#ifndef QT_NO_IMAGEFORMAT_JPEG -# define QT_NO_IMAGEFORMAT_JPEG -#endif -#ifndef QT_NO_IMAGEFORMAT_PPM -# define QT_NO_IMAGEFORMAT_PPM -#endif -#ifndef QT_NO_IMAGEFORMAT_XBM -# define QT_NO_IMAGEFORMAT_XBM -#endif -#ifndef QT_NO_IMAGEFORMAT_XPM -# define QT_NO_IMAGEFORMAT_XPM -#endif -#ifndef QT_NO_MOVIE -# define QT_NO_MOVIE -#endif - -/* Internationalization */ -#ifndef QT_NO_TEXTCODEC -# define QT_NO_TEXTCODEC -#endif -#ifndef QT_NO_CODECS -# define QT_NO_CODECS -#endif -#ifndef QT_NO_TRANSLATION -# define QT_NO_TRANSLATION -#endif - -/* ItemViews */ -#ifndef QT_NO_DIRMODEL -# define QT_NO_DIRMODEL -#endif -#ifndef QT_NO_PROXYMODEL -# define QT_NO_PROXYMODEL -#endif -#ifndef QT_NO_SORTFILTERPROXYMODEL -# define QT_NO_SORTFILTERPROXYMODEL -#endif -#ifndef QT_NO_STRINGLISTMODEL -# define QT_NO_STRINGLISTMODEL -#endif -#ifndef QT_NO_TABLEVIEW -# define QT_NO_TABLEVIEW -#endif -#ifndef QT_NO_TREEVIEW -# define QT_NO_TREEVIEW -#endif - -/* Kernel */ -#ifndef QT_NO_ACTION -# define QT_NO_ACTION -#endif -#ifndef QT_NO_CLIPBOARD -# define QT_NO_CLIPBOARD -#endif -#ifndef QT_NO_DRAGANDDROP -# define QT_NO_DRAGANDDROP -#endif -#ifndef QT_NO_EFFECTS -# define QT_NO_EFFECTS -#endif -#ifndef QT_NO_PROPERTIES -# define QT_NO_PROPERTIES -#endif -#ifndef QT_NO_SESSIONMANAGER -# define QT_NO_SESSIONMANAGER -#endif -#ifndef QT_NO_SHORTCUT -# define QT_NO_SHORTCUT -#endif -#ifndef QT_NO_WHEELEVENT -# define QT_NO_WHEELEVENT -#endif - -/* Networking */ -#ifndef QT_NO_HTTP -# define QT_NO_HTTP -#endif - -/* Painting */ -#ifndef QT_NO_COLORNAMES -# define QT_NO_COLORNAMES -#endif -#ifndef QT_NO_PICTURE -# define QT_NO_PICTURE -#endif -#ifndef QT_NO_PRINTER -# define QT_NO_PRINTER -#endif -#ifndef QT_NO_CUPS -# define QT_NO_CUPS -#endif - -/* Styles */ -#ifndef QT_NO_STYLE_FUSION -# define QT_NO_STYLE_FUSION -#endif -#ifndef QT_NO_STYLE_STYLESHEET -# define QT_NO_STYLE_STYLESHEET -#endif -#ifndef QT_NO_STYLE_WINDOWSVISTA -# define QT_NO_STYLE_WINDOWSVISTA -#endif - -/* Utilities */ -#ifndef QT_NO_COMPLETER -# define QT_NO_COMPLETER -#endif -#ifndef QT_NO_DESKTOPSERVICES -# define QT_NO_DESKTOPSERVICES -#endif -#ifndef QT_NO_MIMETYPE -# define QT_NO_MIMETYPE -#endif -#ifndef QT_NO_SYSTEMTRAYICON -# define QT_NO_SYSTEMTRAYICON -#endif -#ifndef QT_NO_GESTURES -# define QT_NO_GESTURES -#endif - -/* Widgets */ -#ifndef QT_NO_LCDNUMBER -# define QT_NO_LCDNUMBER -#endif -#ifndef QT_NO_FONTCOMBOBOX -# define QT_NO_FONTCOMBOBOX -#endif -#ifndef QT_NO_SPINBOX -# define QT_NO_SPINBOX -#endif -#ifndef QT_NO_CALENDARWIDGET -# define QT_NO_CALENDARWIDGET -#endif -#ifndef QT_NO_DATETIMEEDIT -# define QT_NO_DATETIMEEDIT -#endif -#ifndef QT_NO_MENU -# define QT_NO_MENU -#endif -#ifndef QT_NO_CONTEXTMENU -# define QT_NO_CONTEXTMENU -#endif -#ifndef QT_NO_MAINWINDOW -# define QT_NO_MAINWINDOW -#endif -#ifndef QT_NO_DOCKWIDGET -# define QT_NO_DOCKWIDGET -#endif -#ifndef QT_NO_TOOLBAR -# define QT_NO_TOOLBAR -#endif -#ifndef QT_NO_MENUBAR -# define QT_NO_MENUBAR -#endif -#ifndef QT_NO_PROGRESSBAR -# define QT_NO_PROGRESSBAR -#endif -#ifndef QT_NO_SPLITTER -# define QT_NO_SPLITTER -#endif -#ifndef QT_NO_SIZEGRIP -# define QT_NO_SIZEGRIP -#endif -#ifndef QT_NO_STACKEDWIDGET -# define QT_NO_STACKEDWIDGET -#endif -#ifndef QT_NO_TABWIDGET -# define QT_NO_TABWIDGET -#endif -#ifndef QT_NO_STATUSBAR -# define QT_NO_STATUSBAR -#endif -#ifndef QT_NO_TABLEWIDGET -# define QT_NO_TABLEWIDGET -#endif -#ifndef QT_NO_TOOLBUTTON -# define QT_NO_TOOLBUTTON -#endif -#ifndef QT_NO_TABBAR -# define QT_NO_TABBAR -#endif -#ifndef QT_NO_TOOLBOX -# define QT_NO_TOOLBOX -#endif -#ifndef QT_NO_WHATSTHIS -# define QT_NO_WHATSTHIS -#endif -#ifndef QT_NO_TOOLTIP -# define QT_NO_TOOLTIP -#endif -#ifndef QT_NO_TREEWIDGET -# define QT_NO_TREEWIDGET -#endif -#ifndef QT_NO_VALIDATOR -# define QT_NO_VALIDATOR -#endif diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index b907caa9b6..a6bd37c33f 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -111,8 +111,8 @@ public: typedef Enum enum_type; // compiler-generated copy/move ctor/assignment operators are fine! #ifdef Q_QDOC - inline QFlags(const QFlags &other); - inline QFlags &operator=(const QFlags &other); + Q_DECL_CONSTEXPR inline QFlags(const QFlags &other); + Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other); #endif Q_DECL_CONSTEXPR inline QFlags(Enum f) Q_DECL_NOTHROW : i(Int(f)) {} Q_DECL_CONSTEXPR inline QFlags(Zero = Q_NULLPTR) Q_DECL_NOTHROW : i(0) {} @@ -163,8 +163,10 @@ private: Int i; }; +#ifndef Q_MOC_RUN #define Q_DECLARE_FLAGS(Flags, Enum)\ typedef QFlags<Enum> Flags; +#endif #define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \ Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) Q_DECL_NOTHROW \ @@ -179,8 +181,11 @@ Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, #else /* Q_NO_TYPESAFE_FLAGS */ +#ifndef Q_MOC_RUN #define Q_DECLARE_FLAGS(Flags, Enum)\ typedef uint Flags; +#endif + #define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) #endif /* Q_NO_TYPESAFE_FLAGS */ diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 6ca2ecff91..dc7f492bb1 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -47,7 +47,6 @@ #include "qdatetime.h" #include <private/qlocale_tools_p.h> -#include <private/qsystemlibrary_p.h> #include <qmutex.h> #ifndef QT_NO_QOBJECT @@ -64,11 +63,9 @@ # include <exception> #endif -#if !defined(Q_OS_WINCE) -# include <errno.h> -# if defined(Q_CC_MSVC) -# include <crtdbg.h> -# endif +#include <errno.h> +#if defined(Q_CC_MSVC) +# include <crtdbg.h> #endif #ifdef Q_OS_WINRT @@ -573,11 +570,11 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in \snippet code/src_corelib_global_qglobal.cpp 4 The remaining functions are qRound() and qRound64(), which both - accept a \l qreal value as their argument returning the value - rounded up to the nearest integer and 64-bit integer respectively, - the qInstallMessageHandler() function which installs the given - QtMessageHandler, and the qVersion() function which returns the - version number of Qt at run-time as a string. + accept a \c double or \c float value as their argument returning + the value rounded up to the nearest integer and 64-bit integer + respectively, the qInstallMessageHandler() function which installs + the given QtMessageHandler, and the qVersion() function which + returns the version number of Qt at run-time as a string. \section1 Macros @@ -864,24 +861,44 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in \snippet code/src_corelib_global_qglobal.cpp 10 */ -/*! \fn int qRound(qreal value) +/*! \fn int qRound(double value) + \relates <QtGlobal> + + Rounds \a value to the nearest integer. + + Example: + + \snippet code/src_corelib_global_qglobal.cpp 11A +*/ + +/*! \fn int qRound(float value) \relates <QtGlobal> Rounds \a value to the nearest integer. Example: - \snippet code/src_corelib_global_qglobal.cpp 11 + \snippet code/src_corelib_global_qglobal.cpp 11B */ -/*! \fn qint64 qRound64(qreal value) +/*! \fn qint64 qRound64(double value) \relates <QtGlobal> Rounds \a value to the nearest 64-bit integer. Example: - \snippet code/src_corelib_global_qglobal.cpp 12 + \snippet code/src_corelib_global_qglobal.cpp 12A +*/ + +/*! \fn qint64 qRound64(float value) + \relates <QtGlobal> + + Rounds \a value to the nearest 64-bit integer. + + Example: + + \snippet code/src_corelib_global_qglobal.cpp 12B */ /*! \fn const T &qMin(const T &value1, const T &value2) @@ -1016,7 +1033,7 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in example, "4.1.2"). This may be a different version than the version the application was compiled against. - \sa QT_VERSION_STR + \sa QT_VERSION_STR, QLibraryInfo::version() */ const char *qVersion() Q_DECL_NOTHROW @@ -1147,19 +1164,11 @@ bool qSharedBuild() Q_DECL_NOTHROW \value WV_6_3 Operating system version 6.3, corresponds to Windows 8.1, introduced in Qt 5.2 \value WV_10_0 Operating system version 10.0, corresponds to Windows 10, introduced in Qt 5.5 - CE-based versions: - - \value WV_CE Windows CE - \value WV_CENET Windows CE .NET - \value WV_CE_5 Windows CE 5.x - \value WV_CE_6 Windows CE 6.x - The following masks can be used for testing whether a Windows version is MS-DOS-based, NT-based, or CE-based: \value WV_DOS_based MS-DOS-based version of Windows \value WV_NT_based NT-based version of Windows - \value WV_CE_based CE-based version of Windows \value WV_None Operating system other than Windows. @@ -1262,7 +1271,7 @@ bool qSharedBuild() Q_DECL_NOTHROW \relates <QtGlobal> Defined on all supported versions of Windows. That is, if - \l Q_OS_WIN32, \l Q_OS_WIN64, \l Q_OS_WINCE or \l Q_OS_WINRT is defined. + \l Q_OS_WIN32, \l Q_OS_WIN64 or \l Q_OS_WINRT is defined. */ /*! @@ -1280,13 +1289,6 @@ bool qSharedBuild() Q_DECL_NOTHROW */ /*! - \macro Q_OS_WINCE - \relates <QtGlobal> - - Defined on Windows CE. -*/ - -/*! \macro Q_OS_WINRT \relates <QtGlobal> @@ -1916,13 +1918,15 @@ QSysInfo::MacVersion QSysInfo::macVersion() return QSysInfo::MacVersion(Q_MV_OSX(version.major, version.minor)); #elif defined(Q_OS_IOS) return QSysInfo::MacVersion(Q_MV_IOS(version.major, version.minor)); +#elif defined(Q_OS_TVOS) + return QSysInfo::MacVersion(Q_MV_TVOS(version.major, version.minor)); #else return QSysInfo::MV_Unknown; #endif } const QSysInfo::MacVersion QSysInfo::MacintoshVersion = QSysInfo::macVersion(); -#elif defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT) +#elif defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) || defined(Q_OS_WINRT) QT_BEGIN_INCLUDE_NAMESPACE #include "qt_windows.h" @@ -1975,9 +1979,7 @@ static inline OSVERSIONINFOEX determineWinOsVersion() { OSVERSIONINFOEX result = { sizeof(OSVERSIONINFOEX), 0, 0, 0, 0, {'\0'}, 0, 0, 0, 0, 0}; -#ifndef Q_OS_WINCE #define GetProcAddressA GetProcAddress -#endif // GetModuleHandle is not supported in WinRT and linking to it at load time // will not pass the Windows App Certification Kit... but it exists and is functional, @@ -2052,11 +2054,6 @@ QSysInfo::WinVersion QSysInfo::windowsVersion() const OSVERSIONINFOEX osver = winOsVersion(); if (osver.dwMajorVersion == 0) return QSysInfo::WV_None; -#ifdef Q_OS_WINCE - DWORD qt_cever = 0; - qt_cever = osver.dwMajorVersion * 100; - qt_cever += osver.dwMinorVersion * 10; -#endif switch (osver.dwPlatformId) { case VER_PLATFORM_WIN32s: winver = QSysInfo::WV_32s; @@ -2070,18 +2067,6 @@ QSysInfo::WinVersion QSysInfo::windowsVersion() else winver = QSysInfo::WV_95; break; -#ifdef Q_OS_WINCE - case VER_PLATFORM_WIN32_CE: - if (qt_cever >= 600) - winver = QSysInfo::WV_CE_6; - if (qt_cever >= 500) - winver = QSysInfo::WV_CE_5; - else if (qt_cever >= 400) - winver = QSysInfo::WV_CENET; - else - winver = QSysInfo::WV_CE; - break; -#endif default: // VER_PLATFORM_WIN32_NT if (osver.dwMajorVersion < 5) { winver = QSysInfo::WV_NT; @@ -2172,15 +2157,6 @@ static const char *winVer_helper() return workstation ? "8.1" : "Server 2012 R2"; case QSysInfo::WV_WINDOWS10: return workstation ? "10" : "Server 2016"; - - case QSysInfo::WV_CE: - return "CE"; - case QSysInfo::WV_CENET: - return "CENET"; - case QSysInfo::WV_CE_5: - return "CE5"; - case QSysInfo::WV_CE_6: - return "CE6"; } // unknown, future version return 0; @@ -2438,7 +2414,7 @@ QString QSysInfo::buildCpuArchitecture() */ QString QSysInfo::currentCpuArchitecture() { -#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +#if defined(Q_OS_WIN) // We don't need to catch all the CPU architectures in this function; // only those where the host CPU might be different than the build target // (usually, 64-bit platforms). @@ -2590,9 +2566,7 @@ static QString unknownText() */ QString QSysInfo::kernelType() { -#if defined(Q_OS_WINCE) - return QStringLiteral("wince"); -#elif defined(Q_OS_WIN) +#if defined(Q_OS_WIN) return QStringLiteral("winnt"); #elif defined(Q_OS_UNIX) struct utsname u; @@ -2648,16 +2622,15 @@ QString QSysInfo::kernelVersion() to determine the distribution name and returns that. If determining the distribution name failed, it returns "unknown". - \b{Darwin, OS X and iOS note}: this function returns "osx" for OS X - systems, "ios" for iOS systems and "darwin" in case the system could not be - determined. + \b{Darwin, OS X, iOS and tvOS note}: this function returns "osx" for OS X + systems, "ios" for iOS systems, "tvos" for tvOS systems and "darwin" in case + the system could not be determined. \b{FreeBSD note}: this function returns "debian" for Debian/kFreeBSD and "unknown" otherwise. \b{Windows note}: this function returns "winphone" for builds for Windows - Phone, "winrt" for WinRT builds, "wince" for Windows CE and Embedded - Compact builds, and "windows" for normal desktop builds. + Phone, "winrt" for WinRT builds and "windows" for normal desktop builds. For other Unix-type systems, this function usually returns "unknown". @@ -2670,8 +2643,6 @@ QString QSysInfo::productType() return QStringLiteral("winphone"); #elif defined(Q_OS_WINRT) return QStringLiteral("winrt"); -#elif defined(Q_OS_WINCE) - return QStringLiteral("wince"); #elif defined(Q_OS_WIN) return QStringLiteral("windows"); @@ -2683,6 +2654,8 @@ QString QSysInfo::productType() #elif defined(Q_OS_IOS) return QStringLiteral("ios"); +#elif defined(Q_OS_TVOS) + return QStringLiteral("tvos"); #elif defined(Q_OS_OSX) return QStringLiteral("osx"); #elif defined(Q_OS_DARWIN) @@ -2766,6 +2739,8 @@ QString QSysInfo::prettyProductName() { #if defined(Q_OS_IOS) return QLatin1String("iOS ") + productVersion(); +#elif defined(Q_OS_TVOS) + return QLatin1String("tvOS ") + productVersion(); #elif defined(Q_OS_OSX) // get the known codenames const char *basename = 0; @@ -2809,7 +2784,17 @@ QString QSysInfo::prettyProductName() #elif defined(Q_OS_WINPHONE) return QLatin1String("Windows Phone ") + QLatin1String(winVer_helper()); #elif defined(Q_OS_WIN) - return QLatin1String("Windows ") + QLatin1String(winVer_helper()) + winSp_helper(); + const char *name = winVer_helper(); + const OSVERSIONINFOEX osver = winOsVersion(); + if (name) + return QLatin1String("Windows ") + QLatin1String(name) + winSp_helper() + + QLatin1String(" (") + QString::number(osver.dwMajorVersion) + + QLatin1Char('.') + QString::number(osver.dwMinorVersion) + + QLatin1Char(')'); + else + return QLatin1String("Windows ") + + QString::number(osver.dwMajorVersion) + QLatin1Char('.') + + QString::number(osver.dwMinorVersion); #elif defined(Q_OS_ANDROID) return QLatin1String("Android ") + productVersion(); #elif defined(Q_OS_HAIKU) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 2081ca8649..78b7cec915 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -529,23 +529,11 @@ Q_DECL_CONSTEXPR inline int qRound(double d) { return d >= 0.0 ? int(d + 0.5) : int(d - double(int(d-1)) + 0.5) + int(d-1); } Q_DECL_CONSTEXPR inline int qRound(float d) { return d >= 0.0f ? int(d + 0.5f) : int(d - float(int(d-1)) + 0.5f) + int(d-1); } -#ifdef Q_QDOC -/* - Just for documentation generation -*/ -int qRound(qreal d); -#endif Q_DECL_CONSTEXPR inline qint64 qRound64(double d) { return d >= 0.0 ? qint64(d + 0.5) : qint64(d - double(qint64(d-1)) + 0.5) + qint64(d-1); } Q_DECL_CONSTEXPR inline qint64 qRound64(float d) { return d >= 0.0f ? qint64(d + 0.5f) : qint64(d - float(qint64(d-1)) + 0.5f) + qint64(d-1); } -#ifdef Q_QDOC -/* - Just for documentation generation -*/ -qint64 qRound64(qreal d); -#endif template <typename T> Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; } @@ -622,7 +610,7 @@ class QDataStream; # define QT_NO_SOCKS5 #endif -#if defined(Q_OS_IOS) +#if defined(QT_PLATFORM_UIKIT) # define QT_NO_PROCESS #endif @@ -1032,8 +1020,11 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1); #ifdef Q_QDOC // Just for documentation generation +template<typename T> auto qOverload(T functionPointer); +template<typename T> auto qConstOverload(T memberFunctionPointer); +template<typename T> auto qNonConstOverload(T memberFunctionPointer); #elif defined(Q_COMPILER_VARIADIC_TEMPLATES) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 458200180e..70e19d1f86 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -366,6 +366,19 @@ QLibraryInfo::isDebugBuild() #endif } +#ifndef QT_BOOTSTRAPPED +/*! + \since 5.8 + Returns the version of the Qt library. + + \sa qVersion() +*/ +QVersionNumber QLibraryInfo::version() Q_DECL_NOTHROW +{ + return QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH); +} +#endif // QT_BOOTSTRAPPED + #endif // QT_BUILD_QMAKE /* diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 362d47dea3..a1c146923e 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -42,6 +42,7 @@ #include <QtCore/qstring.h> #include <QtCore/qdatetime.h> +#include <QtCore/qversionnumber.h> QT_BEGIN_NAMESPACE @@ -63,6 +64,10 @@ public: static bool isDebugBuild(); +#ifndef QT_BOOTSTRAPPED + static QVersionNumber version() Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; +#endif + enum LibraryLocation { PrefixPath = 0, diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index f2e293c45b..0fe095b8d3 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -170,7 +170,7 @@ static bool isFatal(QtMsgType msgType) static bool willLogToConsole() { -#if defined(Q_OS_WINCE) || defined(Q_OS_WINRT) +#if defined(Q_OS_WINRT) // these systems have no stderr, so always log to the system log return false; #elif defined(QT_BOOTSTRAPPED) @@ -1176,7 +1176,7 @@ void QMessagePattern::setPattern(const QString &pattern) else if (inIf) error += QStringLiteral("QT_MESSAGE_PATTERN: missing %{endif}\n"); if (!error.isEmpty()) { -#if defined(Q_OS_WINCE) || defined(Q_OS_WINRT) +#if defined(Q_OS_WINRT) OutputDebugString(reinterpret_cast<const wchar_t*>(error.utf16())); if (0) #elif defined(Q_OS_WIN) && defined(QT_BUILD_CORE_LIB) diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 2a0b8461cd..edb568a2d6 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -301,12 +301,7 @@ public: MacWindowToolBarButtonHint = 0x10000000, BypassGraphicsProxyWidget = 0x20000000, NoDropShadowWindowHint = 0x40000000, - WindowFullscreenButtonHint = 0x80000000, - - // The following enums have overlapping values with other enums. - // This was not intentional, but it's too late to change now. - WindowOkButtonHint = 0x00080000, // WindowTransparentForInput - WindowCancelButtonHint = 0x00100000 // WindowOverridesSystemGestures + WindowFullscreenButtonHint = 0x80000000 }; Q_DECLARE_FLAGS(WindowFlags, WindowType) @@ -509,6 +504,7 @@ public: AA_DontUseNativeDialogs = 23, AA_SynthesizeMouseForUnhandledTabletEvents = 24, AA_CompressHighFrequencyEvents = 25, + AA_DontCheckOpenGLContextThreadAffinity = 26, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 3c53a23896..d8a0acabf1 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -250,6 +250,13 @@ If your application needs to handle all events with no compression, you can unset this attribute. This value has been added in Qt 5.7. + \value AA_DontCheckOpenGLContextThreadAffinity When making a context + current using QOpenGLContext, do not check that the + \l{QObject#Thread Affinity}{QObject thread affinity} + of the QOpenGLContext object is the same thread calling + \l{QOpenGLContext::makeCurrent}{makeCurrent()}. This value has been + added in Qt 5.8. + The following values are obsolete: \value AA_ImmediateWidgetCreation This attribute is no longer fully @@ -753,27 +760,25 @@ \value MonoOnly The pixmap becomes monochrome. If necessary, it is dithered using the chosen dithering algorithm. - Dithering mode preference for RGB channels: + Dithering mode preference: - \value DiffuseDither (default) - A high-quality dither. - \value OrderedDither A faster, more ordered dither. + \value DiffuseDither (default) - A high-quality dither using error diffusion. + \value OrderedDither A faster, ordered dither. \value ThresholdDither No dithering; closest color is used. - Dithering mode preference for alpha channel: + Dithering mode preference for 1-bit alpha masks: \value ThresholdAlphaDither (default) - No dithering. - \value OrderedAlphaDither A faster, more ordered dither. - \value DiffuseAlphaDither A high-quality dither. + \value OrderedAlphaDither A faster, ordered dither. + \value DiffuseAlphaDither A high-quality dither using error diffusion. \omitvalue NoAlpha Color matching versus dithering preference: - \value PreferDither (default when converting to a pixmap) - Always dither - 32-bit images when the image is converted to 8 bits. - \value AvoidDither (default when converting for the purpose of saving to - file) - Dither 32-bit images only if the image has more than 256 - colors and it is being converted to 8 bits. - \omitvalue AutoDither + \value PreferDither Always dither images when converting to smaller color-spaces. + \value AvoidDither Only dither to indexed formats if the source image uses more + different colors than the size of the color table of the destination format. + \value AutoDither (default) - Only dither when down-converting to 1 or 8-bit indexed formats. \omitvalue ColorMode_Mask \omitvalue Dither_Mask @@ -2221,12 +2226,6 @@ the bottom. This window hint is currently not implemented for OS X. - \value WindowOkButtonHint Adds an OK button to the window decoration of a dialog. - Only supported for Windows CE. - - \value WindowCancelButtonHint Adds a Cancel button to the window decoration of a dialog. - Only supported for Windows CE. - \value WindowTransparentForInput Informs the window system that this window is used only for output (displaying something) and does not take input. Therefore input events should pass through as if it wasn't there. diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index 5705bc29c8..b7f7d5187c 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -56,7 +56,7 @@ #include <cmath> #include <limits> -#if defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) +#if defined(Q_CC_MSVC) # include <intrin.h> #elif defined(Q_CC_INTEL) # include <immintrin.h> // for _addcarry_u<nn> diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index b74fc80468..143e00a4c3 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -69,7 +69,7 @@ public: LittleEndian # ifdef Q_QDOC - , ByteOrder = <platform-dependent> + , ByteOrder = BigEndian or LittleEndian # elif Q_BYTE_ORDER == Q_BIG_ENDIAN , ByteOrder = BigEndian # elif Q_BYTE_ORDER == Q_LITTLE_ENDIAN @@ -109,13 +109,7 @@ public: WV_6_1 = WV_WINDOWS7, WV_6_2 = WV_WINDOWS8, WV_6_3 = WV_WINDOWS8_1, - WV_10_0 = WV_WINDOWS10, - - WV_CE = 0x0100, - WV_CENET = 0x0200, - WV_CE_5 = 0x0300, - WV_CE_6 = 0x0400, - WV_CE_based = 0x0f00 + WV_10_0 = WV_WINDOWS10 }; #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) static const WinVersion WindowsVersion; @@ -127,6 +121,7 @@ public: #define Q_MV_OSX(major, minor) (major == 10 ? minor + 2 : (major == 9 ? 1 : 0)) #define Q_MV_IOS(major, minor) (QSysInfo::MV_IOS | major << 4 | minor) +#define Q_MV_TVOS(major, minor) (QSysInfo::MV_TVOS | major << 4 | minor) enum MacVersion { MV_None = 0xffff, MV_Unknown = 0x0000, @@ -174,7 +169,12 @@ public: MV_IOS_8_2 = Q_MV_IOS(8, 2), MV_IOS_8_3 = Q_MV_IOS(8, 3), MV_IOS_8_4 = Q_MV_IOS(8, 4), - MV_IOS_9_0 = Q_MV_IOS(9, 0) + MV_IOS_9_0 = Q_MV_IOS(9, 0), + + /* tvOS */ + MV_TVOS = 1 << 9, + MV_TVOS_9_0 = Q_MV_TVOS(9, 0), + MV_TVOS_9_1 = Q_MV_TVOS(9, 1) }; #if defined(Q_OS_MAC) static const MacVersion MacintoshVersion; diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 97f750a3a6..10f9068d0a 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -56,7 +56,6 @@ OS2 - OS/2 OS2EMX - XFree86 on OS/2 (not PM) WIN32 - Win32 (Windows 2000/XP/Vista/7 and Windows Server 2003/2008) - WINCE - WinCE (Windows CE 5.0) WINRT - WinRT (Windows 8 Runtime) CYGWIN - Cygwin SOLARIS - Sun Solaris @@ -102,14 +101,17 @@ # define Q_OS_DARWIN32 # endif # if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE -# if defined(TARGET_OS_TV) && TARGET_OS_TV -# define Q_OS_TVOS -# elif defined(TARGET_OS_WATCH) && TARGET_OS_WATCH +# if defined(TARGET_OS_WATCH) && TARGET_OS_WATCH # define Q_OS_WATCHOS # else -# // TARGET_OS_IOS is only available in newer SDKs, -# // so assume any other iOS-based platform is iOS for now -# define Q_OS_IOS +# define QT_PLATFORM_UIKIT +# if defined(TARGET_OS_TV) && TARGET_OS_TV +# define Q_OS_TVOS +# else +# // TARGET_OS_IOS is only available in newer SDKs, +# // so assume any other iOS-based platform is iOS for now +# define Q_OS_IOS +# endif # endif # else # // there is no "real" OS X define (rdar://22640089), @@ -128,9 +130,7 @@ # define Q_OS_WIN32 # define Q_OS_WIN64 #elif !defined(SAG_COM) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)) -# if defined(WINCE) || defined(_WIN32_WCE) -# define Q_OS_WINCE -# elif defined(WINAPI_FAMILY) +# if defined(WINAPI_FAMILY) # ifndef WINAPI_FAMILY_PC_APP # define WINAPI_FAMILY_PC_APP WINAPI_FAMILY_APP # endif @@ -205,7 +205,7 @@ # error "Qt has not been ported to this OS - see http://www.qt-project.org/" #endif -#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT) +#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINRT) # define Q_OS_WIN #endif diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 8ac3c2135d..6d4c56d7d6 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -48,10 +48,10 @@ #if defined(Q_CC_MINGW) // mingw's windows.h does not set _WIN32_WINNT, resulting breaking compilation # ifndef WINVER -# define WINVER 0x501 +# define WINVER 0x600 # endif # ifndef _WIN32_WINNT -# define _WIN32_WINNT 0x0501 +# define _WIN32_WINNT 0x600 # endif #endif @@ -144,13 +144,4 @@ #define CLEARTYPE_QUALITY 5 #endif -#ifdef Q_OS_WINCE -#ifndef LR_DEFAULTSIZE -#define LR_DEFAULTSIZE 0 -#endif -#ifndef LR_SHARED -#define LR_SHARED 0 -#endif -#endif // Q_OS_WINCE - #endif // QT_WINDOWS_H |