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
..
ipc	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
json	Unify license header usage.	2016-03-29 10:20:03 +00:00
mimetypes	mimetypebrowser example: Add Generic Icon Name	2016-08-01 09:41:10 +00:00
threads	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
tools	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
corelib.pro	Add mime type browser example.	2016-03-24 13:03:02 +00:00