qt5base-lts/mkspecs/features/data
Lars Knoll 0f315adf91 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
2018-01-02 09:58:44 +01:00
..
cmake Propagate all module defines to CMake config files 2017-08-15 16:44:38 +00:00
mac mkspecs: Replace LGPL21 with LGPL license header 2017-03-03 07:26:43 +00:00
unix findclasslist.pl: namespaces can be exported too 2016-10-13 08:29:02 +00:00
configure.json configure: support discarding selected test results with -recheck 2017-12-14 18:02:30 +00:00
dummy.cpp Implement a more direct headersclean check 2015-04-17 00:54:45 +00:00
macros.cpp make qconfig.pri export QT_<compiler>_VERSION variables again 2017-06-12 09:55:26 +00:00