| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
Change-Id: Ic6c05d78f617155892b546721946ee2c5c9b660a
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
| |
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ib09067b91869c2840710bffee104bc63c76b0bf7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
|
|
|
| |
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Iaddf1e489f97d2b08894827c90e9e58cd02d2ef2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
| |
Replace Nokia contact email address with Qt Project website.
Change-Id: I36e7a01dc458ad25afef2de46a5807f2983fac43
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |
|
|
|
|
|
| |
Update copyright headers from before 2011.
Change-Id: Id5a16806e69c595b12cc761acfa0a0eaf0b99d72
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Pull out all references to QGLContext, and QGLWidget and so on; and
replace with the equivalent from the gui library. Where there is no
equivalent, eg the BindOptions enum, then reimplement.
Also get rid of the harmattan and symbian packaging goop. This had
become completely unmaintainable, and was making it very hard to see
what dependencies were being pull in by the various parts of the build
system. In order to have any confidence that conditional compilation
would not add in some problematic dependency, clean all this up.
Task-number: QTBUG-23299
Change-Id: Ied92ca1397076986e455674b064d8540bb13c0df
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
| |
|
|
|
| |
Change-Id: Icd7709d4fd91fc972d503f8e3f9de0e47f56ff96
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With the qt5 refactor branch going in the ability to get a QPaintDevice
has gone away - this was really a "relic from the desktop days".
Painting still applies for FBO's and so on, but in the case of QML we
are on an SG view and there is no paint device there.
So move the QGLView to using a QWindow and QOpenGLContext as well to
follow suit and replace all the logic in surface stuff to cope with
that.
Also update all examples, demos, tutorials and tests.
Change-Id: Ie8dbeb97c87ef0821326fb7ccf5d5d4b1f90fd06
Reviewed-on: http://codereview.qt-project.org/5900
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
| |
We continue with Symbian for the Qt4 program but
since Qt5 support for symbian is not implemented
and if it is will likely look very different,
remove this code for now.
Change-Id: Iced82075e37e3685f7247a7558c298adb54e10ef
Reviewed-on: http://codereview.qt.nokia.com/1863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
| |
Conflicts:
examples/quick3d/photoroom/main.cpp
pkg.pri
Change-Id: I01238e324968f30c0a85177fa9db84e8d0d69ed4
Reviewed-on: http://codereview.qt.nokia.com/1124
Reviewed-by: Sarah Jane Smith
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Conflicts:
demos/quick3d/model_viewer/model_viewer.pro
demos/quick3d/robo_bounce/robo_bounce.pro
demos/quick3d/tea_service/tea_service.pro
examples/qt3d/basket/basket.pro
examples/qt3d/builder/builder.pro
examples/quick3d/basket/basket.pro
examples/quick3d/cube/cube.pro
examples/quick3d/forest/forest.pro
examples/quick3d/lander/lander.pro
examples/quick3d/matrix_animation/matrix_animation.pro
examples/quick3d/monkeygod/monkeygod.pro
examples/quick3d/moon/moon.pro
examples/quick3d/photoroom/photoroom.pro
examples/quick3d/shaders/shaders.pro
examples/quick3d/sphere/sphere.pro
examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
src/quick3d/quick3d.pri
Change-Id: Ia14cfdcabd85b2264266d977f97a1216244a783c
Reviewed-on: http://codereview.qt.nokia.com/1202
Reviewed-by: Sarah Jane Smith
|
| |
|
