OSDN Git Service

build fixes for the QT_STRICT_ITERATORS conditional
authorIvailo Monev <xakepa10@gmail.com>
Sat, 4 Jun 2016 14:15:26 +0000 (14:15 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Sat, 4 Jun 2016 14:15:26 +0000 (14:15 +0000)
commit48a45d0cd4f860419502832d4ffb8b2a7217d525
tree5783dcb11ebb2051bb8a187911b6e4d2719259ec
parent42ab80dc7d2989f5c9c32c97c368590e4317ea10
build fixes for the QT_STRICT_ITERATORS conditional

the only thing left to fix is the dbus component which requires the
pointer operator backported from https://github.com/qtproject/qtbase/commit/9c5a77f0ef0b2ace0b11719142115eded4a7c05e
but it messes up the erase and insert templates and causes source
incompatibilities so it has to investigated further.

upstream commits:
https://github.com/qtproject/qtbase/commit/fad1fa65ed2a76539a229acaa83299875ce8b4c1
https://github.com/qtproject/qtbase/commit/7c1e0fef8e35ecd8487c41dc39e7ce46537f3040
https://github.com/qtproject/qtbase/commit/c4fbe872be1316f2fd65aa62863d6617cb129a3f
https://github.com/qtproject/qtbase/commit/0412ad35132e0de008d601912ded1f147014cab1

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
17 files changed:
src/core/tools/qcommandlineparser.cpp
src/dbus/qdbusintegrator.cpp
src/designer/shared/qtresourcemodel.cpp
src/designer/shared/qtresourceview.cpp
src/gui/dialogs/qfilesystemmodel.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/itemviews/qsortfilterproxymodel.cpp
src/gui/itemviews/qtreeview.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qgesturemanager.cpp
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextformat.cpp
src/help/qhelpgenerator.cpp
src/help/qhelpprojectdata.cpp
src/help/qhelpsearchindexreader_default.cpp
src/help/qhelpsearchindexwriter_default.cpp