1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qconfig-bootstrapped.h: merge the bottom entries into the list and sort

Browse Source 
They were in a separate block as a result of this file previously being
used for two sets of bootstrap builds: qmake and Bootstrap. Therefore,
this amends commit 43c28aa9046967abeb4ad042c8be1aa23a19c282 ("Use Core
library for qmake instead of the Bootstrap library").

Nothing checks QT_NO_TEMPORARYFILE any more, so remove that instead of
moving, thus also amending b57a9a3cd9c95ab6549ea672715245210720c8da
("Bootstrap: remove QTemporaryFile").

Change-Id: Ib5c5500be2898f72b333fffda91ec1f6bfe83353
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
This commit is contained in:
Thiago Macieira 2024-12-29 20:34:48 -03:00
parent bbb4e7ca87
commit eac724605a
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/corelib/global/qconfig-bootstrapped.h
View File

@ -45,6 +45,8 @@
// Keep feature-test macros in alphabetic order by feature name:
#define QT_FEATURE_cborstreamreader -1
#define QT_FEATURE_cborstreamwriter 1
#define QT_FEATURE_commandlineparser 1
#define QT_NO_COMPRESS
#define QT_FEATURE_cxx17_filesystem -1
#define QT_NO_DATASTREAM
#define QT_FEATURE_datestring 1
@ -52,15 +54,15 @@
#define QT_FEATURE_easingcurve -1
#define QT_FEATURE_etw -1
#define QT_NO_GEOM_VARIANT
#define QT_FEATURE_hijricalendar -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
#undef QT_FEATURE_future
#define QT_FEATURE_future -1
#define QT_FEATURE_hijricalendar -1
#define QT_FEATURE_icu -1
#define QT_FEATURE_itemmodel -1
#define QT_FEATURE_islamiccivilcalendar -1
#define QT_FEATURE_jalalicalendar -1
#define QT_FEATURE_journald -1
#define QT_FEATURE_library -1
#ifdef __linux__
# define QT_FEATURE_linkat 1
@ -71,6 +73,7 @@
#define QT_FEATURE_memmem -1
#define QT_FEATURE_memrchr -1
#define QT_NO_QOBJECT
#define QT_FEATURE_permissions -1
#define QT_FEATURE_process -1
#define QT_FEATURE_regularexpression 1
#ifdef __GLIBC_PREREQ
@ -92,11 +95,4 @@
#define QT_FEATURE_translation -1
#define QT_NO_VARIANT -1
#define QT_NO_COMPRESS
#define QT_FEATURE_commandlineparser 1
#define QT_FEATURE_permissions -1
#define QT_NO_TEMPORARYFILE
#endif // QT_BOOTSTRAPPED