diff options
-rwxr-xr-x | configure | 34 | ||||
-rw-r--r-- | qtbase.pro | 4 | ||||
-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-- | tools/configure/configureapp.cpp | 53 |
9 files changed, 2 insertions, 1495 deletions
@@ -610,7 +610,6 @@ CFG_PROFILE=no CFG_STRIP=yes CFG_GUI=auto # (yes|no|auto) CFG_WIDGETS=yes -CFG_QCONFIG=full CFG_DEBUG=auto CFG_MYSQL_CONFIG= CFG_PSQL_CONFIG= @@ -1179,9 +1178,6 @@ while [ "$#" -gt 0 ]; do testsdir) QT_INSTALL_TESTS="$VAL" ;; - qconfig) - CFG_QCONFIG="$VAL" - ;; qreal) CFG_QREAL="$VAL" if [ "$CFG_QREAL" = "float" ]; then @@ -2582,9 +2578,6 @@ Additional options: -feature-<feature> .. Compile in <feature>. The available features are described in src/corelib/global/qfeatures.txt - -qconfig local ...... Use src/corelib/global/qconfig-local.h rather than the - default ($CFG_QCONFIG). - -qreal [double|float] typedef qreal to the specified type. The default is double. Note that changing this flag affects binary compatibility. @@ -3039,21 +3032,6 @@ fi # command line and environment validation #------------------------------------------------------------------------------- -# update QT_CONFIG to show our current predefined configuration -CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h -if [ "$CFG_QCONFIG" = full ]; then - CFG_QCONFIG_PATH= -elif [ ! -f "$CFG_QCONFIG_PATH" ]; then - CFG_QCONFIG_PATH=`makeabs "${CFG_QCONFIG}"` - if [ ! -f "$CFG_QCONFIG_PATH" ]; then - echo >&2 "Error: configuration file not found:" - echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" - echo >&2 " or" - echo >&2 " $CFG_QCONFIG_PATH" - exit 1 - fi -fi - if [ "$XPLATFORM_MAC" = "no" -a "$CFG_DEBUG_RELEASE" = "yes" ]; then echo echo "WARNING: -debug-and-release is not supported outside of Mac OS X." @@ -6434,17 +6412,6 @@ cat <<EOF EOF -case "$CFG_QCONFIG" in -full) - echo "/* Everything */" - ;; -*) - echo "#ifndef QT_BOOTSTRAPPED" - cat "$CFG_QCONFIG_PATH" - echo "#endif" - ;; -esac - echo '/* Compile time features */' [ '!' -z "$LicenseKeyExt" ] && echo "#define QT_PRODUCT_LICENSEKEY \"$LicenseKeyExt\"" @@ -6781,7 +6748,6 @@ done if [ -n "$DISABLED_FEATURES" ]; then echo "QT_NO_DEFINES = $DISABLED_FEATURES" fi -echo "QT_QCONFIG_PATH = ${CFG_QCONFIG_PATH#$relpath/src/corelib/global/}" cat <<EOF host_build { diff --git a/qtbase.pro b/qtbase.pro index 11cff9e8bf..34f6704752 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -121,14 +121,14 @@ FWD_FEATURES_H = \ write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error("Aborting.") no_features = -lines = $$cat($$absolute_path($$QT_QCONFIG_PATH, $$PWD/src/corelib/global), lines) +lines = $$cat($$OUT_PWD/src/corelib/global/qconfig.h, lines) for (line, lines) { # We ignore all defines that don't follow the #ifndef + indent pattern. # This makes it possible to have unchecked defines which are no features. t = $$replace(line, "^$${LITERAL_HASH} define QT_NO_(\\S+)\\s*$", "\\1") !isEqual(t, $$line) { isEmpty(features.$${t}.name): \ - error("$$QT_QCONFIG_PATH disables unknown feature $$t") + error("qconfig.h disables unknown feature $$t") no_features += $$t } } 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/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 63d7f79d38..882ccd62c6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -137,7 +137,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0) dictionary[ "QMAKESPEC_FROM" ] = "env"; } - dictionary[ "QCONFIG" ] = "full"; dictionary[ "EMBEDDED" ] = "no"; dictionary[ "BUILD_QMAKE" ] = "yes"; dictionary[ "QMAKE_INTERNAL" ] = "no"; @@ -411,12 +410,6 @@ void Configure::parseCmdLine() ++verbose; } - else if (configCmdLine.at(i) == "-qconfig") { - ++i; - if (i == argCount) - break; - dictionary[ "QCONFIG" ] = configCmdLine.at(i); - } else if (configCmdLine.at(i) == "-qreal") { ++i; if (i == argCount) @@ -1408,35 +1401,6 @@ void Configure::parseCmdLine() void Configure::validateArgs() { - // Validate the specified config - QString cfgpath = sourcePath + "/src/corelib/global/qconfig-" + dictionary["QCONFIG"] + ".h"; - - // Try internal configurations first. - QStringList possible_configs = QStringList() - << "minimal" - << "small" - << "medium" - << "large" - << "full"; - int index = possible_configs.indexOf(dictionary["QCONFIG"]); - if (index >= 0) { - for (int c = 0; c <= index; c++) { - qtConfig += possible_configs[c] + "-config"; - } - if (dictionary["QCONFIG"] != "full") - dictionary["QCONFIG_PATH"] = cfgpath; - return; - } - - if (!QFileInfo::exists(cfgpath)) { - cfgpath = QFileInfo(dictionary["QCONFIG"]).absoluteFilePath(); - if (!QFileInfo::exists(cfgpath)) { - dictionary[ "DONE" ] = "error"; - cout << "No such configuration \"" << qPrintable(dictionary["QCONFIG"]) << "\"" << endl ; - return; - } - } - dictionary["QCONFIG_PATH"] = cfgpath; } // Output helper functions --------------------------------[ Start ]- @@ -2927,11 +2891,6 @@ void Configure::generateCachefile() moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl; if (!skipModules.isEmpty()) moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl; - QString qcpath = dictionary["QCONFIG_PATH"]; - QString qlpath = sourcePath + "/src/corelib/global/"; - if (qcpath.startsWith(qlpath)) - qcpath.remove(0, qlpath.length()); - moduleStream << "QT_QCONFIG_PATH = " << qcpath << endl; moduleStream << endl; moduleStream << "host_build {" << endl; @@ -3412,18 +3371,6 @@ void Configure::generateConfigfiles() << "#define QT_VERSION_PATCH " << dictionary["VERSION_PATCH"] << endl << "#define QT_VERSION_STR \"" << dictionary["VERSION"] << "\"\n" << endl; - - if (dictionary[ "QCONFIG" ] == "full") { - tmpStream << "/* Everything */" << endl; - } else { - tmpStream << "#ifndef QT_BOOTSTRAPPED" << endl; - QFile inFile(dictionary["QCONFIG_PATH"]); - if (inFile.open(QFile::ReadOnly)) { - tmpStream << QTextStream(&inFile).readAll(); - inFile.close(); - } - tmpStream << "#endif // QT_BOOTSTRAPPED" << endl; - } tmpStream << endl; if (dictionary[ "SHARED" ] == "no") { |