| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: I7106026af6096871368a9e05df94c907e39cdde1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I0bf62743546abfcd50718afc8ee8f085938f30c3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
|
|
|
| |
files will now always be copied to the build dir, and install targets
will be created always as well.
Change-Id: I42a57d7fb6536ec3e5ade088f02872484891507e
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
| |
These files are no longer required.
Change-Id: Idb2cdb73efce40897f3ed625e82ae4220f97598b
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
|
|
|
|
|
|
|
| |
Recent refactoring broke it.
Change-Id: I370f8f91aef6901b3222d5548062ccd239f40ea5
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
If you have Msysgit with full shell installed, you will have sh.exe in
path, even though you are using MSVC + nmake. This combo will not
understand Unix mkdir still, so reorganize expressions to avoid this
situation.
Change-Id: Ie353f6ed494c5983fecf6e83af063edb88df234b
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
| |
Change-Id: I5012b48cd1b29613b66989f9ce117f92149355f6
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Updating Qt3D's packaging and deployment: remove some platform specific
packaging references. These can be hidden away in the build scripts for
those platforms and do no need to be in the generic package logic. To
support this approach begin fixing qmlres and the main.cpp's.
Fix and streamline the pkg.pri file, and add some much needed comments.
Note that this change *will* break current packaging scripts - those can
need to be fixed in seperate commits.
Change-Id: I05c2081f61b91bc91673668f6e423a206ac026d5
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Use backslash and check existence of target directory in
pkg.pri.
Change-Id: I08d4b571b3f17a59a3fb29355f464e2fa1f615c5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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: I1f980fecc22780584b54704ec03c4d37439799ca
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
|
|
|
|
|
|
|
| |
In Qt4, qtquick3d had to reinvent a lot of Qt's own build system logic.
In Qt5, modularization makes this unnecessary, so remove it.
Change-Id: I683acba659c1a3842e927262cacd9377cdac7c35
Reviewed-by: Sarah Jane Smith <sarah.j.smith@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>
|
|
|
|
|
|
|
| |
Change-Id: If02477a8bba02e58bcf407640e53b7b1d9f88402
Reviewed-on: http://codereview.qt.nokia.com/4024
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ib6f8ae2d6f60aeb46ea4a566edaf6813514caf4c
Reviewed-on: http://codereview.qt.nokia.com/3845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I25fcaee72a1bb44f40c5470dbdeb0d8bafcebf2e
Reviewed-on: http://codereview.qt.nokia.com/3538
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
|
|
|
|
|
|
|
|
| |
Change-Id: If6e5ec67f1335356bbbb1695346221c7d692ab62
Reviewed-on: http://codereview.qt.nokia.com/3344
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-on: http://codereview.qt.nokia.com/2651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Change-Id: Iadea3db4ba7d5b62f432b225f55087c67431a9a9
Reviewed-on: http://codereview.qt.nokia.com/3229
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In most cases simply changing the import line to QtQuick 2.0 fixed any
problems.
Also fixed a few warnings and spurious includes.
Task-number: QTBUG-20050
Change-Id: I311a6d63f899e2fd3621fb608c587375a27378f6
Reviewed-on: http://codereview.qt.nokia.com/2546
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
After recent refactoring of build system windows packages were broken.
Now fixed.
Change-Id: I053560b45189334893dcd21db2b30009a6cb9a47
Reviewed-on: http://codereview.qt.nokia.com/2533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Deployment updates.
Reviewed-on: http://codereview.qt.nokia.com/1732
Deployment updates.
Reviewed-on: http://codereview.qt.nokia.com/1856
More deployment updates.
Reviewed-on: http://codereview.qt.nokia.com/1912
Tidying up build system removing need for qml_pkg.pri.
Reviewed-on: http://codereview.qt.nokia.com/2229
Tidying up build system removing need for qt3dquick_pkg_dep.pri.
Reviewed-on: http://codereview.qt.nokia.com/2230
Tidying up build system removing need for qt3d_pkg_dep.pri.
Reviewed-on: http://codereview.qt.nokia.com/2232
Final major change to cleanup build system.
Should eliminate problems where the "qml" directories aren't
being updated upon rebuilds, and allows easier deployment to
devices via Qt Creator.
Reviewed-on: http://codereview.qt.nokia.com/2247
Change-Id: Iedc926ef421fcb9039833c328cca8b0802b3bd44
Reviewed-on: http://codereview.qt.nokia.com/2494
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>
|
|
|
|
|
|
|
|
| |
Add change id.
Change-Id: Iae6bf8b7d33465d1dcc9726af5dd07020c257e9a
Reviewed-on: http://codereview.qt.nokia.com/1554
Reviewed-by: Sarah Jane Smith
|
|
Packaging was always not so good. With the arrival of yet another
packaging system to support, with QtSDK and Harmattan, it was overdue
time to refactor the build system.
Factored out all the places where Qt3D and QtQuick3D dependencies were
exactly 3 levels below the source .pro file. This catches all of the
examples and all of the demos, except for the ones in the tutorials
directories. It is fine if those don't appear in packages, since their
main value is in examining them in the IDE, rather than just having a
package run them for you. It also catches both of the import plugins.
Thus we save a huge amount of duplication of packaging information and
can place the Qt SDK Harmattan packaging into a couple of variables in a
new pkg.pri file. The two deps are now in a qt3d_pkg_dep.pri and
qt3dquick_pkg_dep.pri file which include the pkg.pri.
Change-Id: I28de17d7faa5ccf9157afad99471079c0b62ee87
Reviewed-on: http://codereview.qt.nokia.com/1191
Reviewed-by: Sarah Jane Smith
|