Liang Qi 0c034a649f Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/widgets/widgets/qpushbutton.cpp Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81		2017-03-14 10:52:24 +01:00
..
moc	moc: Add support for C++17 nested namespaces (N4230)	2017-03-08 17:34:38 +00:00
qdbuscpp2xml	remove unnecessary references to $$QMAKE_CFLAGS_DBUS	2016-10-04 20:21:28 +00:00
qdbusxml2cpp	remove unnecessary references to $$QMAKE_CFLAGS_DBUS	2016-10-04 20:21:28 +00:00
qmake	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
qmakelib	qmake: introduce magic bypassNesting() scope	2016-12-13 18:56:20 +00:00
rcc	Fix missing last modification time stamp in qrc content	2016-11-22 04:57:02 +00:00
uic	Merge remote-tracking branch 'origin/5.9' into dev	2017-03-14 10:52:24 +01:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00