| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I98507808b43b116b1950fd60df54704562a234ce
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
This should have already been performed by Renderer::shutdown(). Doing it
again in the dtor only hides potential issues.
Change-Id: I33b02df42d1667ea4cbc02cb6f4cb8fabcf70996
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/render/backend/renderer.cpp
tests/auto/auto.pro
Change-Id: Idc5bb088ae7f591809f8795124a3e44410bf4cf9
|
| |
| |
| |
| |
| |
| |
| | |
Apparently this was a major security issue reported to security.qt-project.org
Change-Id: Id52f035134ca6111e24b5820eb1b64b99449e47f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderview.cpp
src/render/graphicshelpers/graphicscontext_p.h
src/render/graphicshelpers/graphicshelperes2_p.h
src/render/graphicshelpers/graphicshelpergl2_p.h
src/render/graphicshelpers/graphicshelpergl3_2_p.h
src/render/graphicshelpers/graphicshelpergl3_3_p.h
src/render/graphicshelpers/graphicshelpergl4_p.h
src/render/graphicshelpers/graphicshelperinterface_p.h
src/render/jobs/pickboundingvolumejob.cpp
tests/auto/animation/clipanimator/tst_clipanimator.cpp
tests/auto/auto.pro
tests/manual/manual.pro
Also disabled the QQmlMetaType codepaths following commit
49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The
QQmlMetaType codepaths will be re-enabled once a qt5.git
integration has succeeded.
Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
|
| |
| |
| |
| |
| |
| |
| |
| | |
Static library containing helpers for unit tests to avoid having to
build the same files 200 times.
Change-Id: I89d63abbd7777a96276154298c2748e2d6774514
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|/
|
|
|
|
|
|
|
| |
This allows to remove dependencies and reduce deployment size when a given
aspect is not required.
Change-Id: I5aa90e4825b375cd446c47727aa11d03c40703c9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
Add empty aspect that will provide key-frame animation
support within Qt 3D.
Change-Id: Ife26ad58229aada74c1c6eca2148fc97b22267b0
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
|
|
|
|
|
| |
Change-Id: I6ffb9e0a743dfad78624b2edcfa2d93d69d685dd
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
| |
Change-Id: I7090ff89feaf0cf93f901a38827f00a331ccee9b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-46592
Change-Id: Ib28a8fcf2c0e692dd10227f9a9e3c6a10a7fcdbd
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
| |
Hopefully in the long term we can make the renderer smart enough
that it can automatically use instancing to render such things.
Change-Id: I9f5cfabeea11f5e6b925d5ad2466afa8e601e6f8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
|
|
|
|
|
|
|
|
| |
With: Paul Lemire
Change-Id: I47a228553da06d9692a206fd2424beea0a163b2f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
| |
If needed we can fetch stuff back from master branch.
Change-Id: Ic35f989de4a59d2c0a18ca6b18f0c0aca64d5046
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
| |
- Removed the pickRegistry and related code, because it is not needed
- Fixed picking when navigation is turned off
- Introduced a new autotest for picking
Change-Id: Ib43789383760902f42542b45cfe49342f4ffa090
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I53de6de78a982968c31a9c8d17628d1cddb63a14
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I079b5b4ec7fb7301e732b8898cd64c6d7afe1c9d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The C++ implementation of Qt3D could not be compiled without also having
installed QtQML and QtQuick. This change allows the compilation of the
non-QML part of Qt3D separately.
Change-Id: I791a03a0f0e1118f3ec20b77be327786148b8923
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Support for qmltest may be missing when building qtdeclarative. This
change modifies the autotests so that those relying on qmltest will only
be built if it is present.
Change-Id: I8032120817294149d015c68dd661b96da04c7394
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are a lot of problems with our tests on platforms where the
fixed-function pipeline is in force, that is no shaders are available.
We have code paths that are supposed to deal with that but they're
poorly maintained and now crash. Try to fix a few of them, and work
around others which are exposed by the qml3d tests on windows CI boxes
(that have software OpenGL 1.x).
We notice that QT_QPA_PLATFORM=minimal causes a crash with QML tests
that have a test function without a surrounding TestCase element.
Let's fix that and see if it helps also the mysterious windows test
crashing problem.
Task-number: QTBUG-25276
Change-Id: Ieeb67536f86467bb6819b62319ac3cee2219a8ae
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
External object's state is tested.
Signals, gets/sets, etc.
For sphere, cylinder and capsule geometry is also tested.
Change-Id: I40a07dc30c433e89bd05187e9a90808aeaa8eade
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
|
|
|
|
|
|
|
|
| |
to make qml3d tests run on linux system
Change-Id: I1f04a9f816d0e93d2dd04c12c5c5ba350344941c
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
| |
Change-Id: I8e4f56577f708eea208c51538c77fd4b2c4fefb5
Reviewed-on: http://codereview.qt-project.org/5219
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I554e065de9d7c49c0320461f7b818d9d2fe6bcb0
Reviewed-on: http://codereview.qt.nokia.com/2725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Concatenated a number of fixes.
Fixed QDeclarativeView errors.
This class no longer exists under Qt5, being replaced by QSGView.
Since that class also guarantees OpenGL, there is no need for the
explicit QGLWidget create either. For now leave the QDeclarativeView3D
class in place, but it is now redundant.
Fixed "Project ERROR: QtQuick3D requires Qt Declarative"
Currently, within qt5, it is possible to guarantee that _make_ runs
over qtquick3d after its dependencies, but not possible to guarantee the
same for _qmake_. Therefore we must avoid using any values of QT_CONFIG
which are set while running qmake over our dependencies.
Without this, an aggressively parallel build will pseudo-randomly fail
depending on the order in which qmake is run.
Fixed compile for QtDeclarative -> QtQuick1 split.
Classes relating to QtQuick 1 were split into a new module separate from
QtDeclarative. Update quick3d for this change.
Update sync.profile dependencies to new syntax
%dependencies now has a simpler format of gitmodule => gitref instead of
using qt modules and keywords.
Change-Id: If01d07da1ecf0ced4a9b5a36b2be39105ccffcbb
Reviewed-on: http://codereview.qt.nokia.com/1819
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
Fill repo with some of the files from the research/qt3d project. At
present the new project builds under MacOSX. To-dos include getting it
building under linux, windows, harmattan and maemo/meego; updating the
documentation to reflect the new QtQuick focus; and fixing the issues
with private headers.
|