AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1dade1bd8a
qt5base-lts/qmake/generators
History
Liang Qi 1dade1bd8a Merge remote-tracking branch 'origin/5.13' into dev 
Conflicts:
	mkspecs/win32-clang-msvc/qmake.conf
	src/corelib/tools/qlist.h
	src/gui/painting/qcompositionfunctions.cpp
	src/gui/painting/qtriangulator_p.h
	src/gui/text/qfontengine_p.h
	src/network/kernel/qhostinfo_p.h
	src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp

Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798
2019-08-13 09:46:17 +02:00
..
mac Merge remote-tracking branch 'origin/5.13' into dev 2019-06-14 13:45:18 +02:00
unix Merge remote-tracking branch 'origin/5.13' into dev 2019-08-13 09:46:17 +02:00
win32 Do not use QList<QMakeLocalFileName> 2019-08-12 08:05:14 +02:00
makefile.cpp Do not use QList<QMakeLocalFileName> 2019-08-12 08:05:14 +02:00
makefile.h Warn about conflicting DESTDIR/TARGET combination in debug_and_release 2019-08-09 10:29:28 +02:00
makefiledeps.cpp Do not use QList<QMakeLocalFileName> 2019-08-12 08:05:14 +02:00
makefiledeps.h Do not use QList<QMakeLocalFileName> 2019-08-12 08:05:14 +02:00
metamakefile.cpp Warn about conflicting DESTDIR/TARGET combination in debug_and_release 2019-08-09 10:29:28 +02:00
metamakefile.h qmake: Apply modernize-use-nullptr 2018-08-08 17:30:32 +00:00
projectgenerator.cpp Do not use QList<QMakeLocalFileName> 2019-08-12 08:05:14 +02:00
projectgenerator.h Merge remote-tracking branch 'origin/5.13' into dev 2019-06-14 13:45:18 +02:00
xmloutput.cpp Prefix textstream operators with Qt:: 2019-05-02 11:52:02 +00:00
xmloutput.h Updated license headers 2016-01-21 18:55:18 +00:00