The REPEAT wrap mode is not supported by default for non-
power-of-two textures in OpenGL ES 2. Output warning in
QSGTexture::updateBindOptions() in debug mode.
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Views do not notify count changes properly
Uninitialized memory is compared.
Clear the root index when the model is reset.
Fix warning about ASCII cast in calling QString::contains (cherry picked from commit 4671c273edb87e55436dd3bf0b371267c5e34ff7)
The views don't have a valid count until both a model and a delegate
are provided. But, countChanged() is not called when a delegate is
set after the model, so bindings to count were not evaluated. Also
test that count is updated for insertion/removal
Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314
Task-number: QTBUG-19037
Reviewed-by: Bea Lam
(cherry picked from commit 4fbcb6a531bf424a8dbbbd0ca2947d9e15118885)
Memory is allocated and used without first clearing it. At
the least this annoys valgrind, but also has potential for real
problems.
Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d
Task-number: QTBUG-15187
Reviewed-by: Aaron Kennedy
(cherry picked from commit 95aa4e4f9b82c3652ffc93310b190db869d491df)
Task-number: QTBUG-18839
Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6
Merge-request: 2598
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit f6b7ce204ee88be0fedb4cfcff382f208fa4ed33)
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Removed some trailing whitespace
Moved the QML Observer Service and related functionality into Qt
This code was previously developed as part of Qt Creator in
share/qtcreator/qml/qmljsdebugger/
Moving it into Qt will allow us to simplify the setup required before
you can debug QML applications.
To avoid adding too much weight to the QtDeclarative module, a
declarativeobserver plugin was introduced that contains the
QDeclarativeViewObserver and related classes. The
QDeclarativeObserverService is just a stub service that loads this
plugin once a QML debugging client connects. The plugin implements the
QDeclarativeObserverInterface
A QJSDebugService was separated out of QJSDebuggerAgent, so
that the service can be active while the agent is instantiated lazily.
Each QDeclarativeEngine adds itself to the QJSDebugService. Currently
only the first one is used when instantiating the agent.
QDeclarativeObserverService is hooked into QDeclarativeView, with the
view registering itself to the service, allowing the
QDeclarativeViewObserver to be created for the view once somebody
connects to the service. Again, only the first view is used at the
moment.
Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
(cherry picked from commit 35faeb205843c4f0b921d2b878d2d24962c64664)
Fixups squashed into this one:
(cherry picked from commit 0abf1dd99eeb252ae10c9f3cd99b64ee0b4d6e72)
(cherry picked from commit 894515429397be20670806825099b4b9896d50d6)
(cherry picked from commit 7d9f03c87e0e096934583a36340de5446e1d0520)
Conflicts:
src/plugins/qmltooling/qmltooling.pro
src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp
This is necessary since some services may like to send a message back
immediately when its state changes to enabled.
Reviewed-by: Kai Koehne
(cherry picked from commit 9fa0a9319ee0f178d03f9bdc4afbabb8563b4c62)
Replaced the synchronous function grab() with an asynchronous
function scheduleUpdate() in QShaderEffectSource because
synchronous grabbing doesn't work with threaded rendering.
Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated
strings.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848
(cherry-picked from commit f33b31dcc1b8fd35501ab5b441a4529e2f8570f3)
Relates to commit 6f8637810e549dac3ee8386f199a997d21ac85ce.
Task-number: QMLNG-18
Reviewed-by: Martin Jones
Change-Id: I96f0e2ebc4206d6c2a0fda476d214e549666a69c
The assumption is that most people will use QSGTextureMaterial
so this should be the one that works for both transparent
and opaque textures. QSGOpaqueTextureMaterial is an optimization
Gunnar Sletta
Roberto Raggi
Kim Motoyoshi Kalland
Alan Alpert
Rohan McGovern
Martin Jones
Qt Continuous Integration System
Girish Ramakrishnan
Thiago Macieira
Yoann Lopes
Liang Qi
Chris Adams
Thorbjørn Lindeijer
Eskil Abrahamsen Blomfeldt
Kai Koehne