f6fc34294f
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 |
||
|---|---|---|
| .. | ||
| ioutils.cpp | ||
| ioutils.h | ||
| proitems.cpp | ||
| proitems.h | ||
| qmake_global.h | ||
| qmakebuiltins.cpp | ||
| qmakeevaluator_p.h | ||
| qmakeevaluator.cpp | ||
| qmakeevaluator.h | ||
| qmakeglobals.cpp | ||
| qmakeglobals.h | ||
| qmakeparser.cpp | ||
| qmakeparser.h | ||
| qmakevfs.cpp | ||
| qmakevfs.h | ||