From 2fe9d7965934daff49b38cc265f92366f230ce8c Mon Sep 17 00:00:00 2001 From: kleuter Date: Tue, 24 Nov 2020 15:04:26 +0100 Subject: [PATCH] 5.12.5: revert bootstrap --- .../src/corelib/global/qconfig-bootstrapped.h | 152 --------------- .../qtbase/src/tools/bootstrap/bootstrap.pro | 182 ------------------ 2 files changed, 334 deletions(-) delete mode 100644 5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h delete mode 100644 5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro diff --git a/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h b/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h deleted file mode 100644 index 42b22f7..0000000 --- a/5.15.2/qtbase/src/corelib/global/qconfig-bootstrapped.h +++ /dev/null @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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$ -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// -// Despite its file name, this really is not a public header. -// It is an implementation detail of the private bootstrap library. -// - -#if 0 -// silence syncqt warnings -#pragma qt_sync_skip_header_check -#pragma qt_sync_stop_processing -#endif - -#ifdef QT_BOOTSTRAPPED - -#ifndef QT_NO_EXCEPTIONS -#define QT_NO_EXCEPTIONS -#endif - -#define QT_NO_USING_NAMESPACE -#define QT_NO_DEPRECATED - -// Keep feature-test macros in alphabetic order by feature name: -#define QT_FEATURE_alloca 1 -#define QT_FEATURE_alloca_h -1 -#ifdef _WIN32 -# define QT_FEATURE_alloca_malloc_h 1 -#else -# define QT_FEATURE_alloca_malloc_h -1 -#endif -#define QT_FEATURE_binaryjson -1 -#define QT_FEATURE_cborstreamreader -1 -#define QT_FEATURE_cborstreamwriter 1 -#define QT_CRYPTOGRAPHICHASH_ONLY_SHA1 -#define QT_FEATURE_cxx11_random (__has_include() ? 1 : -1) -#define QT_NO_DATASTREAM -#define QT_FEATURE_datestring 1 -#define QT_FEATURE_datetimeparser -1 -#define QT_FEATURE_easingcurve -1 -#define QT_FEATURE_etw -1 -#define QT_FEATURE_getauxval (__has_include() ? 1 : -1) -#define QT_FEATURE_getentropy -1 -#define QT_NO_GEOM_VARIANT -#define QT_FEATURE_hijricalendar -1 -#define QT_FEATURE_iconv -1 -#define QT_FEATURE_icu -1 -#define QT_FEATURE_islamiccivilcalendar -1 -#define QT_FEATURE_jalalicalendar -1 -#define QT_FEATURE_journald -1 -#define QT_FEATURE_futimens -1 -#define QT_FEATURE_futimes -1 -#define QT_FEATURE_itemmodel -1 -#define QT_FEATURE_library -1 -#ifdef __linux__ -# define QT_FEATURE_linkat 1 -#else -# define QT_FEATURE_linkat -1 -#endif -#define QT_FEATURE_lttng -1 -#define QT_NO_QOBJECT -#define QT_FEATURE_process 1 -#define QT_FEATURE_regularexpression -1 -#ifdef __GLIBC_PREREQ -# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -#else -# define QT_FEATURE_renameat2 -1 -#endif -#define QT_FEATURE_sharedmemory -1 -#define QT_FEATURE_signaling_nan -1 -#define QT_FEATURE_slog2 -1 -#ifdef __GLIBC_PREREQ -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -#else -# define QT_FEATURE_statx -1 -#endif -#define QT_FEATURE_syslog -1 -#define QT_NO_SYSTEMLOCALE -#define QT_FEATURE_systemsemaphore -1 -#define QT_FEATURE_temporaryfile 1 -#define QT_FEATURE_textdate 1 -#define QT_FEATURE_thread -1 -#define QT_FEATURE_timezone -1 -#define QT_FEATURE_topleveldomain -1 -#define QT_NO_TRANSLATION -#define QT_FEATURE_translation -1 - -// rcc.pro will DEFINES+= this -#ifndef QT_FEATURE_zstd -#define QT_FEATURE_zstd -1 -#endif - -#ifdef QT_BUILD_QMAKE -#define QT_FEATURE_commandlineparser -1 -#define QT_NO_COMPRESS -#define QT_JSON_READONLY -#define QT_FEATURE_settings 1 -#define QT_NO_STANDARDPATHS -#define QT_FEATURE_textcodec -1 -#else -#define QT_FEATURE_codecs -1 -#define QT_FEATURE_commandlineparser 1 -#define QT_FEATURE_settings -1 -#define QT_FEATURE_textcodec 1 -#endif - -#endif // QT_BOOTSTRAPPED diff --git a/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro b/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro deleted file mode 100644 index 06e161e..0000000 --- a/5.15.2/qtbase/src/tools/bootstrap/bootstrap.pro +++ /dev/null @@ -1,182 +0,0 @@ -option(host_build) - -TARGET = QtBootstrap -QT = -CONFIG += minimal_syncqt internal_module force_bootstrap gc_binaries - -MODULE_INCNAME = QtCore QtXml -MODULE_DEFINES = \ - QT_VERSION_STR=$$shell_quote(\"$$QT_VERSION\") \ - QT_VERSION_MAJOR=$$QT_MAJOR_VERSION \ - QT_VERSION_MINOR=$$QT_MINOR_VERSION \ - QT_VERSION_PATCH=$$QT_PATCH_VERSION \ - QT_BOOTSTRAPPED \ - QT_NO_CAST_TO_ASCII -MODULE_CONFIG = gc_binaries - -DEFINES += \ - $$MODULE_DEFINES \ - QT_NO_FOREACH \ - QT_NO_CAST_FROM_ASCII - -INCLUDEPATH += \ - $$PWD/.. \ - $$PWD/../../3rdparty/tinycbor/src - -SOURCES += \ - ../../corelib/codecs/qlatincodec.cpp \ - ../../corelib/codecs/qtextcodec.cpp \ - ../../corelib/codecs/qutfcodec.cpp \ - ../../corelib/global/qendian.cpp \ - ../../corelib/global/qglobal.cpp \ - ../../corelib/global/qlogging.cpp \ - ../../corelib/global/qmalloc.cpp \ - ../../corelib/global/qnumeric.cpp \ - ../../corelib/global/qoperatingsystemversion.cpp \ - ../../corelib/global/qrandom.cpp \ - ../../corelib/io/qabstractfileengine.cpp \ - ../../corelib/io/qbuffer.cpp \ - ../../corelib/io/qdebug.cpp \ - ../../corelib/io/qdir.cpp \ - ../../corelib/io/qdiriterator.cpp \ - ../../corelib/io/qfile.cpp \ - ../../corelib/io/qfileinfo.cpp \ - ../../corelib/io/qfilesystementry.cpp \ - ../../corelib/io/qfilesystemengine.cpp \ - ../../corelib/io/qfsfileengine.cpp \ - ../../corelib/io/qfsfileengine_iterator.cpp \ - ../../corelib/io/qiodevice.cpp \ - ../../corelib/io/qipaddress.cpp \ - ../../corelib/io/qfiledevice.cpp \ - ../../corelib/io/qresource.cpp \ - ../../corelib/io/qtemporarydir.cpp \ - ../../corelib/io/qtemporaryfile.cpp \ - ../../corelib/io/qsavefile.cpp \ - ../../corelib/io/qstandardpaths.cpp \ - ../../corelib/io/qloggingcategory.cpp \ - ../../corelib/io/qloggingregistry.cpp \ - ../../corelib/io/qurl.cpp \ - ../../corelib/io/qurlidna.cpp \ - ../../corelib/io/qurlquery.cpp \ - ../../corelib/io/qurlrecode.cpp \ - ../../corelib/io/qprocess.cpp \ - ../../corelib/kernel/qcoreapplication.cpp \ - ../../corelib/kernel/qcoreglobaldata.cpp \ - ../../corelib/kernel/qmetatype.cpp \ - ../../corelib/kernel/qvariant.cpp \ - ../../corelib/kernel/qsystemerror.cpp \ - ../../corelib/kernel/qsharedmemory.cpp \ - ../../corelib/kernel/qsystemsemaphore.cpp \ - ../../corelib/plugin/quuid.cpp \ - ../../corelib/serialization/qcborcommon.cpp \ - ../../corelib/serialization/qcborstreamwriter.cpp \ - ../../corelib/serialization/qcborvalue.cpp \ - ../../corelib/serialization/qdatastream.cpp \ - ../../corelib/serialization/qjsoncbor.cpp \ - ../../corelib/serialization/qjsondocument.cpp \ - ../../corelib/serialization/qjsonobject.cpp \ - ../../corelib/serialization/qjsonarray.cpp \ - ../../corelib/serialization/qjsonvalue.cpp \ - ../../corelib/serialization/qjsonparser.cpp \ - ../../corelib/serialization/qjsonwriter.cpp \ - ../../corelib/serialization/qtextstream.cpp \ - ../../corelib/serialization/qxmlutils.cpp \ - ../../corelib/serialization/qxmlstream.cpp \ - ../../corelib/text/qbytearray.cpp \ - ../../corelib/text/qbytearraylist.cpp \ - ../../corelib/text/qbytearraymatcher.cpp \ - ../../corelib/text/qlocale.cpp \ - ../../corelib/text/qlocale_tools.cpp \ - ../../corelib/text/qregexp.cpp \ - ../../corelib/text/qstring.cpp \ - ../../corelib/text/qstringbuilder.cpp \ - ../../corelib/text/qstring_compat.cpp \ - ../../corelib/text/qstringlist.cpp \ - ../../corelib/text/qstringview.cpp \ - ../../corelib/text/qvsnprintf.cpp \ - ../../corelib/time/qcalendar.cpp \ - ../../corelib/time/qdatetime.cpp \ - ../../corelib/time/qgregoriancalendar.cpp \ - ../../corelib/time/qromancalendar.cpp \ - ../../corelib/tools/qarraydata.cpp \ - ../../corelib/tools/qbitarray.cpp \ - ../../corelib/tools/qcommandlineparser.cpp \ - ../../corelib/tools/qcommandlineoption.cpp \ - ../../corelib/tools/qcryptographichash.cpp \ - ../../corelib/tools/qhash.cpp \ - ../../corelib/tools/qlist.cpp \ - ../../corelib/tools/qmap.cpp \ - ../../corelib/tools/qringbuffer.cpp \ - ../../corelib/tools/qpoint.cpp \ - ../../corelib/tools/qrect.cpp \ - ../../corelib/tools/qsize.cpp \ - ../../corelib/tools/qline.cpp \ - ../../corelib/tools/qversionnumber.cpp \ - ../../xml/dom/qdom.cpp \ - ../../xml/sax/qxml.cpp - -unix:SOURCES += ../../corelib/kernel/qcore_unix.cpp \ - ../../corelib/kernel/qsharedmemory_posix.cpp \ - ../../corelib/kernel/qsharedmemory_systemv.cpp \ - ../../corelib/kernel/qsharedmemory_unix.cpp \ - ../../corelib/kernel/qsystemsemaphore_posix.cpp \ - ../../corelib/kernel/qsystemsemaphore_systemv.cpp \ - ../../corelib/kernel/qsystemsemaphore_unix.cpp \ - ../../corelib/io/qfilesystemengine_unix.cpp \ - ../../corelib/io/qfilesystemiterator_unix.cpp \ - ../../corelib/io/qfsfileengine_unix.cpp \ - ../../corelib/io/qprocess_unix.cpp - -win32:SOURCES += ../../corelib/global/qoperatingsystemversion_win.cpp \ - ../../corelib/io/qfilesystemengine_win.cpp \ - ../../corelib/io/qfilesystemiterator_win.cpp \ - ../../corelib/io/qfsfileengine_win.cpp \ - ../../corelib/kernel/qcoreapplication_win.cpp \ - ../../corelib/kernel/qsharedmemory_win.cpp \ - ../../corelib/kernel/qsystemsemaphore_win.cpp \ - ../../corelib/plugin/qsystemlibrary.cpp \ - ../../corelib/kernel/qwinregistry.cpp \ - ../../corelib/io/qprocess_win.cpp - -mac { - SOURCES += \ - ../../corelib/kernel/qcoreapplication_mac.cpp \ - ../../corelib/kernel/qcore_mac.mm \ - ../../corelib/global/qoperatingsystemversion_darwin.mm \ - ../../corelib/kernel/qcore_foundation.mm \ - ../../corelib/io/qprocess_darwin.mm - - LIBS += -framework Foundation - osx: LIBS_PRIVATE += -framework CoreServices - uikit: LIBS_PRIVATE += -framework UIKit -} - -macx { - OBJECTIVE_SOURCES += \ - ../../corelib/io/qstandardpaths_mac.mm -} else:unix { - SOURCES += \ - ../../corelib/io/qstandardpaths_unix.cpp -} else { - SOURCES += \ - ../../corelib/io/qstandardpaths_win.cpp -} - -!qtConfig(system-zlib)|cross_compile { - include(../../3rdparty/zlib.pri) -} else { - CONFIG += no_core_dep - include(../../3rdparty/zlib_dependency.pri) -} - -win32 { - LIBS += -luser32 -lole32 -ladvapi32 -lshell32 -lnetapi32 - mingw: LIBS += -luuid -} - -load(qt_module) - -CONFIG -= create_cmake - -lib.CONFIG = dummy_install -INSTALLS += lib