diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-28 13:20:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-08-01 18:20:00 +0200 |
| commit | f6fc34294f5691da8aa7ab8dc0452c6fa9036b67 (patch) | |
| tree | 3b8fe9841f88aa81e2f8f2d57cbbca2c4736ca6f /doc | |
| parent | 6f75096afc000991111bb0fd7a7e530ce3518627 (diff) | |
| parent | 0eb77c3011ee4d6bbc46dd2d40c9324e9bfcbecf (diff) | |
| download | qtbase-f6fc34294f5691da8aa7ab8dc0452c6fa9036b67.tar.gz | |
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
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/manifest-meta.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index bb242eb98f..7ebe86a431 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -250,6 +250,7 @@ manifestmeta.thumbnail.names = "QtCore/Contiguous Cache Example" \ "QtHelp/*" \ "QtMultimedia/AudioEngine Example" \ "QtQml/Extending QML*" \ + "QtQuick/C++ Extensions: Image Response Provider Example" \ "QtQuick/Qt Quick Examples - Accessibility" \ "QtSensors/Qt Sensors - SensorGesture QML Type example" \ "QtWinExtras/Icon Extractor" |