Commit Graph

6679 Commits

Author SHA1 Message Date
Sarah Smith e2d7b79caa Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3d 2011-04-04 20:36:50 +10:00
Sarah Smith ce4b14604c Packaging round one done.
See QTBUG-17434 for more details.

Packaging on a debian desktop system works.  Tested with Ubuntu 10.10
which is currently one of few with Qt 4.7.x packages.
2011-04-04 20:35:10 +10:00
Julian de Bhal 908b5d7319 Item3D: Improve wording of warning where texture coordinates are missing
Change-Id: I3f249b5e58cf910ed5f4772deb276919e6fbb34a
2011-04-04 14:31:59 +10:00
Julian de Bhal 78982e0c2c Generate dummy texcoords for scenenodes if an effect requires them. QTBUG-18535
Change-Id: Ifef4fb3fb4b44f72fa41a2f9332d690db928115e
2011-04-04 14:28:49 +10:00
Julian de Bhal 776da98fc7 QtLander: Add simple dropshadow 2011-03-31 16:04:18 +10:00
Daniel Pope 4d56335b4e Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3d 2011-03-31 14:31:31 +10:00
Daniel Pope 93c41cccf4 Another minor symbian change. 2011-03-31 14:31:19 +10:00
Daniel Pope c2e99a9733 A handful more symbian compile fixes. 2011-03-31 14:30:34 +10:00
Daniel Pope fdbf9e9b6e A handful of symbian fixes... that don't fix everything quite yet for Symbian. 2011-03-31 14:27:41 +10:00
Julian de Bhal bed64c1e6b QtLander beta 2011-03-31 14:09:20 +10:00
Sarah Smith ce5d867267 Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/quick3d 2011-03-30 20:00:17 +10:00
Sarah Smith 76dc9230b6 Remove scenegraph / qml2 support.
QML2 will not be available in public packages for a while so no point in
having it in here and causing support headaches.
2011-03-30 19:59:08 +10:00
Sarah Smith 5f351919fd QTBUG-18447 - more fixing of examples.
They all now compile and run at least on MacOSX.  There are some known
issues and these have all been entered as bug reports.

As far as I can tell all required resources are now being found and the
apps are all deploying correctly.  This still needs to be verified on
the other platforms.
2011-03-30 19:55:51 +10:00
Sarah Smith 7ca0562aa8 Compile after refactor of examples/demos. 2011-03-30 12:21:16 +10:00
Sarah Smith b26958d8b7 Monster refactor commit. 2011-03-30 12:08:08 +10:00
Julian de Bhal ccc681ce2e Add-texture-coordinates-to-quad.obj 2011-03-24 11:10:52 +10:00
Sarah Smith 7787f45e81 Remove "generated" to shut up git hooks 2011-03-23 18:35:15 +10:00
Sarah Smith 1829e110f3 Add lunar lander game example 2011-03-23 18:25:30 +10:00
Sarah Smith 01970ef503 Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/quick3d 2011-03-22 16:56:14 +10:00
Sarah Smith 0888631165 Fix image texture loading bug. 2011-03-22 16:45:10 +10:00
Sarah Smith 8bbc1d556d Merge branch 'master' of scm.dev.nokia.troll.no:qt/quick3d
Conflicts:
	src/private/qfactoryloader_p.h
2011-03-19 04:55:23 +10:00
Sarah Smith e2f8a10715 Linux fixes for new repo.
Now builds on linux, albeit with lots of warnings.
2011-03-19 04:53:12 +10:00
Sarah Smith e41b0e16a1 Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/quick3d 2011-03-18 18:17:56 +10:00
Sarah Smith 58a6ec75ee Build under windows.
The cubehouse runs, but still needs work for the declarative stuff.
2011-03-18 18:13:19 +10:00
Sarah Smith 07f61af5db Initial add of debian packaging.
This was from an earlier effort against qt3d master, so will need some
checking/tweaking for the quick3d repo.
2011-03-17 18:11:24 +10:00
Julian de Bhal f07b28922e Capitlization fix for running qmake on linux 2011-03-16 13:33:01 +10:00
Sarah Smith c1e9c29ddb Make quick3d build without private headers.
It compiles and basket runs on MacOSX - almost certainly most other apps
are broken on most other platforms.  Got to start somewhere.
2011-03-15 16:36:36 +10:00
Sarah Smith 24f57d45f1 Update to quick3d product focus.
Mostly doco changes, add new logo.  Switch role of the Qt3D C++ API to
being a way to extend the QML3D bindings.  De-emphasise the portability
and OpenGL aspects of C++ side.  Also remove stereo stuff as far as
possible.
2011-03-10 18:39:38 +10:00
Sarah Smith b87a08f529 Add files ported from research/qt3d
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.
2011-03-09 17:43:07 +10:00