AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
146421ecaf
qt5base-lts/qmake/Makefile.unix

605 lines
22 KiB
Makefile
Raw Normal View History

do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
QMKSRC = $(SOURCE_PATH)/qmake
introduce qmake variable abstractions this is preparation for adapting to a new evaluator. Change-Id: I6fc59f5525735754a00afa6629fbfe257e84db97 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-06 10:21:38 +00:00
QMKLIBSRC = $(QMKSRC)/library
unbreak "make depend" for shadow builds Change-Id: Ib79ba79e41cfeac9350852395b03c331dc4fe2a3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:27:31 +00:00
QMKGENSRC = $(QMKSRC)/generators
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
#qmake code (please keep in order matching DEPEND_SRC)
OBJS = \
main.o meta.o option.o project.o property.o \
ioutils.o proitems.o qmakebuiltins.o qmakeevaluator.o \
qmakeglobals.o qmakeparser.o qmakevfs.o \
pbuilder_pbx.o \
makefile.o makefiledeps.o metamakefile.o projectgenerator.o \
unixmake2.o unixmake.o \
mingw_make.o msbuild_objectmodel.o \
msvc_nmake.o msvc_objectmodel.o msvc_vcproj.o msvc_vcxproj.o \
winmakefile.o \
xmloutput.o
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
#qt code (please keep in order matching DEPEND_SRC)
QOBJS = \
Add qbswap for a memory region The compiler was generating some vectorized code for qresource.cpp but it wasn't very efficient. So improve upon it and make use in other places where we read UTF-16BE strings. [ChangeLog][QtCore] Added an overload of q{To,From}{Big,Little}Endian that operates on a memory region. Change-Id: I6a540578e810472bb455fffd1531fa2f1d724dfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-05-25 19:33:48 +00:00
qendian.o qglobal.o qlogging.o qmalloc.o qnumeric.o qoperatingsystemversion.o qrandom.o \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
qabstractfileengine.o qbuffer.o qdatastream.o qdebug.o \
qdir.o qdiriterator.o \
qfile.o qfiledevice.o qfileinfo.o qfilesystemengine.o \
qfilesystementry.o qfsfileengine.o qfsfileengine_iterator.o \
qiodevice.o qsettings.o qtemporaryfile.o qtextstream.o \
Split cborstream feature in two Reading of Cbor streams is substantially more complicated than writing as it requires float16 support. When writing Cbor, we can just choose to always write 32bit floats, even if we could compress the numbers into 16 bits. We need Cbor writing in the bootstrap library, but we cannot easily add float16 support. Furthermore, Cbor reading is required for plugin support, but not Cbor writing. It might make sense for some users to build a custom Qt with Cbor writing disabled. Therefore, provide two features, cborstreamreader and cborstreamwriter, split up the code in cborstream.{h|cpp} into several files, and enable Cbor writing in the bootstrap library. Change-Id: I15450afb0e328a84a22ebca9379cffc4f900a75a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-10-29 12:50:22 +00:00
qcborstreamwriter.o qcborvalue.o \
qjsoncbor.o qjsonarray.o qjsondocument.o qjsonobject.o qjsonparser.o qjsonvalue.o \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
qmetatype.o qsystemerror.o qvariant.o \
quuid.o \
Include likely-adjusted uiLanguages for the system locale QLocale::uiLanguages() on the system locale uses whatever the system locale's query(QSystemLocale::UILanguages,...) returns. On Android, this is just a list of locales. However, for non-system locales, we also include some results of removing likely sub-tags from the locale name, where equivalent. Thus zh-CN would also get zh and zh-Hans-CN added to it; however, if the system locale is zh-Hans-CN, the shorter forms are omitted. So post-process the system locale list in the same way, albeit tweaked to avoid duplicates and rearranged so that we can insert likely-adjusted entries between what they adjust and what followed it. Added QLocalePrivate::rawName() in the process, since it looks likely to be useful in other contexts (and I needed its value): it just joins such tags as are non-Any. This, however, uses QByteArrayList, so added that (it's small) to the bootstrap library and qmake. This follows up on commit 8796e3016fae1672e727e2fa4e48f671a0c667ba. [ChangeLog][QtCore][QLocale] The system locale's UI languages list now includes, as for that of an ordinary locale, the results of adding likely sub-tags from each locale name, and of removing some, where this doesn't change which locale is specified. This gives searches for translation files a better chance of finding a suitable file. Fixes: QTBUG-75413 Change-Id: Iaafd79aac6a0fdd5f44aed16e445e84a2267c9da Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-04-29 10:33:55 +00:00
qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \
Add support for calendars beside Gregorian Add QCalendarBackend as a base class for calendar implementations and QCalendar as a facade via which to access it. QDate's implicit implementation of the Gregorian calendar becomes QGregorianCalendar and QDate methods now support choice of calendar. Convert QLocale's CLDR data for month names to a locale-data component of each supported calendar and relevant QLocale methods now support choice of calendar. Adapt Python scripts for locale data generation to extract month name data from CLDR (keeping on version v35.1) into the new calendar-locale files. The locale data for the Gregorian calendar is held in a Roman calendar base, for sharing with other calendars. Add tests for basic uses of the new API. [ChangeLog][QtCore][QCalendar] Added QCalendar to support diverse calendars, supported by implementing QCalendarBackend. [ChangeLog][QtCore][QDate] Allow choice of calendar in various operations, with Gregorian remaining the default. Done-with: Lars Knoll <lars.knoll@qt.io> Done-with: Edward Welbourne <edward.welbourne@qt.io> Fixes: QTBUG-17110 Fixes: QTBUG-950 Change-Id: I9d6278f394269a183aee8156e990cec4d5198ab8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2017-01-14 16:53:31 +00:00
qcalendar.o qgregoriancalendar.o qromancalendar.o \
Make QList an alias to QVector This is almost 100% source compatible with Qt 5. Exceptions are * Stability of references for large or non movable types * taking a PMF for types that are now overloaded with r-value references in QVector * The missing prepend optimization in QVector (that is still planned to come for Qt 6) Change-Id: I96d44553304dd623def9c70d6fea8fa2fb0373b0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-05-24 12:27:48 +00:00
qcryptographichash.o qdatetime.o qhash.o \
Long Live QMap as a refcounted std::map! ... and QMultiMap as std::multimap. Just use the implementation from the STL; we can't really claim that our code is much better than STL's, or does things any differently (de facto they're both red-black trees). Decouple QMultiMap from QMap, by making it NOT inherit from QMap any longer. This completes the deprecation started in 5.15: QMap now does not store duplicated keys any more. Something to establish is where to put the QExplictlySharedDataPointer replcement that is in there as an ad-hoc solution. There's a number of patches in-flight by Marc that try to introduce the same (or very similar) functionality. Miscellanea changes to the Q(Multi)Map code itself: * consistently use size_type instead of int; * pass iterators by value; * drop QT_STRICT_ITERATORS; * iterators implictly convert to const_iterators, and APIs take const_iterators; * iterators are just bidirectional and not random access; * added noexcept where it makes sense; * "inline" dropped (churn); * qMapLessThanKey dropped (undocumented, 0 hits in Qt, 1 hit in KDE); * operator== on Q(Multi)Map requires operator== on the key type (we're checking for equality, not equivalence!). Very few breakages occur in qtbase. [ChangeLog][Potentially Source-Incompatible Changes] QMap does not support multiple equivalent keys any more. Any related functionality has been removed from QMap, following the deprecation that happened in Qt 5.15. Use QMultiMap for this use case. [ChangeLog][Potentially Source-Incompatible Changes] QMap and QMultiMap iterators random-access API have been removed. Note that the iterators have always been just bidirectional; moving an iterator by N positions can still be achieved using std::next or std::advance, at the same cost as before (O(N)). [ChangeLog][Potentially Source-Incompatible Changes] QMultiMap does not inherit from QMap any more. Amongst other things, this means that iterators on a QMultiMap now belong to the QMultiMap class (and not to the QMap class); new Java iterators have been added. Change-Id: I5a0fe9b020f92c21b37065a1defff783b5d2b7a9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-07-22 12:07:48 +00:00
qlocale.o qlocale_tools.o qregularexpression.o qringbuffer.o \
Move the UTF conversion methods to qstringconverter Separate them from the qutfcodec, so that the codec can later on be moved out of Qt Core. Fix the QUtf methods to take qsizetype instead of int for length arguments. This also makes it possible to not build QTextCodec into the bootstrap lib anymore. Change-Id: I0b4f83139d61b19c651520a2f3a5012aa7e85cb8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-04-17 10:10:21 +00:00
qstringbuilder.o qstring.o qstringconverter.o qstringlist.o qversionnumber.o \
Remove qxmlstream from qmake compile It's not used at all. Change-Id: Ia30befd497cc337221dfad89c201822b5bb7fd7c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-21 18:06:26 +00:00
qvsnprintf.o \
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
pcre2_auto_possess.o pcre2_chartables.o pcre2_compile.o pcre2_config.o \
pcre2_context.o pcre2_dfa_match.o pcre2_error.o pcre2_extuni.o \
pcre2_find_bracket.o pcre2_jit_compile.o pcre2_maketables.o pcre2_match.o \
pcre2_match_data.o pcre2_newline.o pcre2_ord2utf.o pcre2_pattern_info.o pcre2_script_run.o \
pcre2_serialize.o pcre2_string_utils.o pcre2_study.o pcre2_substitute.o \
pcre2_substring.o pcre2_tables.o pcre2_ucd.o pcre2_valid_utf.o \
pcre2_xclass.o \
$(QTOBJS) $(QTOBJS2)
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
# QTOBJS and QTOBJS2 are populated by Makefile.unix.* as for QTSRC (see below).
# Note: qlibraryinfo.o omitted deliberately - see below.
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
#all sources, used for the depend target (please keep alphabetic in each block)
unbreak "make depend" for shadow builds Change-Id: Ib79ba79e41cfeac9350852395b03c331dc4fe2a3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:27:31 +00:00
DEPEND_SRC = \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(QMKSRC)/main.cpp \
unbreak "make depend" for shadow builds Change-Id: Ib79ba79e41cfeac9350852395b03c331dc4fe2a3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:27:31 +00:00
$(QMKSRC)/meta.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(QMKSRC)/option.cpp \
$(QMKSRC)/project.cpp \
$(QMKSRC)/property.cpp \
$(QMKLIBSRC)/ioutils.cpp \
$(QMKLIBSRC)/proitems.cpp \
$(QMKLIBSRC)/qmakebuiltins.cpp \
$(QMKLIBSRC)/qmakeevaluator.cpp \
$(QMKLIBSRC)/qmakeglobals.cpp \
$(QMKLIBSRC)/qmakeparser.cpp \
$(QMKLIBSRC)/qmakevfs.cpp \
nuke gbuild generator it never left the rudimentary stage. should it ever be re-added, it needs to be done basically from scratch anyway. Change-Id: I76858c8a2c90235f228f7a6e5a178a10a2669d37 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-17 14:31:07 +00:00
$(QMKGENSRC)/mac/pbuilder_pbx.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(QMKGENSRC)/makefile.cpp \
$(QMKGENSRC)/makefiledeps.cpp \
$(QMKGENSRC)/metamakefile.cpp \
$(QMKGENSRC)/projectgenerator.cpp \
$(QMKGENSRC)/unix/unixmake2.cpp \
$(QMKGENSRC)/unix/unixmake.cpp \
$(QMKGENSRC)/win32/mingw_make.cpp \
$(QMKGENSRC)/win32/msbuild_objectmodel.cpp \
$(QMKGENSRC)/win32/msvc_nmake.cpp \
$(QMKGENSRC)/win32/msvc_objectmodel.cpp \
$(QMKGENSRC)/win32/msvc_vcproj.cpp \
$(QMKGENSRC)/win32/msvc_vcxproj.cpp \
unbreak "make depend" for shadow builds Change-Id: Ib79ba79e41cfeac9350852395b03c331dc4fe2a3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:27:31 +00:00
$(QMKGENSRC)/win32/winmakefile.cpp \
Fix reference to non-existent file in qmake/Makefile.unix I found no $(QMKGENSRC)/mac/xmloutput.cpp; but skipping the mac/ in its name reveals a perfectly good file, that might even be relevant. It's also the file named in a rule further down the file. Change-Id: I72b399f9c3c222fc6beed29f2007fe55ba5b8412 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:15:33 +00:00
$(QMKGENSRC)/xmloutput.cpp \
Add qbswap for a memory region The compiler was generating some vectorized code for qresource.cpp but it wasn't very efficient. So improve upon it and make use in other places where we read UTF-16BE strings. [ChangeLog][QtCore] Added an overload of q{To,From}{Big,Little}Endian that operates on a memory region. Change-Id: I6a540578e810472bb455fffd1531fa2f1d724dfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-05-25 19:33:48 +00:00
$(SOURCE_PATH)/src/corelib/global/qendian.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(SOURCE_PATH)/src/corelib/global/qglobal.cpp \
$(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp \
$(SOURCE_PATH)/src/corelib/global/qlogging.cpp \
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
$(SOURCE_PATH)/src/corelib/global/qmalloc.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \
$(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion.cpp \
Move qrand() & qsrand() to qrandom.cpp Now that we have the file, may as well consolidate Change-Id: Icd0e0d4b27cb4e5eb892fffd14b51d3e701c6a94 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-04-14 00:50:05 +00:00
$(SOURCE_PATH)/src/corelib/global/qrandom.cpp \
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
$(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(SOURCE_PATH)/src/corelib/io/qbuffer.cpp \
$(SOURCE_PATH)/src/corelib/io/qdebug.cpp \
$(SOURCE_PATH)/src/corelib/io/qdir.cpp \
$(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \
$(SOURCE_PATH)/src/corelib/io/qfile.cpp \
$(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp \
$(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp \
$(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp \
$(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp \
$(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp \
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
$(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \
$(SOURCE_PATH)/src/corelib/io/qsettings.cpp \
$(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp \
$(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp \
$(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp \
$(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp \
$(SOURCE_PATH)/src/corelib/plugin/quuid.cpp \
Split cborstream feature in two Reading of Cbor streams is substantially more complicated than writing as it requires float16 support. When writing Cbor, we can just choose to always write 32bit floats, even if we could compress the numbers into 16 bits. We need Cbor writing in the bootstrap library, but we cannot easily add float16 support. Furthermore, Cbor reading is required for plugin support, but not Cbor writing. It might make sense for some users to build a custom Qt with Cbor writing disabled. Therefore, provide two features, cborstreamreader and cborstreamwriter, split up the code in cborstream.{h|cpp} into several files, and enable Cbor writing in the bootstrap library. Change-Id: I15450afb0e328a84a22ebca9379cffc4f900a75a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-10-29 12:50:22 +00:00
$(SOURCE_PATH)/src/corelib/serialization/qcborstreamwriter.cpp \
Reimplement JSON support on top of Cbor In turn, deprecate the QJsonDocument methods that deal with JSON binary data. You should use CBOR for data serialization these days. [ChangeLog][Deprecation Notice] The binary JSON representation is deprecated. The CBOR format should be used instead. Fixes: QTBUG-47629 Change-Id: Ic8b92ea36de87815b12307a9d8b1095f07166db8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-06-19 11:43:00 +00:00
$(SOURCE_PATH)/src/corelib/serialization/qcborvalue.cpp \
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
$(SOURCE_PATH)/src/corelib/serialization/qdatastream.cpp \
$(SOURCE_PATH)/src/corelib/serialization/qjsonarray.cpp \
Reimplement JSON support on top of Cbor In turn, deprecate the QJsonDocument methods that deal with JSON binary data. You should use CBOR for data serialization these days. [ChangeLog][Deprecation Notice] The binary JSON representation is deprecated. The CBOR format should be used instead. Fixes: QTBUG-47629 Change-Id: Ic8b92ea36de87815b12307a9d8b1095f07166db8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-06-19 11:43:00 +00:00
$(SOURCE_PATH)/src/corelib/serialization/qjsoncbor.cpp \
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
$(SOURCE_PATH)/src/corelib/serialization/qjsondocument.cpp \
$(SOURCE_PATH)/src/corelib/serialization/qjsonobject.cpp \
$(SOURCE_PATH)/src/corelib/serialization/qjsonparser.cpp \
$(SOURCE_PATH)/src/corelib/serialization/qjsonvalue.cpp \
$(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp \
Include likely-adjusted uiLanguages for the system locale QLocale::uiLanguages() on the system locale uses whatever the system locale's query(QSystemLocale::UILanguages,...) returns. On Android, this is just a list of locales. However, for non-system locales, we also include some results of removing likely sub-tags from the locale name, where equivalent. Thus zh-CN would also get zh and zh-Hans-CN added to it; however, if the system locale is zh-Hans-CN, the shorter forms are omitted. So post-process the system locale list in the same way, albeit tweaked to avoid duplicates and rearranged so that we can insert likely-adjusted entries between what they adjust and what followed it. Added QLocalePrivate::rawName() in the process, since it looks likely to be useful in other contexts (and I needed its value): it just joins such tags as are non-Any. This, however, uses QByteArrayList, so added that (it's small) to the bootstrap library and qmake. This follows up on commit 8796e3016fae1672e727e2fa4e48f671a0c667ba. [ChangeLog][QtCore][QLocale] The system locale's UI languages list now includes, as for that of an ordinary locale, the results of adding likely sub-tags from each locale name, and of removing some, where this doesn't change which locale is specified. This gives searches for translation files a better chance of finding a suitable file. Fixes: QTBUG-75413 Change-Id: Iaafd79aac6a0fdd5f44aed16e445e84a2267c9da Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-04-29 10:33:55 +00:00
$(SOURCE_PATH)/src/corelib/text/qbytearray.cpp \
$(SOURCE_PATH)/src/corelib/text/qbytearraylist.cpp \
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
$(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp \
$(SOURCE_PATH)/src/corelib/text/qlocale.cpp \
$(SOURCE_PATH)/src/corelib/text/qlocale_tools.cpp \
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
$(SOURCE_PATH)/src/corelib/text/qregularexpression.cpp \
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
$(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp \
Move the UTF conversion methods to qstringconverter Separate them from the qutfcodec, so that the codec can later on be moved out of Qt Core. Fix the QUtf methods to take qsizetype instead of int for length arguments. This also makes it possible to not build QTextCodec into the bootstrap lib anymore. Change-Id: I0b4f83139d61b19c651520a2f3a5012aa7e85cb8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-04-17 10:10:21 +00:00
$(SOURCE_PATH)/src/corelib/text/qstringconverter.cpp \
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
$(SOURCE_PATH)/src/corelib/text/qstring.cpp \
$(SOURCE_PATH)/src/corelib/text/qstringlist.cpp \
$(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp \
Add support for calendars beside Gregorian Add QCalendarBackend as a base class for calendar implementations and QCalendar as a facade via which to access it. QDate's implicit implementation of the Gregorian calendar becomes QGregorianCalendar and QDate methods now support choice of calendar. Convert QLocale's CLDR data for month names to a locale-data component of each supported calendar and relevant QLocale methods now support choice of calendar. Adapt Python scripts for locale data generation to extract month name data from CLDR (keeping on version v35.1) into the new calendar-locale files. The locale data for the Gregorian calendar is held in a Roman calendar base, for sharing with other calendars. Add tests for basic uses of the new API. [ChangeLog][QtCore][QCalendar] Added QCalendar to support diverse calendars, supported by implementing QCalendarBackend. [ChangeLog][QtCore][QDate] Allow choice of calendar in various operations, with Gregorian remaining the default. Done-with: Lars Knoll <lars.knoll@qt.io> Done-with: Edward Welbourne <edward.welbourne@qt.io> Fixes: QTBUG-17110 Fixes: QTBUG-950 Change-Id: I9d6278f394269a183aee8156e990cec4d5198ab8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2017-01-14 16:53:31 +00:00
$(SOURCE_PATH)/src/corelib/time/qcalendar.cpp \
Separate out the time, zone, date code from corelib/tools/ We'll be adding calendar code here as well, and tools/ was getting rather crowded, so it looks like time to move out a reasonably coherent sub-bundle of it all. Change-Id: I7e8030f38c31aa307f519dd918a43fc44baa6aa1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-05-27 15:47:22 +00:00
$(SOURCE_PATH)/src/corelib/time/qdatetime.cpp \
Add support for calendars beside Gregorian Add QCalendarBackend as a base class for calendar implementations and QCalendar as a facade via which to access it. QDate's implicit implementation of the Gregorian calendar becomes QGregorianCalendar and QDate methods now support choice of calendar. Convert QLocale's CLDR data for month names to a locale-data component of each supported calendar and relevant QLocale methods now support choice of calendar. Adapt Python scripts for locale data generation to extract month name data from CLDR (keeping on version v35.1) into the new calendar-locale files. The locale data for the Gregorian calendar is held in a Roman calendar base, for sharing with other calendars. Add tests for basic uses of the new API. [ChangeLog][QtCore][QCalendar] Added QCalendar to support diverse calendars, supported by implementing QCalendarBackend. [ChangeLog][QtCore][QDate] Allow choice of calendar in various operations, with Gregorian remaining the default. Done-with: Lars Knoll <lars.knoll@qt.io> Done-with: Edward Welbourne <edward.welbourne@qt.io> Fixes: QTBUG-17110 Fixes: QTBUG-950 Change-Id: I9d6278f394269a183aee8156e990cec4d5198ab8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2017-01-14 16:53:31 +00:00
$(SOURCE_PATH)/src/corelib/time/qgregoriancalendar.cpp \
$(SOURCE_PATH)/src/corelib/time/qromancalendar.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp \
rename qvector.cpp => qvector.qdoc the file contains no code. this avoids complaints from ar/ranlib in static/bootstrapped builds. Change-Id: Iee22ffc61a5f9ea8c25f5455b7e8e017ac521624 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2017-02-08 12:19:44 +00:00
$(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
$(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \
$(SOURCE_PATH)/src/corelib/tools/qhash.cpp \
$(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp \
qmake: Add test functions for comparing version numbers qmake really lacks version comparing functions: users either use ugly constructions to compare versions by components, such as greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 4): or even incorrectly compare versions as strings: !lessThan(apple_clang_ver, "5.1")|!lessThan(reg_clang_ver, "3.4"): Add test functions versionAtLeast and versionAtMost which use QVersionNumber to compare version numbers by components. Change-Id: I65e6b3c296d0301d544b7e38bf3d44f8d555c7fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-01-07 09:23:47 +00:00
$(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp \
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_auto_possess.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_chartables.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_compile.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_config.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_context.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_dfa_match.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_error.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_extuni.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_find_bracket.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_jit_compile.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_maketables.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_match.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_match_data.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_newline.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_ord2utf.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_pattern_info.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_script_run.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_serialize.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_string_utils.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_study.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_substitute.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_substring.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_tables.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_ucd.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_valid_utf.c \
$(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_xclass.c \
configure: put more of the makefile contents into template files ... instead of having (duplicated) code in the configures to create it. Change-Id: Ia86b44021a024a969f5a49b7fb18d3d414869f93 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-11-18 15:27:15 +00:00
$(QTSRCS) $(QTSRCS2)
Tidy the long lists of files in Makefile.unix In the source list, put one file on each line, sort alphabetically within each of several blocks (preserving the order of those blocks), add missing entries for which we have rules. Document where QTSRC and friends come from, eliminate duplication between their entries and DEPEND_SRC (which pulls them in anyway). Document strays not in OBJS or QOBJS, fix qmake.pri to add to SOURCES not OBJECTIVE_SOURCES. Put OBJS and QOBJS entries in the order that matches DEPEND_SRC. Change-Id: Id38cccd9b1f849a865a265bc0e6ce4c426c42eea Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 14:24:36 +00:00
# QTSRCS and QTSRCS2 come from Makefile.unix.* (concatenated with this
# by configure); QTSRCS2 may include *.mm entries on macOS.
# See below for special handling of qlibraryinfo.cpp
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
CPPFLAGS = -g $(EXTRA_CPPFLAGS) \
Use QMKGENSRC a bit more to save some repetition Also split a long list of -I flags so that "for each platform" dirs all land on the same line, rather than breaking part way through the platform list. Change-Id: I855f6b152567bc2031e08361d2b02a788df8287e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 15:02:26 +00:00
-I$(QMKSRC) -I$(QMKLIBSRC) -I$(QMKGENSRC) \
Split cborstream feature in two Reading of Cbor streams is substantially more complicated than writing as it requires float16 support. When writing Cbor, we can just choose to always write 32bit floats, even if we could compress the numbers into 16 bits. We need Cbor writing in the bootstrap library, but we cannot easily add float16 support. Furthermore, Cbor reading is required for plugin support, but not Cbor writing. It might make sense for some users to build a custom Qt with Cbor writing disabled. Therefore, provide two features, cborstreamreader and cborstreamwriter, split up the code in cborstream.{h|cpp} into several files, and enable Cbor writing in the bootstrap library. Change-Id: I15450afb0e328a84a22ebca9379cffc4f900a75a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-10-29 12:50:22 +00:00
-I$(SOURCE_PATH)/src/3rdparty/tinycbor/src \
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
-I$(SOURCE_PATH)/src/3rdparty/pcre2/src \
Use QMKGENSRC a bit more to save some repetition Also split a long list of -I flags so that "for each platform" dirs all land on the same line, rather than breaking part way through the platform list. Change-Id: I855f6b152567bc2031e08361d2b02a788df8287e Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 15:02:26 +00:00
-I$(QMKGENSRC)/unix -I$(QMKGENSRC)/win32 -I$(QMKGENSRC)/mac \
run syncqt only for builds from git the logic in the configures was even trying to express that, only that nowadays we always ship syncqt, so the tests were kinda pointless. this frees us from the perl dependency for non-developer builds of packaged modules (except for webkit, which needs almost every scripting language on earth anyway). obviously, this requires that the packaging scripts run syncqt in the source dir before tarring up the sources. note that for repositories other than qtbase, the -version argument needs to be passed to syncqt. Task-number: QTBUG-29465 Change-Id: Ic929ab17a5de4b30fbf48b3aa9bfa3b4d2ef37d6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-28 19:34:05 +00:00
-I$(INC_PATH) -I$(INC_PATH)/QtCore \
-I$(INC_PATH)/QtCore/$(QT_VERSION) -I$(INC_PATH)/QtCore/$(QT_VERSION)/QtCore \
Clean up building of bootstrap lib and tools Add a qconfig-bootstrap.h, which contains all the defines required to build the bootstrapped tools. This will be required anyway when moving more code over to use QT_CONFIG(foo) instead of QT_NO_FOO. Change-Id: I783d0aa0100b9190fe2d422bee4a95b05720aebe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-09-16 12:37:16 +00:00
-I$(BUILD_PATH)/src/corelib/global \
unify c*flags in the hand-written makefiles somewhat Change-Id: I7a7139fd71bce879b3ee4d9e26e30d2ca63da69e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-21 16:02:35 +00:00
-I$(QMAKESPEC) \
Move the official Qt version from qglobal.h to .qmake.conf It's easier to parse than qglobal.h. The objective is actually to have macros with parts of the version number, so the major or minor numbers could be used in other preprocessor macros. Change-Id: I42e7ef1a481840699a8dffff1404eda1dd5c308d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-09-18 01:17:40 +00:00
-DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \
Be consistent about indentation Most continuation lines in long variable values indented with a tab and some space; three used spaces only; make them match the rest. A foolish consistency is the hobgoblin of my little mind. Change-Id: I7e51ea830040efe62801e80a49486d26dd2a3978 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 14:19:59 +00:00
-DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
-DQT_NO_FOREACH -DQT_USE_QSTRINGBUILDER \
Disable the PCRE Jit when compiling qmake I'm getting compile errors with gcc 9.3 without this, and it makes sense to disable the JIT in bootstrapped builds anyway. Change-Id: Ife867bd2d6fd0bf133edae4903bb6b6d295db547 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-12 09:09:26 +00:00
-DPCRE2_CODE_UNIT_WIDTH=16 -DHAVE_CONFIG_H \
-DPCRE2_DISABLE_JIT \
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
$(EXTRA_CPPFLAGS)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
configure: put more of the makefile contents into template files ... instead of having (duplicated) code in the configures to create it. Change-Id: Ia86b44021a024a969f5a49b7fb18d3d414869f93 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-11-18 15:27:15 +00:00
CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS)
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS)
configure: put more of the makefile contents into template files ... instead of having (duplicated) code in the configures to create it. Change-Id: Ia86b44021a024a969f5a49b7fb18d3d414869f93 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-11-18 15:27:15 +00:00
LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
first all: $(BUILD_PATH)/bin/qmake$(EXEEXT)
qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT)
revert to building qmake with qconfig.cpp turns out that just appending builtin-qt.conf isn't a good idea: executable-editing tools (objcopy, prelink, etc.) will happily drop the "attachment". a safe method would be adding a proper section to the executable, but there doesn't appear to be an objcopy equivalent in msvc, and using entirely different methods of embedding the file with different toolchains seems like a rather bad idea. so instead go back to the old method of building qmake with a generated qconfig.cpp. of course, as said file is now created by qmake itself, we have to compile qlibraryinfo.cpp a second time, and link a second qmake executable. Task-number: QTBUG-57803 Change-Id: I9e232693550aa870cec154e49cc06add13017cc2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-01-03 15:40:30 +00:00
binary: $(BUILD_PATH)/qmake/qmake$(EXEEXT)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
revert to building qmake with qconfig.cpp turns out that just appending builtin-qt.conf isn't a good idea: executable-editing tools (objcopy, prelink, etc.) will happily drop the "attachment". a safe method would be adding a proper section to the executable, but there doesn't appear to be an objcopy equivalent in msvc, and using entirely different methods of embedding the file with different toolchains seems like a rather bad idea. so instead go back to the old method of building qmake with a generated qconfig.cpp. of course, as said file is now created by qmake itself, we have to compile qlibraryinfo.cpp a second time, and link a second qmake executable. Task-number: QTBUG-57803 Change-Id: I9e232693550aa870cec154e49cc06add13017cc2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-01-03 15:40:30 +00:00
$(BUILD_PATH)/bin/qmake$(EXEEXT): $(OBJS) $(QOBJS) qlibraryinfo.o
$(CXX) -o "$@" $(OBJS) $(QOBJS) qlibraryinfo.o $(LFLAGS)
$(BUILD_PATH)/qmake/qmake$(EXEEXT): $(OBJS) $(QOBJS) qlibraryinfo_final.o
$(CXX) -o "$@" $(OBJS) $(QOBJS) qlibraryinfo_final.o $(LFLAGS)
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
Makefile: $(SOURCE_PATH)/qmake/Makefile.unix
@echo "Out of date, please rerun configure"
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
clean::
revert to building qmake with qconfig.cpp turns out that just appending builtin-qt.conf isn't a good idea: executable-editing tools (objcopy, prelink, etc.) will happily drop the "attachment". a safe method would be adding a proper section to the executable, but there doesn't appear to be an objcopy equivalent in msvc, and using entirely different methods of embedding the file with different toolchains seems like a rather bad idea. so instead go back to the old method of building qmake with a generated qconfig.cpp. of course, as said file is now created by qmake itself, we have to compile qlibraryinfo.cpp a second time, and link a second qmake executable. Task-number: QTBUG-57803 Change-Id: I9e232693550aa870cec154e49cc06add13017cc2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-01-03 15:40:30 +00:00
$(RM_F) $(OBJS) $(QOBJS) qlibraryinfo.o qlibraryinfo_final.o
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
distclean:: clean
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
$(RM_RF) .deps
$(RM_F) $(BUILD_PATH)/bin/qmake$(EXEEXT)
revert to building qmake with qconfig.cpp turns out that just appending builtin-qt.conf isn't a good idea: executable-editing tools (objcopy, prelink, etc.) will happily drop the "attachment". a safe method would be adding a proper section to the executable, but there doesn't appear to be an objcopy equivalent in msvc, and using entirely different methods of embedding the file with different toolchains seems like a rather bad idea. so instead go back to the old method of building qmake with a generated qconfig.cpp. of course, as said file is now created by qmake itself, we have to compile qlibraryinfo.cpp a second time, and link a second qmake executable. Task-number: QTBUG-57803 Change-Id: I9e232693550aa870cec154e49cc06add13017cc2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-01-03 15:40:30 +00:00
$(RM_F) $(BUILD_PATH)/qmake/qmake$(EXEEXT)
fix distclean targets this makes the distclean targets work throughout qt. the dreaded confclean target is aliased to distclean. Task-number: QTBUG-8202 Task-number: QTBUG-20566 Change-Id: I7ac8e3b5b0110825dc93e4fa885281db91c6cf83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-23 11:40:49 +00:00
$(RM_F) Makefile
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
depend:
makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
fix distclean targets this makes the distclean targets work throughout qt. the dreaded confclean target is aliased to distclean. Task-number: QTBUG-8202 Task-number: QTBUG-20566 Change-Id: I7ac8e3b5b0110825dc93e4fa885281db91c6cf83 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-23 11:40:49 +00:00
$(RM_F) Makefile.bak
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
port qmake to qt creator's qmake language evaluator this is a monster commit which does the following things: - import the evaluator as-is from qt creator into qmake/library/ - integrate it into qmake's makefiles - overwrite proitems.h with actual special types - remove the parts of Option which are redundant with QMakeGlobals - make QMakeProperty a singleton owned by Option::globals. the dynamic handling so far made no sense. - make QMakeProject a subclass of QMakeEvaluator, with relatively few extensions the changes to existing qmake code outside project.* and option.* are minor. implementing the changes gradually would mean changing a lot of code which will be just replaced in the next commit, so i'm not wasting my time on it. Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-05 16:29:19 +00:00
ioutils.o: $(QMKLIBSRC)/ioutils.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
proitems.o: $(QMKLIBSRC)/proitems.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qmakeglobals.o: $(QMKLIBSRC)/qmakeglobals.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
implement simple VFS to support caching during project parsing sync up with qt creator - for qmake itself, this is just a minor refactoring. Change-Id: I833253f81c3159056fab2ff888f293b36cc2ef56 Reviewed-by: Daniel Teske <daniel.teske@digia.com> (cherry picked from qtcreator/66802ef8bf7989dc025e34bf91d93576189c483c) (cherry picked from qtcreator/69542826fa643a0fed2fc9e717f072c2852dc017) (cherry picked from qtcreator/196424115338fb9a535810704b7d814d318b0462) Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-29 18:18:51 +00:00
qmakevfs.o: $(QMKLIBSRC)/qmakevfs.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
port qmake to qt creator's qmake language evaluator this is a monster commit which does the following things: - import the evaluator as-is from qt creator into qmake/library/ - integrate it into qmake's makefiles - overwrite proitems.h with actual special types - remove the parts of Option which are redundant with QMakeGlobals - make QMakeProperty a singleton owned by Option::globals. the dynamic handling so far made no sense. - make QMakeProject a subclass of QMakeEvaluator, with relatively few extensions the changes to existing qmake code outside project.* and option.* are minor. implementing the changes gradually would mean changing a lot of code which will be just replaced in the next commit, so i'm not wasting my time on it. Change-Id: I9746650423b8c5b3fbd8c3979a73228982a46195 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-05 16:29:19 +00:00
qmakeparser.o: $(QMKLIBSRC)/qmakeparser.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qmakeevaluator.o: $(QMKLIBSRC)/qmakeevaluator.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qmakebuiltins.o: $(QMKLIBSRC)/qmakebuiltins.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qmake: add $$read_registry() function Change-Id: I7f9f17e0f44c273e4754d1decc92a8594cad8658 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-12-14 20:12:11 +00:00
registry.o: $(QMKLIBSRC)/registry.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
remove pretenses of manual dependencies now that "make depend" actually works again, just clean out the gunk. Change-Id: Ia1858a2474c9a4544ae16c53349aa7ae09e0c685 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:28:44 +00:00
project.o: $(QMKSRC)/project.cpp
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
remove pretenses of manual dependencies now that "make depend" actually works again, just clean out the gunk. Change-Id: Ia1858a2474c9a4544ae16c53349aa7ae09e0c685 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:28:44 +00:00
property.o: $(QMKSRC)/property.cpp
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
remove pretenses of manual dependencies now that "make depend" actually works again, just clean out the gunk. Change-Id: Ia1858a2474c9a4544ae16c53349aa7ae09e0c685 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:28:44 +00:00
meta.o: $(QMKSRC)/meta.cpp
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
remove pretenses of manual dependencies now that "make depend" actually works again, just clean out the gunk. Change-Id: Ia1858a2474c9a4544ae16c53349aa7ae09e0c685 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:28:44 +00:00
main.o: $(QMKSRC)/main.cpp
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
remove pretenses of manual dependencies now that "make depend" actually works again, just clean out the gunk. Change-Id: Ia1858a2474c9a4544ae16c53349aa7ae09e0c685 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-28 13:28:44 +00:00
option.o: $(QMKSRC)/option.cpp
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
metamakefile.o: $(QMKSRC)/generators/metamakefile.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
xmloutput.o: $(QMKSRC)/generators/xmloutput.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
makefiledeps.o: $(QMKSRC)/generators/makefiledeps.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
makefile.o: $(QMKSRC)/generators/makefile.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
unixmake.o: $(QMKSRC)/generators/unix/unixmake.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
unixmake2.o: $(QMKSRC)/generators/unix/unixmake2.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
winmakefile.o: $(QMKSRC)/generators/win32/winmakefile.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
mingw_make.o: $(QMKSRC)/generators/win32/mingw_make.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
msvc_objectmodel.o: $(QMKSRC)/generators/win32/msvc_objectmodel.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
msvc_vcproj.o: $(QMKSRC)/generators/win32/msvc_vcproj.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
msbuild_objectmodel.o: $(QMKSRC)/generators/win32/msbuild_objectmodel.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
msvc_vcxproj.o: $(QMKSRC)/generators/win32/msvc_vcxproj.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
msvc_nmake.o: $(QMKSRC)/generators/win32/msvc_nmake.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Fixed Wince Makefile environment Integrated the checksdk tool into qmake and made the makefiles selfcontained, so configure make, is now enough to build qt for wince Change-Id: I29076702eca2ec23d4d06bb3d5c5cef9d4f95161 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-05-11 08:24:28 +00:00
do not copy/symlink qmake to build dir make is perfectly capable of doing shadow builds Change-Id: I7e1c27cddc385b7a17ae5645b9cd26fa56d2f029 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2012-03-09 09:50:23 +00:00
pbuilder_pbx.o: $(QMKSRC)/generators/mac/pbuilder_pbx.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
projectgenerator.o: $(QMKSRC)/generators/projectgenerator.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qvariant.o: $(SOURCE_PATH)/src/corelib/kernel/qvariant.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qsettings.o: $(SOURCE_PATH)/src/corelib/io/qsettings.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qsystemerror.o: $(SOURCE_PATH)/src/corelib/kernel/qsystemerror.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
move generation of qconfig.cpp (and qt.conf) to qmake-based configure this moves us another step towards the "outer" configure doing just minimal bootstrapping of qmake. a challenge here was that so far, qmake itself needed qconfig.cpp. this was replaced by usage of a qt.conf file instead of compiled-in values. however, to make the executable still self-contained, that qt.conf is embedded into it (by simple appending of a fixed signature and the text file). the qmake with the embedded qt.conf is not used for the qt build itself, which instead relies on the qt.conf in bin/ as before. however, due to the missing built-in values, this file now needs to contain more information than before. but except for a minimal version that is needed to start up qmake/configure at all, that file is now also generated with qmake. as some of the newly set up properties are subsequently used by configure itself, qmake gains a (deliberately undocumented) function to reload the qt.conf after it's fully populated. unlike the old implementations, this one doesn't emit redundant qt.conf entries which match the hard-coded fallbacks. omitting them leads to leaner files which are more comprehensible. Started-by: Paolo Angelelli <paolo.angelelli@qt.io> Change-Id: I4526ef64b3c89d9851e10f83965fe479ed7f39f6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-11-24 17:41:48 +00:00
qlibraryinfo.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) -DQT_BUILD_QMAKE_BOOTSTRAP $<
revert to building qmake with qconfig.cpp turns out that just appending builtin-qt.conf isn't a good idea: executable-editing tools (objcopy, prelink, etc.) will happily drop the "attachment". a safe method would be adding a proper section to the executable, but there doesn't appear to be an objcopy equivalent in msvc, and using entirely different methods of embedding the file with different toolchains seems like a rather bad idea. so instead go back to the old method of building qmake with a generated qconfig.cpp. of course, as said file is now created by qmake itself, we have to compile qlibraryinfo.cpp a second time, and link a second qmake executable. Task-number: QTBUG-57803 Change-Id: I9e232693550aa870cec154e49cc06add13017cc2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-01-03 15:40:30 +00:00
qlibraryinfo_final.o: $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(BUILD_PATH)/src/corelib/global/qconfig.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qnumeric.o: $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move qrand() & qsrand() to qrandom.cpp Now that we have the file, may as well consolidate Change-Id: Icd0e0d4b27cb4e5eb892fffd14b51d3e701c6a94 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-04-14 00:50:05 +00:00
qrandom.o: $(SOURCE_PATH)/src/corelib/global/qrandom.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qsettings_mac.o: $(SOURCE_PATH)/src/corelib/io/qsettings_mac.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
qsettings_win.o: $(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qiodevice.o: $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Deinline QRingBuffer class Reduce the size of .text section in QtCore by 4.5KB and in QtNetwork by 26.5KB. Change-Id: If7998776166b9681c1e4b24c51d40444aa996d7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-05-01 11:02:16 +00:00
qringbuffer.o: $(SOURCE_PATH)/src/corelib/tools/qringbuffer.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Deinline QRingBuffer class Reduce the size of .text section in QtCore by 4.5KB and in QtNetwork by 26.5KB. Change-Id: If7998776166b9681c1e4b24c51d40444aa996d7a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-05-01 11:02:16 +00:00
De-inline QDebug destructor This injected quite some code on every use of qDebug and friends, while not giving any measurable performance benefits. Change-Id: I7b51f99130f18f1252da01e313f7b97c43a5480d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-04-29 10:39:31 +00:00
qdebug.o: $(SOURCE_PATH)/src/corelib/io/qdebug.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
De-inline QDebug destructor This injected quite some code on every use of qDebug and friends, while not giving any measurable performance benefits. Change-Id: I7b51f99130f18f1252da01e313f7b97c43a5480d Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-04-29 10:39:31 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qmalloc.o: $(SOURCE_PATH)/src/corelib/global/qmalloc.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Add qbswap for a memory region The compiler was generating some vectorized code for qresource.cpp but it wasn't very efficient. So improve upon it and make use in other places where we read UTF-16BE strings. [ChangeLog][QtCore] Added an overload of q{To,From}{Big,Little}Endian that operates on a memory region. Change-Id: I6a540578e810472bb455fffd1531fa2f1d724dfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-05-25 19:33:48 +00:00
qendian.o: $(SOURCE_PATH)/src/corelib/global/qendian.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qglobal.o: $(SOURCE_PATH)/src/corelib/global/qglobal.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Compile QArrayData in bootstrap phase. This change will be needed during migration from QByteArrayData to QArrayData. Change-Id: I0c8d6f9ed3ef7c33af62736af55259a8f9a70c0f Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-27 09:21:27 +00:00
qarraydata.o: $(SOURCE_PATH)/src/corelib/tools/qarraydata.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Compile QArrayData in bootstrap phase. This change will be needed during migration from QByteArrayData to QArrayData. Change-Id: I0c8d6f9ed3ef7c33af62736af55259a8f9a70c0f Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-27 09:21:27 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qbytearray.o: $(SOURCE_PATH)/src/corelib/text/qbytearray.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Include likely-adjusted uiLanguages for the system locale QLocale::uiLanguages() on the system locale uses whatever the system locale's query(QSystemLocale::UILanguages,...) returns. On Android, this is just a list of locales. However, for non-system locales, we also include some results of removing likely sub-tags from the locale name, where equivalent. Thus zh-CN would also get zh and zh-Hans-CN added to it; however, if the system locale is zh-Hans-CN, the shorter forms are omitted. So post-process the system locale list in the same way, albeit tweaked to avoid duplicates and rearranged so that we can insert likely-adjusted entries between what they adjust and what followed it. Added QLocalePrivate::rawName() in the process, since it looks likely to be useful in other contexts (and I needed its value): it just joins such tags as are non-Any. This, however, uses QByteArrayList, so added that (it's small) to the bootstrap library and qmake. This follows up on commit 8796e3016fae1672e727e2fa4e48f671a0c667ba. [ChangeLog][QtCore][QLocale] The system locale's UI languages list now includes, as for that of an ordinary locale, the results of adding likely sub-tags from each locale name, and of removing some, where this doesn't change which locale is specified. This gives searches for translation files a better chance of finding a suitable file. Fixes: QTBUG-75413 Change-Id: Iaafd79aac6a0fdd5f44aed16e445e84a2267c9da Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-04-29 10:33:55 +00:00
qbytearraylist.o: $(SOURCE_PATH)/src/corelib/text/qbytearraylist.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qvsnprintf.o: $(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/text/qbytearraymatcher.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qmetatype.o: $(SOURCE_PATH)/src/corelib/kernel/qmetatype.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
macOS: Merge qcore_mac cpp and mm files Files ending with .mm are Objective-C++ files, so we don't need a separate file for the C++ parts. Change-Id: I3ef52bc98291fd461b889978a538e81630d17c6e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2020-03-11 10:46:59 +00:00
qcore_mac.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_mac.mm
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move the readlink(2) wrapper to qcore_unix.cpp This deduplicates the code between QFileSystemEngine and QLockFile. Change-Id: I1eba2b016de74620bfc8fffd14cd005d5fd9beaa Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-06-30 20:30:52 +00:00
qcore_unix.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_unix.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Long live QOperatingSystemVersion! This class provides a "type safe" way to compare and access operating system version numbers. [ChangeLog][Deprecation Notice] QSysInfo::windowsVersion() and QSysInfo::macVersion() are deprecated and are replaced by the newly introduced QOperatingSystemVersion. Change-Id: I52b532de2e068ccf90faaa8342eee90c0a4145de Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-23 03:54:51 +00:00
qoperatingsystemversion.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Long live QOperatingSystemVersion! This class provides a "type safe" way to compare and access operating system version numbers. [ChangeLog][Deprecation Notice] QSysInfo::windowsVersion() and QSysInfo::macVersion() are deprecated and are replaced by the newly introduced QOperatingSystemVersion. Change-Id: I52b532de2e068ccf90faaa8342eee90c0a4145de Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-23 03:54:51 +00:00
qoperatingsystemversion_win.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_win.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Long live QOperatingSystemVersion! This class provides a "type safe" way to compare and access operating system version numbers. [ChangeLog][Deprecation Notice] QSysInfo::windowsVersion() and QSysInfo::macVersion() are deprecated and are replaced by the newly introduced QOperatingSystemVersion. Change-Id: I52b532de2e068ccf90faaa8342eee90c0a4145de Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-23 03:54:51 +00:00
qoperatingsystemversion_darwin.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsystemversion_darwin.mm
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Long live QOperatingSystemVersion! This class provides a "type safe" way to compare and access operating system version numbers. [ChangeLog][Deprecation Notice] QSysInfo::windowsVersion() and QSysInfo::macVersion() are deprecated and are replaced by the newly introduced QOperatingSystemVersion. Change-Id: I52b532de2e068ccf90faaa8342eee90c0a4145de Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2016-04-23 03:54:51 +00:00
QSettings: Remove calls to deprecated API on macOS CFURLCreateDataAndPropertiesFromResource and CFURLWriteDataAndPropertiestoResource have been deprecated since 10.9. We replace them with simple QFile access. Code cleaning and included. Change-Id: I19c7ceac41c8c511962f1128bd8e210e3adb434c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-06-29 23:20:31 +00:00
qcore_foundation.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
QSettings: Remove calls to deprecated API on macOS CFURLCreateDataAndPropertiesFromResource and CFURLWriteDataAndPropertiestoResource have been deprecated since 10.9. We replace them with simple QFile access. Code cleaning and included. Change-Id: I19c7ceac41c8c511962f1128bd8e210e3adb434c Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-06-29 23:20:31 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qstring.o: $(SOURCE_PATH)/src/corelib/text/qstring.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qstringbuilder.o: $(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Build qmake with QStringBuilder. QStringBuilder will be enabled by default so qmake should build with it. qstringbuiler.cpp has to be compiled in just for the convertFromAscii (The alternative was to build with QT_NO_CAST_FROM_ASCII, but that would be too much work) Change-Id: I1fbeed7ed8a9d3bc38ef591a687c50644980e2fd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-02-26 14:20:24 +00:00
Move the UTF conversion methods to qstringconverter Separate them from the qutfcodec, so that the codec can later on be moved out of Qt Core. Fix the QUtf methods to take qsizetype instead of int for length arguments. This also makes it possible to not build QTextCodec into the bootstrap lib anymore. Change-Id: I0b4f83139d61b19c651520a2f3a5012aa7e85cb8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2020-04-17 10:10:21 +00:00
qstringconverter.o: $(SOURCE_PATH)/src/corelib/text/qstringconverter.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qlocale.o: $(SOURCE_PATH)/src/corelib/text/qlocale.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qlocale_tools.o: $(SOURCE_PATH)/src/corelib/text/qlocale_tools.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qlocale_unix.o: $(SOURCE_PATH)/src/corelib/text/qlocale_unix.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qlocale_win.o: $(SOURCE_PATH)/src/corelib/text/qlocale_win.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
qmake: Add test functions for comparing version numbers qmake really lacks version comparing functions: users either use ugly constructions to compare versions by components, such as greaterThan(QT_CLANG_MAJOR_VERSION, 3)|greaterThan(QT_CLANG_MINOR_VERSION, 4): or even incorrectly compare versions as strings: !lessThan(apple_clang_ver, "5.1")|!lessThan(reg_clang_ver, "3.4"): Add test functions versionAtLeast and versionAtMost which use QVersionNumber to compare version numbers by components. Change-Id: I65e6b3c296d0301d544b7e38bf3d44f8d555c7fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-01-07 09:23:47 +00:00
qversionnumber.o: $(SOURCE_PATH)/src/corelib/tools/qversionnumber.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qbuffer.o: $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Split up base class QFileDevice for open-file operations (read/write) This will be used later on as a base class for QTemporaryFile and QSaveFile. Change-Id: Ic2e1d232f95dc29b8e2f75e24a881ab459d3f037 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-02-26 09:05:39 +00:00
qfiledevice.o: $(SOURCE_PATH)/src/corelib/io/qfiledevice.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfilesystementry.o: $(SOURCE_PATH)/src/corelib/io/qfilesystementry.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfilesystemengine.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfilesystemengine_unix.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_unix.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
qfilesystemengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfilesystemiterator_unix.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_unix.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
qfilesystemiterator_win.o: $(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfsfileengine.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfsfileengine_iterator.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfsfileengine_unix.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
qfsfileengine_win.o: $(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qabstractfileengine.o: $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
qregularexpression.o: $(SOURCE_PATH)/src/corelib/text/qregularexpression.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qdir.o: $(SOURCE_PATH)/src/corelib/io/qdir.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qdiriterator.o: $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qfileinfo.o: $(SOURCE_PATH)/src/corelib/io/qfileinfo.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Separate out the time, zone, date code from corelib/tools/ We'll be adding calendar code here as well, and tools/ was getting rather crowded, so it looks like time to move out a reasonably coherent sub-bundle of it all. Change-Id: I7e8030f38c31aa307f519dd918a43fc44baa6aa1 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-05-27 15:47:22 +00:00
qdatetime.o: $(SOURCE_PATH)/src/corelib/time/qdatetime.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Add support for calendars beside Gregorian Add QCalendarBackend as a base class for calendar implementations and QCalendar as a facade via which to access it. QDate's implicit implementation of the Gregorian calendar becomes QGregorianCalendar and QDate methods now support choice of calendar. Convert QLocale's CLDR data for month names to a locale-data component of each supported calendar and relevant QLocale methods now support choice of calendar. Adapt Python scripts for locale data generation to extract month name data from CLDR (keeping on version v35.1) into the new calendar-locale files. The locale data for the Gregorian calendar is held in a Roman calendar base, for sharing with other calendars. Add tests for basic uses of the new API. [ChangeLog][QtCore][QCalendar] Added QCalendar to support diverse calendars, supported by implementing QCalendarBackend. [ChangeLog][QtCore][QDate] Allow choice of calendar in various operations, with Gregorian remaining the default. Done-with: Lars Knoll <lars.knoll@qt.io> Done-with: Edward Welbourne <edward.welbourne@qt.io> Fixes: QTBUG-17110 Fixes: QTBUG-950 Change-Id: I9d6278f394269a183aee8156e990cec4d5198ab8 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2017-01-14 16:53:31 +00:00
qcalendar.o: $(SOURCE_PATH)/src/corelib/time/qcalendar.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qgregoriancalendar.o: $(SOURCE_PATH)/src/corelib/time/qgregoriancalendar.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qromancalendar.o: $(SOURCE_PATH)/src/corelib/time/qromancalendar.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Move text-related code out of corelib/tools/ to corelib/text/ This includes byte array, string, char, unicode, locale, collation and regular expressions. Change-Id: I8b125fa52c8c513eb57a0f1298b91910e5a0d786 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-05-27 17:13:54 +00:00
qstringlist.o: $(SOURCE_PATH)/src/corelib/text/qstringlist.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qmap.o: $(SOURCE_PATH)/src/corelib/tools/qmap.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
qhash.o: $(SOURCE_PATH)/src/corelib/tools/qhash.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
qcryptographichash.o: $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qlogging.o: $(SOURCE_PATH)/src/corelib/global/qlogging.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qsystemlibrary.o: $(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qdatastream.o: $(SOURCE_PATH)/src/corelib/serialization/qdatastream.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
Split cborstream feature in two Reading of Cbor streams is substantially more complicated than writing as it requires float16 support. When writing Cbor, we can just choose to always write 32bit floats, even if we could compress the numbers into 16 bits. We need Cbor writing in the bootstrap library, but we cannot easily add float16 support. Furthermore, Cbor reading is required for plugin support, but not Cbor writing. It might make sense for some users to build a custom Qt with Cbor writing disabled. Therefore, provide two features, cborstreamreader and cborstreamwriter, split up the code in cborstream.{h|cpp} into several files, and enable Cbor writing in the bootstrap library. Change-Id: I15450afb0e328a84a22ebca9379cffc4f900a75a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-10-29 12:50:22 +00:00
qcborstreamwriter.o: $(SOURCE_PATH)/src/corelib/serialization/qcborstreamwriter.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
Reimplement JSON support on top of Cbor In turn, deprecate the QJsonDocument methods that deal with JSON binary data. You should use CBOR for data serialization these days. [ChangeLog][Deprecation Notice] The binary JSON representation is deprecated. The CBOR format should be used instead. Fixes: QTBUG-47629 Change-Id: Ic8b92ea36de87815b12307a9d8b1095f07166db8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2019-06-19 11:43:00 +00:00
qcborvalue.o: $(SOURCE_PATH)/src/corelib/serialization/qcborvalue.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qjsoncbor.o: $(SOURCE_PATH)/src/corelib/serialization/qjsoncbor.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Allow customization of qDebug output at runtime Check the QT_OUTPUT_PATTERN environment variable in the default message handler to customize the output of messages. Following place holders are right now supported: %{message}, %{type}, %{file}, %{line}, %{function} The original cleanupFuncinfo was written by Thiago Macieira. Change-Id: I6ad25baaa0e6a1c9f886105d2a93ef3310e512a9 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: David Faure <faure@kde.org>
2012-02-03 08:35:22 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qjsondocument.o: $(SOURCE_PATH)/src/corelib/serialization/qjsondocument.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $<
qjsonparser.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonparser.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Unify win32-g++ and Unix qmake Makefiles. Replace the old sed / template @FOO@ method with echo. Enable MSYS bash to build qmake.exe Use qmake/Makefile.unix for all win32-g++ builds. Change-Id: I6e27d69b28d27131838bbbb3a4ee5a08b470f31b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-02 12:31:53 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qjsonarray.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonarray.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Add JSON parsing support to qmake. Add qjson* implementation files from corelib/json to the qmake build. Add a read-only compile mode, enabled by defining QT_JSON_READONLY. Add qmake built-in function parseJson(file, into) which parses a json file into the given variable. qmake uses a flat key -> value-list implementation for storing variables, which means that some hackery is need to represent arbitrarily nested JSON. Use a special "_KEYS_" variable for arrays and objects: Arrays: ["item1", "item2"] $${array._KEYS_} -> 0 1 2 $${array.0} -> "item1" $${array.1} -> "item2" Objects: { "key1" : "value1", "key2" : "value2" } $${object._KEYS_} -> key1 key2 $${object.key1} -> value1 $${object.key2} -> value2 Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-09-05 05:55:49 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qjsonobject.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonobject.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Add JSON parsing support to qmake. Add qjson* implementation files from corelib/json to the qmake build. Add a read-only compile mode, enabled by defining QT_JSON_READONLY. Add qmake built-in function parseJson(file, into) which parses a json file into the given variable. qmake uses a flat key -> value-list implementation for storing variables, which means that some hackery is need to represent arbitrarily nested JSON. Use a special "_KEYS_" variable for arrays and objects: Arrays: ["item1", "item2"] $${array._KEYS_} -> 0 1 2 $${array.0} -> "item1" $${array.1} -> "item2" Objects: { "key1" : "value1", "key2" : "value2" } $${object._KEYS_} -> key1 key2 $${object.key1} -> value1 $${object.key2} -> value2 Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-09-05 05:55:49 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qjsonvalue.o: $(SOURCE_PATH)/src/corelib/serialization/qjsonvalue.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Add JSON parsing support to qmake. Add qjson* implementation files from corelib/json to the qmake build. Add a read-only compile mode, enabled by defining QT_JSON_READONLY. Add qmake built-in function parseJson(file, into) which parses a json file into the given variable. qmake uses a flat key -> value-list implementation for storing variables, which means that some hackery is need to represent arbitrarily nested JSON. Use a special "_KEYS_" variable for arrays and objects: Arrays: ["item1", "item2"] $${array._KEYS_} -> 0 1 2 $${array.0} -> "item1" $${array.1} -> "item2" Objects: { "key1" : "value1", "key2" : "value2" } $${object._KEYS_} -> key1 key2 $${object.key1} -> value1 $${object.key2} -> value2 Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-09-05 05:55:49 +00:00
Create corelib/serialization and move existing file formats into it This is in preparation to adding CBOR support. We don't need yet another dir for CBOR and placing it in src/corelib/json is just wrong. Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-13 02:32:19 +00:00
qtextstream.o: $(SOURCE_PATH)/src/corelib/serialization/qtextstream.cpp
Use $< to save lots of repetition in qmake/Makefile.unix Change-Id: If9f8d2802e28028cac3a9725970cff831f2e2410 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-13 13:02:15 +00:00
$(CXX) -c -o $@ $(CXXFLAGS) $<
Add JSON parsing support to qmake. Add qjson* implementation files from corelib/json to the qmake build. Add a read-only compile mode, enabled by defining QT_JSON_READONLY. Add qmake built-in function parseJson(file, into) which parses a json file into the given variable. qmake uses a flat key -> value-list implementation for storing variables, which means that some hackery is need to represent arbitrarily nested JSON. Use a special "_KEYS_" variable for arrays and objects: Arrays: ["item1", "item2"] $${array._KEYS_} -> 0 1 2 $${array.0} -> "item1" $${array.1} -> "item2" Objects: { "key1" : "value1", "key2" : "value2" } $${object._KEYS_} -> key1 key2 $${object.key1} -> value1 $${object.key2} -> value2 Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-09-05 05:55:49 +00:00
Compile QRegularExpression into qmake This is required to be able to port qmake over to use QRegularExpression instead of QRegExp. Change-Id: I0ad2c19bf3c0a28e52c1e12b4d3daa0300a75ed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-03 13:39:37 +00:00
pcre2_auto_possess.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_auto_possess.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_chartables.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_chartables.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_compile.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_compile.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_config.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_config.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_context.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_context.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_dfa_match.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_dfa_match.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_error.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_error.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_extuni.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_extuni.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_find_bracket.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_find_bracket.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_jit_compile.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_jit_compile.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_maketables.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_maketables.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_match.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_match.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_match_data.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_match_data.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_newline.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_newline.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_ord2utf.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_ord2utf.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_pattern_info.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_pattern_info.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_script_run.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_script_run.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_serialize.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_serialize.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_string_utils.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_string_utils.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_study.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_study.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_substitute.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_substitute.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_substring.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_substring.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_tables.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_tables.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_ucd.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_ucd.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_valid_utf.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_valid_utf.c
$(CC) -c -o $@ $(CFLAGS) $<
pcre2_xclass.o: $(SOURCE_PATH)/src/3rdparty/pcre2/src/pcre2_xclass.c
$(CC) -c -o $@ $(CFLAGS) $<
Initial import from the monolithic Qt. This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
2011-04-27 10:05:43 +00:00
# DO NOT DELETE THIS LINE -- make depend depends on it
Reference in New Issue Copy Permalink