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
..
moc	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-01 18:20:00 +02:00
qdbuscpp2xml	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qdbusxml2cpp	Unify naming of LIBS/CFLAGS for 3rd party libraries	2016-04-07 16:18:03 +00:00
qmake	make extra compiler targets depend on their respective compiler	2016-04-18 09:38:10 +00:00
qmakelib	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
rcc	Updated license headers	2016-01-21 18:55:18 +00:00
uic	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
tools.pro	add test for the qmake library	2015-02-25 13:54:33 +00:00