| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When failing without a filename, setting file to 0 does not work.
File must be set to "".
Autotest: 2d194009379a4e199ec246ca053ee97ee733482f
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Obvious typo in format string: `<DataTag><![CDATA[%s]]></Description>',
closing tag should be `DataTag'.
Autotest: 2d194009379a4e199ec246ca053ee97ee733482f
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Previously `-flush' was always passed to the child process, meaning the
old (Qt 4.5) test logger was used exclusively in this test, hiding bugs.
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QObject::setParent is not allowed for QWidgets
using QWidget::setParent instead if QObject::isWidgetType()
Reviewed-by: Kai Koehne
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | |
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | | |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Made the fetch() method a slot so it will be accessible from QML.
|
| | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |\ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |\ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | | | | |
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
into kinetic-declarativeui
Conflicts:
demos/boxes/scene.cpp
src/opengl/qglpixmapfilter.cpp
src/opengl/qglshaderprogram.cpp
src/opengl/qglshaderprogram.h
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Patch originally by Ian Walters.
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: trustme
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The shader compilers also report warnings, so it is more appropriate
to call the string a log.
Reviewed-by: trustme
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Reviewed-by: Rhys Weatherley
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/rweathers-shaderprograms into shader-api
Conflicts:
src/gui/math3d/math3d.pri
src/gui/math3d/qgenericmatrix.cpp
src/gui/math3d/qgenericmatrix.h
src/gui/math3d/qmatrix4x4.cpp
src/gui/math3d/qmatrix4x4.h
src/gui/math3d/qquaternion.cpp
src/gui/math3d/qquaternion.h
src/gui/math3d/qvector2d.cpp
src/gui/math3d/qvector2d.h
src/gui/math3d/qvector3d.cpp
src/gui/math3d/qvector3d.h
src/gui/math3d/qvector4d.cpp
src/gui/math3d/qvector4d.h
src/opengl/opengl.pro
tests/auto/math3d/math3d.pro
tests/auto/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
tests/auto/math3d/qquaternion/tst_qquaternion.cpp
tests/auto/math3d/qvectornd/tst_qvectornd.cpp
tests/auto/math3d/shared/math3dincludes.h
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| |_|_|_|_|_|/ / / /
|/| | | | | | | | | |
|
|\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|/ / / /
| |/| | | | | | | |
| | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| |\ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| | | | | | | | | |
| | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | | | | | | |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Need a few names for scrolling to be demonstrated.
Also still only a few hundred K, so 1000 items not that
big a deal.
|
| | | | | | | | | | | |
|
| | | | | | | | | | | |
|
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| | |_|_|_|/ / / /
| |/| | | | | | | |
|
| |\ \ \ \ \ \ \ \
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \ \ \ \ \ \ \
| | | | |/ / / / / /
| | | |/| | | | | |
| | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |\ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/
| | | | |/| | | | | |
| | | | | | | | | | | |
kinetic-declarativeui
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Task-number: 250632
|