Edward Welbourne f6fc34294f Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: configure 5.7 now supports clang on android; but dev re-worked configure src/gui/kernel/qevent.h One side renamed a parameter of a constructor; the other added an alternate constructor on the next line. Applied the rename to both for consistency. tests/auto/tools/moc/tst_moc.cpp Each side added a new test at the end. .qmake.conf Ignored 5.7's change to MODULE_VERSION. configure.json No conflict noticed by git; but changes in 5.7 were needed for the re-worked configure to accommodate 5.7's stricter handling of C++11. Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2		2016-08-01 18:20:00 +02:00
..
dialogs	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
effects	QtWidgets: Remove Windows CE.	2016-04-07 10:24:45 +00:00
gestures	autotests: use QTest::createTouchDevice()	2016-06-10 13:07:17 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
itemviews	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-01 18:20:00 +02:00
kernel	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
styles	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
util	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
widgets	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00