Merge lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests into lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src

[Allan LeSage]

Enable testing: run tests under debian build (using xvfb), skip some failing tests, enable our standard coverage reporting.

[lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests]

37. By Allan LeSage on 2014-01-08

* Add tests to QT_BUILD_PARTS.
* Add dh_override_auto_test to dh_auto_test under xvfb-run.
* Depend on xauth, needed in some configurations.
* Remove enabling coverage reporting (pursuing alternate plan).
* Provide DEP-3 header to patch.

38. By Allan LeSage on 2014-01-14

Correct patch series, removing enable_coverage.patch.

Unmerged revisions

38. By Allan LeSage on 2014-01-14

Correct patch series, removing enable_coverage.patch.

37. By Allan LeSage on 2014-01-08

* Add tests to QT_BUILD_PARTS.
* Add dh_override_auto_test to dh_auto_test under xvfb-run.
* Depend on xauth, needed in some configurations.
* Remove enabling coverage reporting (pursuing alternate plan).
* Provide DEP-3 header to patch.

36. By Allan LeSage on 2013-12-20

Add make check to debian build; enable coverage reporting.

35. By Timo Jyrinki on 2013-12-18

* Rebuild against Qt 5.2.0, bump dependencies
* Use QT_SELECT instead of depending on qt5-default
* Add syncqt_create_headers.patch to fix build against 5.2.0

34. By Didier Roche-Tolomelli on 2013-08-13

releasing version 5.0~git20130731-0ubuntu1

33. By Timo Jyrinki on 2013-08-02

* New upstream snapshot release
* Drop patches:
  - add_GPL_license_file.patch, merged upstream
  - add_module_version.patch, added upstream
  - disable_conflicting_examples.patch, not needed anymore
* Refresh link_against_system_zlib.patch
* Add bug link to workaround_zlib_linking_issue.patch

32. By Timo Jyrinki on 2013-07-09

Improve override_dh_auto_install, use --fail-missing

31. By Timo Jyrinki on 2013-07-09

Improve override_dh_auto_install, use --fail-missing

30. By Timo Jyrinki on 2013-07-09

Run wrap-and-sort -a -t

29. By Didier Roche-Tolomelli on 2013-06-21

releasing version 5.0~git20130109-0ubuntu3

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2013-12-20 21:54:23 +0000
@@ -0,0 +1,56 @@
+qt3d-opensource-src (5.0~git20130731-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Timo Jyrinki ]
+  * Rebuild against Qt 5.2.0, bump dependencies
+  * Use QT_SELECT instead of depending on qt5-default
+  * Add syncqt_create_headers.patch to fix build against 5.2.0
+
+  [ Allan LeSage ]
+  * Depend on xvfb for existing tests requiring a display.
+  * Add dh_override_auto_test to make check under xvfb-run.
+  * debian/patches/skip_failing_tests.patch
+    - Skip some failing tests pending investigation.
+  * debian/patches/enable_coverage_reporting.patch
+    - Enable standard coverage reporting for Jenkins consumption.
+
+ -- Timo Jyrinki <[e-mail]>  Tue, 17 Dec 2013 10:54:56 +0000
+
+qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low
+
+  * New upstream snapshot release
+  * Improve override_dh_auto_install, use --fail-missing
+  * Drop patches:
+    - add_GPL_license_file.patch, merged upstream
+    - add_module_version.patch, added upstream
+    - disable_conflicting_examples.patch, not needed anymore
+  * Refresh link_against_system_zlib.patch
+  * Add bug link to workaround_zlib_linking_issue.patch
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 02 Aug 2013 11:10:16 +0300
+
+qt3d-opensource-src (5.0~git20130109-0ubuntu3) saucy; urgency=low
+
+  * debian/patches/add_module_version.patch:
+    - Add a module version to fix FTBFS
+
+ -- Didier Roche <[e-mail]>  Fri, 21 Jun 2013 17:59:14 +0200
+
+qt3d-opensource-src (5.0~git20130109-0ubuntu2) raring; urgency=low
+
+  [ Timo Jyrinki ]
+  * Fix pkgconfig Libs.private path (LP: #1125156)
+  * debian/patches/workaround_zlib_linking_issue.patch:
+    - Fix FTBFS
+
+  [ Didier Roche ]
+  * Fixed some small copyright issues
+
+ -- Didier Roche <[e-mail]>  Fri, 15 Feb 2013 12:52:28 +0100
+
+qt3d-opensource-src (5.0~git20130109-0ubuntu1) raring; urgency=low
+
+  * Initial release
+  * Cherry-pick from upstream:
+    - add_license_files.patch
+
+ -- Timo Jyrinki <[e-mail]>  Tue, 22 Jan 2013 14:32:08 +0200

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2013-12-20 21:54:23 +0000
@@ -0,0 +1,115 @@
+Source: qt3d-opensource-src
+Section: libs
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 9.0.0),
+               libqt5opengl5-dev,
+               pkg-kde-tools,
+               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               qtdeclarative5-private-dev (>= 5.2.0~),
+               xvfb,
+               zlib1g-dev,
+Standards-Version: 3.9.3
+Homepage: http://qt-project.org/
+
+Package: libqt53d5
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 3D module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains Qt 3D module.
+ .
+ WARNING: This module is not an official part of Qt 5, but instead a git
+ snapshot of an ongoing development. The package is very likely to
+ change in a binary incompatible way, and no guarantees are given.
+
+Package: qtdeclarative5-qt3d-plugin
+Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 5 3D QML plugin
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the Qt 3D QML plugin.
+ .
+ WARNING: This module is not an official part of Qt 5, but instead a git
+ snapshot of an ongoing development. The package is very likely to
+ change in a binary incompatible way, and no guarantees are given.
+
+Package: qt3d5-dev
+Section: libdevel
+Architecture: any
+Depends: libqt53d5 (= ${binary:Version}),
+         qtbase5-dev,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 5 3d development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the header development files used for building Qt 5
+ applications using Qt 3D library.
+ .
+ WARNING: This module is not an official part of Qt 5, but instead a git
+ snapshot of an ongoing development. The package is very likely to
+ change in a binary incompatible way, and no guarantees are given.
+
+Package: qt3d5-private-dev
+Architecture: any
+Section: libdevel
+Depends: qt3d5-dev (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 5 3d private development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the private header development files for building some
+ Qt 5 applications using 3D private headers.
+ .
+ Use at your own risk.
+ .
+ WARNING: This module is not an official part of Qt 5, but instead a git
+ snapshot of an ongoing development. The package is very likely to
+ change in a binary incompatible way, and no guarantees are given.
+
+Package: qt3d5-examples
+Architecture: any
+Multi-Arch: same
+Section: x11
+Pre-Depends: dpkg (>= 1.15.6~),
+             ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Qt 5 3d examples
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains Qt 5 3D examples.
+ .
+ WARNING: This module is not an official part of Qt 5, but instead a git
+ snapshot of an ongoing development. The package is very likely to
+ change in a binary incompatible way, and no guarantees are given.
+
+Package: qt3d5-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: libqt53d5 (= ${binary:Version}),
+         qt3d5-examples (= ${binary:Version}),
+         ${misc:Depends},
+Description: Qt 3D library debugging symbols
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the debugging symbols for the Qt 5 3D
+ libraries.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2013-12-20 21:54:23 +0000
@@ -0,0 +1,367 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: qt3d
+Source: http://qt.gitorious.org/qt/qt3d
+
+Files: *
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: debian/*
+Copyright: 2007-2012 Fathi Boudra <[e-mail]>
+           2007-2012 Sune Vuorela <[e-mail]>
+           2008-2012 Modestas Vainius <[e-mail]>
+           2007-2009 Ana Beatriz Guerrero Lopez <[e-mail]>
+           2005-2007 Brian Nelson <[e-mail]>
+           2012 Timo Jyrinki <[e-mail]>
+License: LGPL-2.1
+
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
+ GNU Lesser General Public License version 2.1:
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 2.1 as published by the Free Software Foundation and
+ appearing in the file LICENSE.LGPL included in the packaging of this
+ file. Please review the following information to ensure the GNU Lesser
+ General Public License version 2.1 requirements will be met:
+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ In addition, as a special exception, Digia gives you certain additional
+ rights. These rights are described in the Digia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ .
+ Digia Qt LGPL Exception version 1.1:
+ As an additional permission to the GNU Lesser General Public License version
+ 2.1, the object code form of a "work that uses the Library" may incorporate
+ material from a header file that is part of the Library.  You may distribute
+ such object code under terms of your choice, provided that:
+     (i)   the header files of the Library have not been modified; and
+     (ii)  the incorporated material is limited to numerical parameters, data
+           structure layouts, accessors, macros, inline functions and
+           templates; and
+     (iii) you comply with the terms of Section 6 of the GNU Lesser General
+           Public License version 2.1.
+ .
+ Moreover, you may apply this exception to a modified version of the Library,
+ provided that such modification does not involve copying material from the
+ Library into the modified Library's header files unless such material is
+ limited to (i) numerical parameters; (ii) data structure layouts;
+ (iii) accessors; and (iv) small macros, templates and inline functions of
+ five lines or less in length.
+ .
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.
+
+Files: tests/auto/cmake/test_modules/main.cpp
+Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+License: GPL-3
+ GNU General Public License Usage
+ .
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ .
+ On Debian systems, the complete text of the license can be found in
+ `/usr/share/common-licenses/GPL-3`.
+
+License: LGPL-2.1
+ This file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ .
+ On Debian systems, the complete text of the LGPL-2.1 license can be found in
+ `/usr/share/common-licenses/LGPL-2.1`,
+
+Files: 3rdparty/assimp/*
+Copyright: 2006-2010, ASSIMP Development Team
+License: BSD-3-clause
+
+Files: examples/* src/quick3d/qmlres.cpp src/quick3d/qmlres.h src/imports/threed/DefaultNavigator.qml tests/manual/qrc/qml/tst_qrc.qml tests/manual/transformations/qml/desktop.qml tests/manual/shapes/qml/desktop.qml tests/manual/scaling/qml/desktop.qml tests/manual/submesh/qml/desktop.qml tests/manual/navigation1/qml/desktop.qml tests/manual/basic/qml/desktop.qml tests/manual/model3ds/qml/desktop.qml tests/manual/translation/qml/desktop.qml tests/manual/background/qml/desktop.qml tests/manual/rotation/qml/desktop.qml tests/manual/fullreferencing/qml/desktop.qml tests/manual/displaymodel/qml/desktop.qml tests/manual/animations/qml/desktop.qml tutorials/quick3d/teapot_qml/qml/desktop.qml tutorials/quick3d/teapot_qml/qml/Teapot.qml tutorials/quick3d/shadertut/main.cpp tutorials/quick3d/shadertut/qml/TutorialTeapot.qml tutorials/quick3d/shadertut/qml/shader-tutorial.qml tutorials/quick3d/shadertut/qml/desktop.qml tutorials/quick3d/teapot_bounce_qml/qml/TeapotBounce.qml tutorials/quick3d/teapot_bounce_qml/qml/desktop.qml tutorials/qt3d/penguin_advanced/modelview.h tutorials/qt3d/penguin_advanced/main.cpp tutorials/qt3d/penguin_advanced/modelview.cpp tutorials/qt3d/cube2/main.cpp tutorials/qt3d/cube2/cubeview.h tutorials/qt3d/cube2/cubeview.cpp tutorials/qt3d/cube4/main.cpp tutorials/qt3d/cube4/cube.qml tutorials/qt3d/cube4/cubeview.h tutorials/qt3d/cube4/cubeview.cpp tutorials/qt3d/penguin/modelview.h tutorials/qt3d/penguin/main.cpp tutorials/qt3d/penguin/modelview.cpp tutorials/qt3d/cube1/main.cpp tutorials/qt3d/cube1/cubeview.h tutorials/qt3d/cube1/cubeview.cpp tutorials/qt3d/cube3/main.cpp tutorials/qt3d/cube3/cubeview.h tutorials/qt3d/cube3/cubeview.cpp
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
+License: BSD-3-clause
+
+License: BSD-3-clause
+ You may use this file under the terms of the BSD license as follows:
+ .
+ "Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the
+     distribution.
+   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+     of its contributors may be used to endorse or promote products derived
+     from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+
+Files: 3rdparty/assimp/contrib/ConvertUTF/*
+Copyright: 2001-2004 Unicode, Inc.
+License:
+ Disclaimer
+ .
+ This source code is provided as is by Unicode, Inc. No claims are
+ made as to fitness for any particular purpose. No warranties of any
+ kind are expressed or implied. The recipient agrees to determine
+ applicability of information provided. If this file has been
+ purchased on magnetic or optical media from Unicode, Inc., the
+ sole remedy for any claim will be exchange of defective media
+ within 90 days of receipt.
+ .
+ Limitations on Rights to Redistribute This Code
+ .
+ Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form
+ for internal or external distribution as long as this notice
+ remains attached.
+
+Files: 3rdparty/assimp/contrib/zlib/*
+Copyright: 1995-2010 Jean-loup Gailly
+           1995-2010 Mark Adler
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: 3rdparty/assimp/contrib/unzip/*
+Copyright: 1998-2005 Gilles Vollant
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: 3rdparty/assimp/contrib/unzip/unzip.c
+Copyright: 1990-2000 Info-ZIP
+License: Info-ZIP license
+ See the accompanying file LICENSE, version 2000-Apr-09 or later
+ (the contents of which are also included in zip.h) for terms of use.
+ If, for some reason, all these files are missing, the Info-ZIP license
+ also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+
+Files: 3rdparty/assimp/contrib/irrXML/*
+Copyright: 2002-2005 Nikolaus Gebhardt
+License: irrXML license
+
+License: irrXML license
+ The irrXML license is based on the zlib license. Basicly, this means you can do with irrXML whatever you want:
+ .
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source distribution.
+
+Files: 3rdparty/assimp/code/BoostWorkaround/*
+Copyright: 1994-1999 Beman Dawes
+License: Boost Software License 1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: fast_atof.h
+Copyright: 2002-2007 Nikolaus Gebhardt
+License: irrXML license
+
+Files: doc/config/scripts/superfish.js
+Copyright: 2008 Joel Birch
+License: MIT
+
+Files: doc/config/scripts/jquery.js
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject
+ to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+Files: 3rdparty/assimp/code/MDCNormalTable.h doc/src/legal/snippets/pico-model.txt
+Copyright: 2002 Randy Reddig & seaw0lf
+License: Custom BSD like
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice, this list
+ of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+ .
+ Neither the names of the copyright holders nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: 3rdparty/assimp/code/pstdint.h doc/src/legal/snippets/pstdint.txt
+Copyright: 2005-2007 Paul Hsieh
+License: BSD-3-clause
+
+Files: 3rdparty/assimp/code/BoostWorkaround/boost/foreach.hpp
+Copyright: 2004 Eric Niebler
+License: BSL
+
+Files: 3rdparty/assimp/code/BoostWorkaround/boost/timer.hpp
+Copyright: 1994-1999 Beman Dawes
+License: BSL
+
+Files: 3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
+Copyright: 2008 Alexander Gessler
+License: BSL
+
+Files: 3rdparty/assimp/code/BoostWorkaround/boost/pointer_cast.hpp
+Copyright: 2005 Ion Gaztanaga
+License: BSL
+
+License: BSL
+ Distributed under the Boost Software License, Version 1.0. (See
+ accompanying file LICENSE_1_0.txt or copy at
+ http://www.boost.org/LICENSE_1_0.txt)
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+Files: *.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License: GFDL-1.3
+
+License: GFDL-1.3
+ GNU Free Documentation License Usage
+ Alternatively, this file may be used under the terms of the GNU Free
+ Documentation License version 1.3 as published by the Free Software
+ Foundation and appearing in the file included in the packaging of
+ this file.  Please review the following information to ensure
+ the GNU Free Documentation License version 1.3 requirements
+ will be met: http://www.gnu.org/copyleft/fdl.html.
+ .
+ On Debian systems, the complete text of the GFDL-1.3 license can be found in
+ `/usr/share/common-licenses/GFDL-1.3`,
+
+Files: src/quick3d/cube.qdoc src/quick3d/quad.qdoc src/quick3d/teapot.qdoc
+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
+License:  LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3

=== added file 'debian/libqt53d5.install'
--- debian/libqt53d5.install	1970-01-01 00:00:00 +0000
+++ debian/libqt53d5.install	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/*.so.*

=== added file 'debian/not-installed'
--- debian/not-installed	1970-01-01 00:00:00 +0000
+++ debian/not-installed	2013-12-20 21:54:23 +0000
@@ -0,0 +1,39 @@
+usr/lib/x86_64-linux-gnu/libQt53D.la
+usr/lib/*/qt5/bin/qglinfo
+usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
+usr/lib/*/qt5/qml/Qt3D/qmldir
+usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
+usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
+usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
+usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
+usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
+usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
+usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
+usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
+usr/include/qt5/Qt3DQuick/cylindermesh.h
+usr/include/qt5/Qt3DQuick/qquickeffect.h
+usr/include/qt5/Qt3DQuick/line.h
+usr/include/qt5/Qt3DQuick/qquickmesh.h
+usr/include/qt5/Qt3DQuick/spheremesh.h
+usr/include/qt5/Qt3DQuick/capsulemesh.h
+usr/include/qt5/Qt3DQuick/qquickitem3d.h
+usr/include/qt5/Qt3DQuick/Qt3DQuick
+usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
+usr/include/qt5/Qt3DQuick/QQuickAnimation3D
+usr/include/qt5/Qt3DQuick/QQuickMesh
+usr/include/qt5/Qt3DQuick/QQuickViewport
+usr/include/qt5/Qt3DQuick/qquickanimation3d.h
+usr/include/qt5/Qt3DQuick/cube.h
+usr/include/qt5/Qt3DQuick/qquickviewport.h
+usr/include/qt5/Qt3DQuick/point.h
+usr/include/qt5/Qt3DQuick/QQuickItem3D
+usr/include/qt5/Qt3DQuick/qmlres.h
+usr/include/qt5/Qt3DQuick/teapot.h
+usr/include/qt5/Qt3DQuick/QQuickEffect
+usr/include/qt5/Qt3DQuick/qt3dquickversion.h
+

=== added directory 'debian/patches'
=== added file 'debian/patches/enable_coverage_reporting.patch'
--- debian/patches/enable_coverage_reporting.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/enable_coverage_reporting.patch	2013-12-20 21:54:23 +0000
@@ -0,0 +1,79 @@
+--- a/src/imports/threed/threed.pro
++++ b/src/imports/threed/threed.pro
+@@ -1,3 +1,5 @@
++include(../../../coverage.pri)
++
+ CXX_MODULE = 3d
+ TARGET  = qthreedqmlplugin
+ 
+--- a/src/quick3d/quick3d.pro
++++ b/src/quick3d/quick3d.pro
+@@ -1,3 +1,5 @@
++include(../../coverage.pri)
++
+ TARGET     = Qt3DQuick
+ MODULE     = 3dquick
+ QT         = core gui qml quick 3d
+--- a/src/threed/threed.pro
++++ b/src/threed/threed.pro
+@@ -1,3 +1,5 @@
++include(../../coverage.pri)
++
+ TARGET     = Qt3D
+ MODULE     = 3d
+ QT         = core-private gui-private opengl
+--- /dev/null
++++ b/coverage.pri
+@@ -0,0 +1,44 @@
++# Coverage
++CONFIG(coverage) {
++    LIBS += -lgcov
++    QMAKE_CXXFLAGS += --coverage
++    QMAKE_LDFLAGS += --coverage
++
++    QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
++        generate-coverage-html clean-coverage-html coverage-gcovr \
++        generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
++
++    clean-gcno.commands = \
++        "@echo Removing old coverage instrumentation"; \
++        "find -name '*.gcno' -print | xargs -r rm"
++
++    clean-gcda.commands = \
++        "@echo Removing old coverage results"; \
++        "find -name '*.gcda' -print | xargs -r rm"
++
++    coverage-html.depends = clean-gcda check generate-coverage-html
++
++    generate-coverage-html.commands = \
++        "@echo Collecting coverage data"; \
++        "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
++        "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
++        "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
++        "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
++
++    clean-coverage-html.depends = clean-gcda
++    clean-coverage-html.commands = \
++        "lcov --directory $${TOP_SRC_DIR} -z"; \
++        "rm -rf coverage.info coverage-html"
++
++    coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
++
++    generate-coverage-gcovr.commands = \
++        "@echo Generating coverage GCOVR report"; \
++        "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
++
++    clean-coverage-gcovr.depends = clean-gcda
++    clean-coverage-gcovr.commands = \
++        "rm -rf $${TOP_SRC_DIR}/coverage.xml"
++
++    QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
++}
+--- a/qt3d.pro
++++ b/qt3d.pro
+@@ -1,3 +1,5 @@
++include(coverage.pri)
++
+ requires(qtHaveModule(opengl))
+ 
+ load(qt_parts)

=== added file 'debian/patches/link_against_system_zlib.patch'
--- debian/patches/link_against_system_zlib.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/link_against_system_zlib.patch	2013-12-20 21:54:23 +0000
@@ -0,0 +1,111 @@
+diff --git a/3rdparty/assimp/assimp.pri b/3rdparty/assimp/assimp.pri
+index a3810b3..ec8d724 100644
+--- a/3rdparty/assimp/assimp.pri
++++ b/3rdparty/assimp/assimp.pri
+@@ -5,6 +5,8 @@
+ CONFIG(debug, debug|release) : DEFINES+=_DEBUG
+ CONFIG += exceptions
+ 
++DEFINES+=ASSIMP_BUILD_NO_OWN_ZLIB
++
+ win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
+ 
+ VPATH += \
+@@ -22,7 +24,6 @@ INCLUDEPATH += \
+         $$PWD/include \
+         $$PWD/include/Compiler \
+         $$PWD/contrib/ConvertUTF \
+-        $$PWD/contrib/zlib \
+         $$PWD/contrib/irrXML \
+         $$PWD/contrib/unzip
+ 
+@@ -203,17 +204,6 @@ HEADERS += \
+         contrib/unzip/crypt.h \
+         contrib/unzip/ioapi.h \
+         contrib/unzip/unzip.h \
+-        contrib/zlib/crc32.h \
+-        contrib/zlib/deflate.h \
+-        contrib/zlib/inffast.h \
+-        contrib/zlib/inffixed.h \
+-        contrib/zlib/inflate.h \
+-        contrib/zlib/inftrees.h \
+-        contrib/zlib/trees.h \
+-        contrib/zlib/zconf.h \
+-        contrib/zlib/zconf.in.h \
+-        contrib/zlib/zlib.h \
+-        contrib/zlib/zutil.h \
+         include/Compiler/poppack1.h \
+         include/Compiler/pushpack1.h \
+         code/BoostWorkaround/boost/foreach.hpp \
+@@ -337,13 +327,4 @@ SOURCES += \
+         contrib/ConvertUTF/ConvertUTF.c \
+         contrib/irrXML/irrXML.cpp \
+         contrib/unzip/ioapi.c \
+-        contrib/unzip/unzip.c \
+-        contrib/zlib/adler32.c \
+-        contrib/zlib/compress.c \
+-        contrib/zlib/crc32.c \
+-        contrib/zlib/deflate.c \
+-        contrib/zlib/inffast.c \
+-        contrib/zlib/inflate.c \
+-        contrib/zlib/inftrees.c \
+-        contrib/zlib/trees.c \
+-        contrib/zlib/zutil.c
++        contrib/unzip/unzip.c
+diff --git a/3rdparty/assimp/code/makefile b/3rdparty/assimp/code/makefile
+index 5710158..486300d 100644
+--- a/3rdparty/assimp/code/makefile
++++ b/3rdparty/assimp/code/makefile
+@@ -24,7 +24,7 @@ OBJECTS   += $(patsubst %.cpp,%.o,  $(wildcard extra/*.cpp))
+ OBJECTS   += $(patsubst %.cpp,%.o,  $(wildcard ./../contrib/irrXML/*.cpp))
+ 
+ # C object files
+-OBJECTSC  := $(patsubst %.c,%.oc,   $(wildcard ./../contrib/zlib/*.c))
++#OBJECTSC  := $(patsubst %.c,%.oc,   $(wildcard ./../contrib/zlib/*.c))
+ OBJECTSC  += $(patsubst %.c,%.oc,   $(wildcard ./../contrib/ConvertUTF/*.c))
+ OBJECTSC  += $(patsubst %.c,%.oc,   $(wildcard ./../contrib/unzip/*.c))
+ 
+@@ -47,6 +47,8 @@ INCPATH = ../include
+ # GCC compiler flags
+ CPPFLAGS=-Wall
+ 
++DEFINEFLAGS+=ASSIMP_BUILD_NO_OWN_ZLIB
++
+ # Setup environment for noboost build
+ ifeq ($(NOBOOST),1)
+     SINGLETHREADED = 1
+@@ -85,7 +87,7 @@ STATIC = $(BINPATH)/libassimp$(NAMESUFFIX).a
+ all: $(SHARED_TARGET)
+ 
+ $(SHARED_TARGET):  $(OBJECTS)  $(OBJECTSC)
+-    gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++
++    gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++ -lz
+ %.o:%.cpp
+     $(CXX) -g -c  $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) -fPIC
+ %.oc:%.c
+diff --git a/qt3d.pro b/qt3d.pro
+index 541d46d..d4d95c9 100644
+--- a/qt3d.pro
++++ b/qt3d.pro
+@@ -7,6 +7,8 @@ module_qt3d_tutorials.CONFIG = no_default_target no_default_install
+ 
+ !package: SUBDIRS += module_qt3d_tutorials
+ 
++LIBS += -lz
++
+ gcov: SUBDIRS -= sub_tools
+ 
+ # We need opengl, minimum es2
+diff --git a/src/threed/threed.pro b/src/threed/threed.pro
+index 793c160..fd992ca 100644
+--- a/src/threed/threed.pro
++++ b/src/threed/threed.pro
+@@ -7,6 +7,8 @@ load(qt_module)
+ 
+ QMAKE_DOCS = $$PWD/doc/qt3d.qdocconf
+ 
++QMAKE_LFLAGS += -lz
++
+ gcov {
+     CONFIG += static
+     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-12-20 21:54:23 +0000
@@ -0,0 +1,5 @@
+link_against_system_zlib.patch
+workaround_zlib_linking_issue.patch
+syncqt_create_headers.patch
+skip_failing_tests.patch
+enable_coverage_reporting.patch

=== added file 'debian/patches/skip_failing_tests.patch'
--- debian/patches/skip_failing_tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip_failing_tests.patch	2013-12-20 21:54:23 +0000
@@ -0,0 +1,41 @@
+--- a/tests/auto/threed/threed.pro
++++ b/tests/auto/threed/threed.pro
+@@ -5,7 +5,8 @@
+     qbox3d \
+     qcolor4ub \
+     qcustomdataarray \
+-    qgeometrydata \
++    # skip a failing test
++    #qgeometrydata \
+     qglabstractsurface \
+     qglattributedescription \
+     qglattributeset \
+@@ -26,7 +27,8 @@
+     qglscenenode \
+     qglsection \
+     qglsphere \
+-    qglvertexbundle \
++    # skip a failing test
++    #qglvertexbundle \
+     qgraphicstransform3d \
+     qplane3d \
+     qray3d \
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -3,9 +3,10 @@
+           cmake
+ 
+ qtHaveModule(qml): SUBDIRS += imports
+-qtHaveModule(qmltest) {
+-    SUBDIRS += qml3d
+-
+-    !win32 : SUBDIRS += qml3d_visual \
+-                        qml3d_cpp
+-}
++# skip these failing tests
++#qtHaveModule(qmltest) {
++#    SUBDIRS += qml3d
++#
++#    !win32 : SUBDIRS += qml3d_visual \
++#                        qml3d_cpp
++#}

=== added file 'debian/patches/syncqt_create_headers.patch'
--- debian/patches/syncqt_create_headers.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/syncqt_create_headers.patch	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1137 @@
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene_ai/ailoaderiostream_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene_ai/ailoaderiosystem_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h new/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene_ai/qailoader_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene_ai/qaimesh_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene_ai/qaiscenehandler_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene_ai/qaiscene_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/painting/qglabstracteffect_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/geometry/qglbuilder_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/effects/qglcolladafxeffect_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/surfaces/qglcontextsurface_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/surfaces/qgldrawbuffersurface_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/painting/qglext_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/effects/qglflatcoloreffect_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/effects/qglflattextureeffect_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/effects/qgllitmaterialeffect_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/effects/qgllittextureeffect_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/surfaces/qglmaskedsurface_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/materials/qglmaterial_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/viewing/qglmockview_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/painting/qglpainter_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/surfaces/qglpaintersurface_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/painting/qglpickcolors_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/scene/qglscenenode_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/geometry/qglsection_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/geometry/qglteapot_data_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/textures/qgltexture2d_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/textures/qgltextureutils_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/arrays/qglvertexbundle_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h new/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/painting/qmatrix4x4stack_p.h"
+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h new/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h
+--- old/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../../../../src/threed/geometry/qvector_utils_p.h"
+diff -urN old/include/Qt3D/headers.pri new/include/Qt3D/headers.pri
+--- old/include/Qt3D/headers.pri	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/headers.pri	2013-12-17 16:35:20.787962383 +0000
+@@ -0,0 +1,4 @@
++SYNCQT.HEADER_FILES = arrays/qarray.h arrays/qcolor4ub.h arrays/qcustomdataarray.h arrays/qglattributedescription.h arrays/qglattributeset.h arrays/qglattributevalue.h arrays/qglindexbuffer.h arrays/qglvertexbundle.h arrays/qvector2darray.h arrays/qvector3darray.h arrays/qvector4darray.h effects/qglcolladafxeffect.h effects/qglcolladafxeffectfactory.h effects/qglcolladafxeffectloader.h effects/qglshaderprogrameffect.h geometry/qgeometrydata.h geometry/qglbezierpatches.h geometry/qglbuilder.h geometry/qglcube.h geometry/qglcylinder.h geometry/qgldome.h geometry/qglmaterialcollection.h geometry/qglsphere.h geometry/qglteapot.h geometry/qlogicalvertex.h global/qglnamespace.h global/qt3dglobal.h graphicsview/qgraphicsbillboardtransform.h graphicsview/qgraphicsrotation3d.h graphicsview/qgraphicsscale3d.h graphicsview/qgraphicstransform3d.h graphicsview/qgraphicstranslation3d.h materials/qglabstractmaterial.h materials/qglcolormaterial.h materials/qglmaterial.h materials/qgltwosidedmaterial.h math3d/qbox3d.h math3d/qplane3d.h math3d/qray3d.h math3d/qsphere3d.h math3d/qtriangle3d.h network/qdownloadmanager.h painting/qglabstracteffect.h painting/qgllightmodel.h painting/qgllightparameters.h painting/qglpainter.h painting/qmatrix4x4stack.h scene/qglabstractscene.h scene/qglpicknode.h scene/qglrenderorder.h scene/qglrenderordercomparator.h scene/qglrendersequencer.h scene/qglrenderstate.h scene/qglsceneanimation.h scene/qglsceneformatplugin.h scene/qglscenenode.h scene_bezier/qglbezierscene.h scene_bezier/qglbezierscenehandler.h surfaces/qglabstractsurface.h surfaces/qglframebufferobjectsurface.h surfaces/qglpixelbuffersurface.h surfaces/qglsubsurface.h surfaces/qglwindowsurface.h textures/qareaallocator.h textures/qgltexture2d.h textures/qgltexturecube.h viewing/qglcamera.h viewing/qglcameraanimation.h viewing/qglmockview.h viewing/qglview.h ../../include/Qt3D/qt3dversion.h ../../include/Qt3D/Qt3D 
++SYNCQT.HEADER_CLASSES = ../../include/Qt3D/QArrayAlignedChar ../../include/Qt3D/QArrayAlignedPrealloc ../../include/Qt3D/QtArrayData ../../include/Qt3D/QArray ../../include/Qt3D/QColor4ub ../../include/Qt3D/QCustomDataArray ../../include/Qt3D/QGLAttributeDescription ../../include/Qt3D/QGLAttributeSet ../../include/Qt3D/QGLAttributeValue ../../include/Qt3D/QGLIndexBuffer ../../include/Qt3D/QGLVertexBundle ../../include/Qt3D/QVector2DArray ../../include/Qt3D/QVector3DArray ../../include/Qt3D/QVector4DArray ../../include/Qt3D/QGLColladaFxEffect ../../include/Qt3D/QGLColladaFxEffectFactory ../../include/Qt3D/QGLColladaParam ../../include/Qt3D/QGLColladaTextureParam ../../include/Qt3D/QGLColladaSurfaceParam ../../include/Qt3D/QGLColladaSampler2DParam ../../include/Qt3D/QGLColladaImageParam ../../include/Qt3D/QGLColladaFxEffectLoader ../../include/Qt3D/QGLShaderProgramEffect ../../include/Qt3D/QGeometryData ../../include/Qt3D/QGLBezierPatches ../../include/Qt3D/QGLBuilder ../../include/Qt3D/QGLCube ../../include/Qt3D/QGLCylinder ../../include/Qt3D/QGLDome ../../include/Qt3D/QGLMaterialCollection ../../include/Qt3D/QGLSphere ../../include/Qt3D/QGLTeapot ../../include/Qt3D/QLogicalVertex ../../include/Qt3D/QGraphicsBillboardTransform ../../include/Qt3D/QGraphicsRotation3D ../../include/Qt3D/QGraphicsScale3D ../../include/Qt3D/QQuickQGraphicsTransform3D ../../include/Qt3D/QGraphicsTranslation3D ../../include/Qt3D/QGLAbstractMaterial ../../include/Qt3D/QGLColorMaterial ../../include/Qt3D/QGLMaterial ../../include/Qt3D/QGLTwoSidedMaterial ../../include/Qt3D/QBox3D ../../include/Qt3D/QPlane3D ../../include/Qt3D/QRay3D ../../include/Qt3D/QSphere3D ../../include/Qt3D/QTriangle3D ../../include/Qt3D/QDownloadManager ../../include/Qt3D/QGLAbstractEffect ../../include/Qt3D/QGLLightModel ../../include/Qt3D/QGLLightParameters ../../include/Qt3D/QGLPainter ../../include/Qt3D/QMatrix4x4Stack ../../include/Qt3D/QGLAbstractScene ../../include/Qt3D/QGLPickNode ../../include/Qt3D/QGLRenderOrder ../../include/Qt3D/QGLRenderOrderComparator ../../include/Qt3D/QGLRenderSequencer ../../include/Qt3D/QGLRenderState ../../include/Qt3D/QGLSceneAnimation ../../include/Qt3D/QGLSceneFormatHandler ../../include/Qt3D/QGLSceneFormatFactoryInterface ../../include/Qt3D/QGLSceneNode ../../include/Qt3D/QGLBezierScene ../../include/Qt3D/QGLBezierSceneHandler ../../include/Qt3D/QGLAbstractSurface ../../include/Qt3D/QGLFramebufferObjectSurface ../../include/Qt3D/QGLPixelBufferSurface ../../include/Qt3D/QGLSubsurface ../../include/Qt3D/QGLWindowSurface ../../include/Qt3D/QAreaAllocator ../../include/Qt3D/QSimpleAreaAllocator ../../include/Qt3D/QGeneralAreaAllocator ../../include/Qt3D/QUniformAreaAllocator ../../include/Qt3D/QGLTexture2D ../../include/Qt3D/QGLTextureCube ../../include/Qt3D/QGLCamera ../../include/Qt3D/QGLCameraAnimation ../../include/Qt3D/QGLMockView ../../include/Qt3D/QGLView ../../include/Qt3D/Qt3DVersion 
++SYNCQT.PRIVATE_HEADER_FILES = arrays/qglvertexbundle_p.h effects/qglcolladafxeffect_p.h effects/qglflatcoloreffect_p.h effects/qglflattextureeffect_p.h effects/qgllitmaterialeffect_p.h effects/qgllittextureeffect_p.h geometry/qglbuilder_p.h geometry/qglsection_p.h geometry/qglteapot_data_p.h geometry/qvector_utils_p.h materials/qglmaterial_p.h painting/qglabstracteffect_p.h painting/qglext_p.h painting/qglpainter_p.h painting/qglpickcolors_p.h painting/qmatrix4x4stack_p.h scene/qglscenenode_p.h scene_ai/ailoaderiostream_p.h scene_ai/ailoaderiosystem_p.h scene_ai/qailoader_p.h scene_ai/qaimesh_p.h scene_ai/qaiscene_p.h scene_ai/qaiscenehandler_p.h surfaces/qglcontextsurface_p.h surfaces/qgldrawbuffersurface_p.h surfaces/qglmaskedsurface_p.h surfaces/qglpaintersurface_p.h textures/qgltexture2d_p.h textures/qgltextureutils_p.h viewing/qglmockview_p.h 
++SYNCQT.QPA_HEADER_FILES = 
+diff -urN old/include/Qt3D/QAreaAllocator new/include/Qt3D/QAreaAllocator
+--- old/include/Qt3D/QAreaAllocator	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QAreaAllocator	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qareaallocator.h"
+diff -urN old/include/Qt3D/qareaallocator.h new/include/Qt3D/qareaallocator.h
+--- old/include/Qt3D/qareaallocator.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qareaallocator.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/textures/qareaallocator.h"
+diff -urN old/include/Qt3D/QArray new/include/Qt3D/QArray
+--- old/include/Qt3D/QArray	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QArray	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qarray.h"
+diff -urN old/include/Qt3D/QArrayAlignedChar new/include/Qt3D/QArrayAlignedChar
+--- old/include/Qt3D/QArrayAlignedChar	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QArrayAlignedChar	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qarray.h"
+diff -urN old/include/Qt3D/QArrayAlignedPrealloc new/include/Qt3D/QArrayAlignedPrealloc
+--- old/include/Qt3D/QArrayAlignedPrealloc	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QArrayAlignedPrealloc	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qarray.h"
+diff -urN old/include/Qt3D/qarray.h new/include/Qt3D/qarray.h
+--- old/include/Qt3D/qarray.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qarray.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qarray.h"
+diff -urN old/include/Qt3D/QBox3D new/include/Qt3D/QBox3D
+--- old/include/Qt3D/QBox3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QBox3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qbox3d.h"
+diff -urN old/include/Qt3D/qbox3d.h new/include/Qt3D/qbox3d.h
+--- old/include/Qt3D/qbox3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qbox3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/math3d/qbox3d.h"
+diff -urN old/include/Qt3D/QColor4ub new/include/Qt3D/QColor4ub
+--- old/include/Qt3D/QColor4ub	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QColor4ub	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qcolor4ub.h"
+diff -urN old/include/Qt3D/qcolor4ub.h new/include/Qt3D/qcolor4ub.h
+--- old/include/Qt3D/qcolor4ub.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qcolor4ub.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qcolor4ub.h"
+diff -urN old/include/Qt3D/QCustomDataArray new/include/Qt3D/QCustomDataArray
+--- old/include/Qt3D/QCustomDataArray	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QCustomDataArray	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qcustomdataarray.h"
+diff -urN old/include/Qt3D/qcustomdataarray.h new/include/Qt3D/qcustomdataarray.h
+--- old/include/Qt3D/qcustomdataarray.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qcustomdataarray.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qcustomdataarray.h"
+diff -urN old/include/Qt3D/QDownloadManager new/include/Qt3D/QDownloadManager
+--- old/include/Qt3D/QDownloadManager	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QDownloadManager	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qdownloadmanager.h"
+diff -urN old/include/Qt3D/qdownloadmanager.h new/include/Qt3D/qdownloadmanager.h
+--- old/include/Qt3D/qdownloadmanager.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qdownloadmanager.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/network/qdownloadmanager.h"
+diff -urN old/include/Qt3D/QGeneralAreaAllocator new/include/Qt3D/QGeneralAreaAllocator
+--- old/include/Qt3D/QGeneralAreaAllocator	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGeneralAreaAllocator	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qareaallocator.h"
+diff -urN old/include/Qt3D/QGeometryData new/include/Qt3D/QGeometryData
+--- old/include/Qt3D/QGeometryData	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGeometryData	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgeometrydata.h"
+diff -urN old/include/Qt3D/qgeometrydata.h new/include/Qt3D/qgeometrydata.h
+--- old/include/Qt3D/qgeometrydata.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgeometrydata.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qgeometrydata.h"
+diff -urN old/include/Qt3D/QGLAbstractEffect new/include/Qt3D/QGLAbstractEffect
+--- old/include/Qt3D/QGLAbstractEffect	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAbstractEffect	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglabstracteffect.h"
+diff -urN old/include/Qt3D/qglabstracteffect.h new/include/Qt3D/qglabstracteffect.h
+--- old/include/Qt3D/qglabstracteffect.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglabstracteffect.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/painting/qglabstracteffect.h"
+diff -urN old/include/Qt3D/QGLAbstractMaterial new/include/Qt3D/QGLAbstractMaterial
+--- old/include/Qt3D/QGLAbstractMaterial	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAbstractMaterial	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglabstractmaterial.h"
+diff -urN old/include/Qt3D/qglabstractmaterial.h new/include/Qt3D/qglabstractmaterial.h
+--- old/include/Qt3D/qglabstractmaterial.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglabstractmaterial.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/materials/qglabstractmaterial.h"
+diff -urN old/include/Qt3D/QGLAbstractScene new/include/Qt3D/QGLAbstractScene
+--- old/include/Qt3D/QGLAbstractScene	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAbstractScene	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglabstractscene.h"
+diff -urN old/include/Qt3D/qglabstractscene.h new/include/Qt3D/qglabstractscene.h
+--- old/include/Qt3D/qglabstractscene.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglabstractscene.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglabstractscene.h"
+diff -urN old/include/Qt3D/QGLAbstractSurface new/include/Qt3D/QGLAbstractSurface
+--- old/include/Qt3D/QGLAbstractSurface	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAbstractSurface	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglabstractsurface.h"
+diff -urN old/include/Qt3D/qglabstractsurface.h new/include/Qt3D/qglabstractsurface.h
+--- old/include/Qt3D/qglabstractsurface.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglabstractsurface.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/surfaces/qglabstractsurface.h"
+diff -urN old/include/Qt3D/QGLAttributeDescription new/include/Qt3D/QGLAttributeDescription
+--- old/include/Qt3D/QGLAttributeDescription	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAttributeDescription	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglattributedescription.h"
+diff -urN old/include/Qt3D/qglattributedescription.h new/include/Qt3D/qglattributedescription.h
+--- old/include/Qt3D/qglattributedescription.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglattributedescription.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qglattributedescription.h"
+diff -urN old/include/Qt3D/QGLAttributeSet new/include/Qt3D/QGLAttributeSet
+--- old/include/Qt3D/QGLAttributeSet	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAttributeSet	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglattributeset.h"
+diff -urN old/include/Qt3D/qglattributeset.h new/include/Qt3D/qglattributeset.h
+--- old/include/Qt3D/qglattributeset.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglattributeset.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qglattributeset.h"
+diff -urN old/include/Qt3D/QGLAttributeValue new/include/Qt3D/QGLAttributeValue
+--- old/include/Qt3D/QGLAttributeValue	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLAttributeValue	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglattributevalue.h"
+diff -urN old/include/Qt3D/qglattributevalue.h new/include/Qt3D/qglattributevalue.h
+--- old/include/Qt3D/qglattributevalue.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglattributevalue.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qglattributevalue.h"
+diff -urN old/include/Qt3D/QGLBezierPatches new/include/Qt3D/QGLBezierPatches
+--- old/include/Qt3D/QGLBezierPatches	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLBezierPatches	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglbezierpatches.h"
+diff -urN old/include/Qt3D/qglbezierpatches.h new/include/Qt3D/qglbezierpatches.h
+--- old/include/Qt3D/qglbezierpatches.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglbezierpatches.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglbezierpatches.h"
+diff -urN old/include/Qt3D/QGLBezierScene new/include/Qt3D/QGLBezierScene
+--- old/include/Qt3D/QGLBezierScene	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLBezierScene	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglbezierscene.h"
+diff -urN old/include/Qt3D/qglbezierscene.h new/include/Qt3D/qglbezierscene.h
+--- old/include/Qt3D/qglbezierscene.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglbezierscene.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene_bezier/qglbezierscene.h"
+diff -urN old/include/Qt3D/QGLBezierSceneHandler new/include/Qt3D/QGLBezierSceneHandler
+--- old/include/Qt3D/QGLBezierSceneHandler	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLBezierSceneHandler	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglbezierscenehandler.h"
+diff -urN old/include/Qt3D/qglbezierscenehandler.h new/include/Qt3D/qglbezierscenehandler.h
+--- old/include/Qt3D/qglbezierscenehandler.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglbezierscenehandler.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene_bezier/qglbezierscenehandler.h"
+diff -urN old/include/Qt3D/QGLBuilder new/include/Qt3D/QGLBuilder
+--- old/include/Qt3D/QGLBuilder	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLBuilder	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglbuilder.h"
+diff -urN old/include/Qt3D/qglbuilder.h new/include/Qt3D/qglbuilder.h
+--- old/include/Qt3D/qglbuilder.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglbuilder.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglbuilder.h"
+diff -urN old/include/Qt3D/QGLCamera new/include/Qt3D/QGLCamera
+--- old/include/Qt3D/QGLCamera	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLCamera	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcamera.h"
+diff -urN old/include/Qt3D/QGLCameraAnimation new/include/Qt3D/QGLCameraAnimation
+--- old/include/Qt3D/QGLCameraAnimation	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLCameraAnimation	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcameraanimation.h"
+diff -urN old/include/Qt3D/qglcameraanimation.h new/include/Qt3D/qglcameraanimation.h
+--- old/include/Qt3D/qglcameraanimation.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcameraanimation.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/viewing/qglcameraanimation.h"
+diff -urN old/include/Qt3D/qglcamera.h new/include/Qt3D/qglcamera.h
+--- old/include/Qt3D/qglcamera.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcamera.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/viewing/qglcamera.h"
+diff -urN old/include/Qt3D/QGLColladaFxEffect new/include/Qt3D/QGLColladaFxEffect
+--- old/include/Qt3D/QGLColladaFxEffect	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaFxEffect	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffect.h"
+diff -urN old/include/Qt3D/QGLColladaFxEffectFactory new/include/Qt3D/QGLColladaFxEffectFactory
+--- old/include/Qt3D/QGLColladaFxEffectFactory	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaFxEffectFactory	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/qglcolladafxeffectfactory.h new/include/Qt3D/qglcolladafxeffectfactory.h
+--- old/include/Qt3D/qglcolladafxeffectfactory.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcolladafxeffectfactory.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/effects/qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/qglcolladafxeffect.h new/include/Qt3D/qglcolladafxeffect.h
+--- old/include/Qt3D/qglcolladafxeffect.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcolladafxeffect.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/effects/qglcolladafxeffect.h"
+diff -urN old/include/Qt3D/QGLColladaFxEffectLoader new/include/Qt3D/QGLColladaFxEffectLoader
+--- old/include/Qt3D/QGLColladaFxEffectLoader	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaFxEffectLoader	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectloader.h"
+diff -urN old/include/Qt3D/qglcolladafxeffectloader.h new/include/Qt3D/qglcolladafxeffectloader.h
+--- old/include/Qt3D/qglcolladafxeffectloader.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcolladafxeffectloader.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/effects/qglcolladafxeffectloader.h"
+diff -urN old/include/Qt3D/QGLColladaImageParam new/include/Qt3D/QGLColladaImageParam
+--- old/include/Qt3D/QGLColladaImageParam	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaImageParam	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/QGLColladaParam new/include/Qt3D/QGLColladaParam
+--- old/include/Qt3D/QGLColladaParam	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaParam	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/QGLColladaSampler2DParam new/include/Qt3D/QGLColladaSampler2DParam
+--- old/include/Qt3D/QGLColladaSampler2DParam	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaSampler2DParam	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/QGLColladaSurfaceParam new/include/Qt3D/QGLColladaSurfaceParam
+--- old/include/Qt3D/QGLColladaSurfaceParam	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaSurfaceParam	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/QGLColladaTextureParam new/include/Qt3D/QGLColladaTextureParam
+--- old/include/Qt3D/QGLColladaTextureParam	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColladaTextureParam	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolladafxeffectfactory.h"
+diff -urN old/include/Qt3D/QGLColorMaterial new/include/Qt3D/QGLColorMaterial
+--- old/include/Qt3D/QGLColorMaterial	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLColorMaterial	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcolormaterial.h"
+diff -urN old/include/Qt3D/qglcolormaterial.h new/include/Qt3D/qglcolormaterial.h
+--- old/include/Qt3D/qglcolormaterial.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcolormaterial.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/materials/qglcolormaterial.h"
+diff -urN old/include/Qt3D/QGLCube new/include/Qt3D/QGLCube
+--- old/include/Qt3D/QGLCube	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLCube	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcube.h"
+diff -urN old/include/Qt3D/qglcube.h new/include/Qt3D/qglcube.h
+--- old/include/Qt3D/qglcube.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcube.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglcube.h"
+diff -urN old/include/Qt3D/QGLCylinder new/include/Qt3D/QGLCylinder
+--- old/include/Qt3D/QGLCylinder	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLCylinder	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglcylinder.h"
+diff -urN old/include/Qt3D/qglcylinder.h new/include/Qt3D/qglcylinder.h
+--- old/include/Qt3D/qglcylinder.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglcylinder.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglcylinder.h"
+diff -urN old/include/Qt3D/QGLDome new/include/Qt3D/QGLDome
+--- old/include/Qt3D/QGLDome	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLDome	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgldome.h"
+diff -urN old/include/Qt3D/qgldome.h new/include/Qt3D/qgldome.h
+--- old/include/Qt3D/qgldome.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgldome.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qgldome.h"
+diff -urN old/include/Qt3D/QGLFramebufferObjectSurface new/include/Qt3D/QGLFramebufferObjectSurface
+--- old/include/Qt3D/QGLFramebufferObjectSurface	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLFramebufferObjectSurface	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglframebufferobjectsurface.h"
+diff -urN old/include/Qt3D/qglframebufferobjectsurface.h new/include/Qt3D/qglframebufferobjectsurface.h
+--- old/include/Qt3D/qglframebufferobjectsurface.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglframebufferobjectsurface.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/surfaces/qglframebufferobjectsurface.h"
+diff -urN old/include/Qt3D/QGLIndexBuffer new/include/Qt3D/QGLIndexBuffer
+--- old/include/Qt3D/QGLIndexBuffer	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLIndexBuffer	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglindexbuffer.h"
+diff -urN old/include/Qt3D/qglindexbuffer.h new/include/Qt3D/qglindexbuffer.h
+--- old/include/Qt3D/qglindexbuffer.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglindexbuffer.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qglindexbuffer.h"
+diff -urN old/include/Qt3D/QGLLightModel new/include/Qt3D/QGLLightModel
+--- old/include/Qt3D/QGLLightModel	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLLightModel	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgllightmodel.h"
+diff -urN old/include/Qt3D/qgllightmodel.h new/include/Qt3D/qgllightmodel.h
+--- old/include/Qt3D/qgllightmodel.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgllightmodel.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/painting/qgllightmodel.h"
+diff -urN old/include/Qt3D/QGLLightParameters new/include/Qt3D/QGLLightParameters
+--- old/include/Qt3D/QGLLightParameters	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLLightParameters	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgllightparameters.h"
+diff -urN old/include/Qt3D/qgllightparameters.h new/include/Qt3D/qgllightparameters.h
+--- old/include/Qt3D/qgllightparameters.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgllightparameters.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/painting/qgllightparameters.h"
+diff -urN old/include/Qt3D/QGLMaterial new/include/Qt3D/QGLMaterial
+--- old/include/Qt3D/QGLMaterial	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLMaterial	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglmaterial.h"
+diff -urN old/include/Qt3D/QGLMaterialCollection new/include/Qt3D/QGLMaterialCollection
+--- old/include/Qt3D/QGLMaterialCollection	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLMaterialCollection	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglmaterialcollection.h"
+diff -urN old/include/Qt3D/qglmaterialcollection.h new/include/Qt3D/qglmaterialcollection.h
+--- old/include/Qt3D/qglmaterialcollection.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglmaterialcollection.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglmaterialcollection.h"
+diff -urN old/include/Qt3D/qglmaterial.h new/include/Qt3D/qglmaterial.h
+--- old/include/Qt3D/qglmaterial.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglmaterial.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/materials/qglmaterial.h"
+diff -urN old/include/Qt3D/QGLMockView new/include/Qt3D/QGLMockView
+--- old/include/Qt3D/QGLMockView	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLMockView	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglmockview.h"
+diff -urN old/include/Qt3D/qglmockview.h new/include/Qt3D/qglmockview.h
+--- old/include/Qt3D/qglmockview.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglmockview.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/viewing/qglmockview.h"
+diff -urN old/include/Qt3D/qglnamespace.h new/include/Qt3D/qglnamespace.h
+--- old/include/Qt3D/qglnamespace.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglnamespace.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/global/qglnamespace.h"
+diff -urN old/include/Qt3D/QGLPainter new/include/Qt3D/QGLPainter
+--- old/include/Qt3D/QGLPainter	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLPainter	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglpainter.h"
+diff -urN old/include/Qt3D/qglpainter.h new/include/Qt3D/qglpainter.h
+--- old/include/Qt3D/qglpainter.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglpainter.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/painting/qglpainter.h"
+diff -urN old/include/Qt3D/QGLPickNode new/include/Qt3D/QGLPickNode
+--- old/include/Qt3D/QGLPickNode	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLPickNode	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglpicknode.h"
+diff -urN old/include/Qt3D/qglpicknode.h new/include/Qt3D/qglpicknode.h
+--- old/include/Qt3D/qglpicknode.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglpicknode.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglpicknode.h"
+diff -urN old/include/Qt3D/QGLPixelBufferSurface new/include/Qt3D/QGLPixelBufferSurface
+--- old/include/Qt3D/QGLPixelBufferSurface	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLPixelBufferSurface	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglpixelbuffersurface.h"
+diff -urN old/include/Qt3D/qglpixelbuffersurface.h new/include/Qt3D/qglpixelbuffersurface.h
+--- old/include/Qt3D/qglpixelbuffersurface.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglpixelbuffersurface.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/surfaces/qglpixelbuffersurface.h"
+diff -urN old/include/Qt3D/QGLRenderOrder new/include/Qt3D/QGLRenderOrder
+--- old/include/Qt3D/QGLRenderOrder	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLRenderOrder	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglrenderorder.h"
+diff -urN old/include/Qt3D/QGLRenderOrderComparator new/include/Qt3D/QGLRenderOrderComparator
+--- old/include/Qt3D/QGLRenderOrderComparator	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLRenderOrderComparator	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglrenderordercomparator.h"
+diff -urN old/include/Qt3D/qglrenderordercomparator.h new/include/Qt3D/qglrenderordercomparator.h
+--- old/include/Qt3D/qglrenderordercomparator.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglrenderordercomparator.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglrenderordercomparator.h"
+diff -urN old/include/Qt3D/qglrenderorder.h new/include/Qt3D/qglrenderorder.h
+--- old/include/Qt3D/qglrenderorder.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglrenderorder.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglrenderorder.h"
+diff -urN old/include/Qt3D/QGLRenderSequencer new/include/Qt3D/QGLRenderSequencer
+--- old/include/Qt3D/QGLRenderSequencer	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLRenderSequencer	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglrendersequencer.h"
+diff -urN old/include/Qt3D/qglrendersequencer.h new/include/Qt3D/qglrendersequencer.h
+--- old/include/Qt3D/qglrendersequencer.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglrendersequencer.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglrendersequencer.h"
+diff -urN old/include/Qt3D/QGLRenderState new/include/Qt3D/QGLRenderState
+--- old/include/Qt3D/QGLRenderState	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLRenderState	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglrenderstate.h"
+diff -urN old/include/Qt3D/qglrenderstate.h new/include/Qt3D/qglrenderstate.h
+--- old/include/Qt3D/qglrenderstate.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglrenderstate.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglrenderstate.h"
+diff -urN old/include/Qt3D/QGLSceneAnimation new/include/Qt3D/QGLSceneAnimation
+--- old/include/Qt3D/QGLSceneAnimation	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLSceneAnimation	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglsceneanimation.h"
+diff -urN old/include/Qt3D/qglsceneanimation.h new/include/Qt3D/qglsceneanimation.h
+--- old/include/Qt3D/qglsceneanimation.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglsceneanimation.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglsceneanimation.h"
+diff -urN old/include/Qt3D/QGLSceneFormatFactoryInterface new/include/Qt3D/QGLSceneFormatFactoryInterface
+--- old/include/Qt3D/QGLSceneFormatFactoryInterface	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLSceneFormatFactoryInterface	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglsceneformatplugin.h"
+diff -urN old/include/Qt3D/QGLSceneFormatHandler new/include/Qt3D/QGLSceneFormatHandler
+--- old/include/Qt3D/QGLSceneFormatHandler	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLSceneFormatHandler	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglsceneformatplugin.h"
+diff -urN old/include/Qt3D/qglsceneformatplugin.h new/include/Qt3D/qglsceneformatplugin.h
+--- old/include/Qt3D/qglsceneformatplugin.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglsceneformatplugin.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglsceneformatplugin.h"
+diff -urN old/include/Qt3D/QGLSceneNode new/include/Qt3D/QGLSceneNode
+--- old/include/Qt3D/QGLSceneNode	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLSceneNode	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglscenenode.h"
+diff -urN old/include/Qt3D/qglscenenode.h new/include/Qt3D/qglscenenode.h
+--- old/include/Qt3D/qglscenenode.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglscenenode.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/scene/qglscenenode.h"
+diff -urN old/include/Qt3D/QGLShaderProgramEffect new/include/Qt3D/QGLShaderProgramEffect
+--- old/include/Qt3D/QGLShaderProgramEffect	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLShaderProgramEffect	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglshaderprogrameffect.h"
+diff -urN old/include/Qt3D/qglshaderprogrameffect.h new/include/Qt3D/qglshaderprogrameffect.h
+--- old/include/Qt3D/qglshaderprogrameffect.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglshaderprogrameffect.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/effects/qglshaderprogrameffect.h"
+diff -urN old/include/Qt3D/QGLSphere new/include/Qt3D/QGLSphere
+--- old/include/Qt3D/QGLSphere	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLSphere	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglsphere.h"
+diff -urN old/include/Qt3D/qglsphere.h new/include/Qt3D/qglsphere.h
+--- old/include/Qt3D/qglsphere.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglsphere.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglsphere.h"
+diff -urN old/include/Qt3D/QGLSubsurface new/include/Qt3D/QGLSubsurface
+--- old/include/Qt3D/QGLSubsurface	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLSubsurface	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglsubsurface.h"
+diff -urN old/include/Qt3D/qglsubsurface.h new/include/Qt3D/qglsubsurface.h
+--- old/include/Qt3D/qglsubsurface.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglsubsurface.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/surfaces/qglsubsurface.h"
+diff -urN old/include/Qt3D/QGLTeapot new/include/Qt3D/QGLTeapot
+--- old/include/Qt3D/QGLTeapot	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLTeapot	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglteapot.h"
+diff -urN old/include/Qt3D/qglteapot.h new/include/Qt3D/qglteapot.h
+--- old/include/Qt3D/qglteapot.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglteapot.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qglteapot.h"
+diff -urN old/include/Qt3D/QGLTexture2D new/include/Qt3D/QGLTexture2D
+--- old/include/Qt3D/QGLTexture2D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLTexture2D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgltexture2d.h"
+diff -urN old/include/Qt3D/qgltexture2d.h new/include/Qt3D/qgltexture2d.h
+--- old/include/Qt3D/qgltexture2d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgltexture2d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/textures/qgltexture2d.h"
+diff -urN old/include/Qt3D/QGLTextureCube new/include/Qt3D/QGLTextureCube
+--- old/include/Qt3D/QGLTextureCube	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLTextureCube	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgltexturecube.h"
+diff -urN old/include/Qt3D/qgltexturecube.h new/include/Qt3D/qgltexturecube.h
+--- old/include/Qt3D/qgltexturecube.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgltexturecube.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/textures/qgltexturecube.h"
+diff -urN old/include/Qt3D/QGLTwoSidedMaterial new/include/Qt3D/QGLTwoSidedMaterial
+--- old/include/Qt3D/QGLTwoSidedMaterial	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLTwoSidedMaterial	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgltwosidedmaterial.h"
+diff -urN old/include/Qt3D/qgltwosidedmaterial.h new/include/Qt3D/qgltwosidedmaterial.h
+--- old/include/Qt3D/qgltwosidedmaterial.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgltwosidedmaterial.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/materials/qgltwosidedmaterial.h"
+diff -urN old/include/Qt3D/QGLVertexBundle new/include/Qt3D/QGLVertexBundle
+--- old/include/Qt3D/QGLVertexBundle	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLVertexBundle	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglvertexbundle.h"
+diff -urN old/include/Qt3D/qglvertexbundle.h new/include/Qt3D/qglvertexbundle.h
+--- old/include/Qt3D/qglvertexbundle.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglvertexbundle.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qglvertexbundle.h"
+diff -urN old/include/Qt3D/QGLView new/include/Qt3D/QGLView
+--- old/include/Qt3D/QGLView	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLView	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglview.h"
+diff -urN old/include/Qt3D/qglview.h new/include/Qt3D/qglview.h
+--- old/include/Qt3D/qglview.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglview.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/viewing/qglview.h"
+diff -urN old/include/Qt3D/QGLWindowSurface new/include/Qt3D/QGLWindowSurface
+--- old/include/Qt3D/QGLWindowSurface	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGLWindowSurface	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qglwindowsurface.h"
+diff -urN old/include/Qt3D/qglwindowsurface.h new/include/Qt3D/qglwindowsurface.h
+--- old/include/Qt3D/qglwindowsurface.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qglwindowsurface.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/surfaces/qglwindowsurface.h"
+diff -urN old/include/Qt3D/QGraphicsBillboardTransform new/include/Qt3D/QGraphicsBillboardTransform
+--- old/include/Qt3D/QGraphicsBillboardTransform	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGraphicsBillboardTransform	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgraphicsbillboardtransform.h"
+diff -urN old/include/Qt3D/qgraphicsbillboardtransform.h new/include/Qt3D/qgraphicsbillboardtransform.h
+--- old/include/Qt3D/qgraphicsbillboardtransform.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgraphicsbillboardtransform.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/graphicsview/qgraphicsbillboardtransform.h"
+diff -urN old/include/Qt3D/QGraphicsRotation3D new/include/Qt3D/QGraphicsRotation3D
+--- old/include/Qt3D/QGraphicsRotation3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGraphicsRotation3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgraphicsrotation3d.h"
+diff -urN old/include/Qt3D/qgraphicsrotation3d.h new/include/Qt3D/qgraphicsrotation3d.h
+--- old/include/Qt3D/qgraphicsrotation3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgraphicsrotation3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/graphicsview/qgraphicsrotation3d.h"
+diff -urN old/include/Qt3D/QGraphicsScale3D new/include/Qt3D/QGraphicsScale3D
+--- old/include/Qt3D/QGraphicsScale3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGraphicsScale3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgraphicsscale3d.h"
+diff -urN old/include/Qt3D/qgraphicsscale3d.h new/include/Qt3D/qgraphicsscale3d.h
+--- old/include/Qt3D/qgraphicsscale3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgraphicsscale3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/graphicsview/qgraphicsscale3d.h"
+diff -urN old/include/Qt3D/qgraphicstransform3d.h new/include/Qt3D/qgraphicstransform3d.h
+--- old/include/Qt3D/qgraphicstransform3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgraphicstransform3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/graphicsview/qgraphicstransform3d.h"
+diff -urN old/include/Qt3D/QGraphicsTranslation3D new/include/Qt3D/QGraphicsTranslation3D
+--- old/include/Qt3D/QGraphicsTranslation3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QGraphicsTranslation3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgraphicstranslation3d.h"
+diff -urN old/include/Qt3D/qgraphicstranslation3d.h new/include/Qt3D/qgraphicstranslation3d.h
+--- old/include/Qt3D/qgraphicstranslation3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qgraphicstranslation3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/graphicsview/qgraphicstranslation3d.h"
+diff -urN old/include/Qt3D/QLogicalVertex new/include/Qt3D/QLogicalVertex
+--- old/include/Qt3D/QLogicalVertex	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QLogicalVertex	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qlogicalvertex.h"
+diff -urN old/include/Qt3D/qlogicalvertex.h new/include/Qt3D/qlogicalvertex.h
+--- old/include/Qt3D/qlogicalvertex.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qlogicalvertex.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/geometry/qlogicalvertex.h"
+diff -urN old/include/Qt3D/QMatrix4x4Stack new/include/Qt3D/QMatrix4x4Stack
+--- old/include/Qt3D/QMatrix4x4Stack	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QMatrix4x4Stack	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qmatrix4x4stack.h"
+diff -urN old/include/Qt3D/qmatrix4x4stack.h new/include/Qt3D/qmatrix4x4stack.h
+--- old/include/Qt3D/qmatrix4x4stack.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qmatrix4x4stack.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/painting/qmatrix4x4stack.h"
+diff -urN old/include/Qt3D/QPlane3D new/include/Qt3D/QPlane3D
+--- old/include/Qt3D/QPlane3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QPlane3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qplane3d.h"
+diff -urN old/include/Qt3D/qplane3d.h new/include/Qt3D/qplane3d.h
+--- old/include/Qt3D/qplane3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qplane3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/math3d/qplane3d.h"
+diff -urN old/include/Qt3D/QQuickQGraphicsTransform3D new/include/Qt3D/QQuickQGraphicsTransform3D
+--- old/include/Qt3D/QQuickQGraphicsTransform3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QQuickQGraphicsTransform3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qgraphicstransform3d.h"
+diff -urN old/include/Qt3D/QRay3D new/include/Qt3D/QRay3D
+--- old/include/Qt3D/QRay3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QRay3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qray3d.h"
+diff -urN old/include/Qt3D/qray3d.h new/include/Qt3D/qray3d.h
+--- old/include/Qt3D/qray3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qray3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/math3d/qray3d.h"
+diff -urN old/include/Qt3D/QSimpleAreaAllocator new/include/Qt3D/QSimpleAreaAllocator
+--- old/include/Qt3D/QSimpleAreaAllocator	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QSimpleAreaAllocator	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qareaallocator.h"
+diff -urN old/include/Qt3D/QSphere3D new/include/Qt3D/QSphere3D
+--- old/include/Qt3D/QSphere3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QSphere3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qsphere3d.h"
+diff -urN old/include/Qt3D/qsphere3d.h new/include/Qt3D/qsphere3d.h
+--- old/include/Qt3D/qsphere3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qsphere3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/math3d/qsphere3d.h"
+diff -urN old/include/Qt3D/Qt3D new/include/Qt3D/Qt3D
+--- old/include/Qt3D/Qt3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/Qt3D	2013-12-17 16:35:20.787962383 +0000
+@@ -0,0 +1,75 @@
++#ifndef QT_QT3D_MODULE_H
++#define QT_QT3D_MODULE_H
++#include <Qt3D/Qt3DDepends>
++#include "qarray.h"
++#include "qcolor4ub.h"
++#include "qcustomdataarray.h"
++#include "qglattributedescription.h"
++#include "qglattributeset.h"
++#include "qglattributevalue.h"
++#include "qglindexbuffer.h"
++#include "qglvertexbundle.h"
++#include "qvector2darray.h"
++#include "qvector3darray.h"
++#include "qvector4darray.h"
++#include "qglcolladafxeffect.h"
++#include "qglcolladafxeffectfactory.h"
++#include "qglcolladafxeffectloader.h"
++#include "qglshaderprogrameffect.h"
++#include "qgeometrydata.h"
++#include "qglbezierpatches.h"
++#include "qglbuilder.h"
++#include "qglcube.h"
++#include "qglcylinder.h"
++#include "qgldome.h"
++#include "qglmaterialcollection.h"
++#include "qglsphere.h"
++#include "qglteapot.h"
++#include "qlogicalvertex.h"
++#include "qglnamespace.h"
++#include "qt3dglobal.h"
++#include "qgraphicsbillboardtransform.h"
++#include "qgraphicsrotation3d.h"
++#include "qgraphicsscale3d.h"
++#include "qgraphicstransform3d.h"
++#include "qgraphicstranslation3d.h"
++#include "qglabstractmaterial.h"
++#include "qglcolormaterial.h"
++#include "qglmaterial.h"
++#include "qgltwosidedmaterial.h"
++#include "qbox3d.h"
++#include "qplane3d.h"
++#include "qray3d.h"
++#include "qsphere3d.h"
++#include "qtriangle3d.h"
++#include "qdownloadmanager.h"
++#include "qglabstracteffect.h"
++#include "qgllightmodel.h"
++#include "qgllightparameters.h"
++#include "qglpainter.h"
++#include "qmatrix4x4stack.h"
++#include "qglabstractscene.h"
++#include "qglpicknode.h"
++#include "qglrenderorder.h"
++#include "qglrenderordercomparator.h"
++#include "qglrendersequencer.h"
++#include "qglrenderstate.h"
++#include "qglsceneanimation.h"
++#include "qglsceneformatplugin.h"
++#include "qglscenenode.h"
++#include "qglbezierscene.h"
++#include "qglbezierscenehandler.h"
++#include "qglabstractsurface.h"
++#include "qglframebufferobjectsurface.h"
++#include "qglpixelbuffersurface.h"
++#include "qglsubsurface.h"
++#include "qglwindowsurface.h"
++#include "qareaallocator.h"
++#include "qgltexture2d.h"
++#include "qgltexturecube.h"
++#include "qglcamera.h"
++#include "qglcameraanimation.h"
++#include "qglmockview.h"
++#include "qglview.h"
++#include "qt3dversion.h"
++#endif
+diff -urN old/include/Qt3D/qt3dglobal.h new/include/Qt3D/qt3dglobal.h
+--- old/include/Qt3D/qt3dglobal.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qt3dglobal.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/global/qt3dglobal.h"
+diff -urN old/include/Qt3D/Qt3DVersion new/include/Qt3D/Qt3DVersion
+--- old/include/Qt3D/Qt3DVersion	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/Qt3DVersion	2013-12-17 16:35:20.787962383 +0000
+@@ -0,0 +1 @@
++#include "qt3dversion.h"
+diff -urN old/include/Qt3D/qt3dversion.h new/include/Qt3D/qt3dversion.h
+--- old/include/Qt3D/qt3dversion.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qt3dversion.h	2013-12-17 16:35:20.787962383 +0000
+@@ -0,0 +1,9 @@
++/* This file was generated by syncqt. */
++#ifndef QT_QT3D_VERSION_H
++#define QT_QT3D_VERSION_H
++
++#define QT3D_VERSION_STR "5.2.0"
++
++#define QT3D_VERSION 0x050200
++
++#endif // QT_QT3D_VERSION_H
+diff -urN old/include/Qt3D/QtArrayData new/include/Qt3D/QtArrayData
+--- old/include/Qt3D/QtArrayData	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QtArrayData	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qarray.h"
+diff -urN old/include/Qt3D/QTriangle3D new/include/Qt3D/QTriangle3D
+--- old/include/Qt3D/QTriangle3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QTriangle3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qtriangle3d.h"
+diff -urN old/include/Qt3D/qtriangle3d.h new/include/Qt3D/qtriangle3d.h
+--- old/include/Qt3D/qtriangle3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qtriangle3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/math3d/qtriangle3d.h"
+diff -urN old/include/Qt3D/QUniformAreaAllocator new/include/Qt3D/QUniformAreaAllocator
+--- old/include/Qt3D/QUniformAreaAllocator	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QUniformAreaAllocator	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qareaallocator.h"
+diff -urN old/include/Qt3D/QVector2DArray new/include/Qt3D/QVector2DArray
+--- old/include/Qt3D/QVector2DArray	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QVector2DArray	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qvector2darray.h"
+diff -urN old/include/Qt3D/qvector2darray.h new/include/Qt3D/qvector2darray.h
+--- old/include/Qt3D/qvector2darray.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qvector2darray.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qvector2darray.h"
+diff -urN old/include/Qt3D/QVector3DArray new/include/Qt3D/QVector3DArray
+--- old/include/Qt3D/QVector3DArray	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QVector3DArray	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qvector3darray.h"
+diff -urN old/include/Qt3D/qvector3darray.h new/include/Qt3D/qvector3darray.h
+--- old/include/Qt3D/qvector3darray.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qvector3darray.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qvector3darray.h"
+diff -urN old/include/Qt3D/QVector4DArray new/include/Qt3D/QVector4DArray
+--- old/include/Qt3D/QVector4DArray	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/QVector4DArray	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qvector4darray.h"
+diff -urN old/include/Qt3D/qvector4darray.h new/include/Qt3D/qvector4darray.h
+--- old/include/Qt3D/qvector4darray.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3D/qvector4darray.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/threed/arrays/qvector4darray.h"
+diff -urN old/include/Qt3DQuick/capsulemesh.h new/include/Qt3DQuick/capsulemesh.h
+--- old/include/Qt3DQuick/capsulemesh.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/capsulemesh.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/capsulemesh.h"
+diff -urN old/include/Qt3DQuick/cylindermesh.h new/include/Qt3DQuick/cylindermesh.h
+--- old/include/Qt3DQuick/cylindermesh.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/cylindermesh.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/cylindermesh.h"
+diff -urN old/include/Qt3DQuick/headers.pri new/include/Qt3DQuick/headers.pri
+--- old/include/Qt3DQuick/headers.pri	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/headers.pri	2013-12-17 16:35:20.675962380 +0000
+@@ -0,0 +1,4 @@
++SYNCQT.HEADER_FILES = capsulemesh.h cylindermesh.h line.h point.h qmlres.h qquickanimation3d.h qquickeffect.h qquickitem3d.h qquickmesh.h qquickviewport.h qt3dquickglobal.h spheremesh.h ../../include/Qt3DQuick/qt3dquickversion.h ../../include/Qt3DQuick/Qt3DQuick 
++SYNCQT.HEADER_CLASSES = ../../include/Qt3DQuick/QQuickAnimation3D ../../include/Qt3DQuick/QQuickEffect ../../include/Qt3DQuick/QQuickItem3D ../../include/Qt3DQuick/QQuickMesh ../../include/Qt3DQuick/QQuickViewport ../../include/Qt3DQuick/Qt3DQuickVersion 
++SYNCQT.PRIVATE_HEADER_FILES = 
++SYNCQT.QPA_HEADER_FILES = 
+diff -urN old/include/Qt3DQuick/line.h new/include/Qt3DQuick/line.h
+--- old/include/Qt3DQuick/line.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/line.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/line.h"
+diff -urN old/include/Qt3DQuick/point.h new/include/Qt3DQuick/point.h
+--- old/include/Qt3DQuick/point.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/point.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/point.h"
+diff -urN old/include/Qt3DQuick/qmlres.h new/include/Qt3DQuick/qmlres.h
+--- old/include/Qt3DQuick/qmlres.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qmlres.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qmlres.h"
+diff -urN old/include/Qt3DQuick/QQuickAnimation3D new/include/Qt3DQuick/QQuickAnimation3D
+--- old/include/Qt3DQuick/QQuickAnimation3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/QQuickAnimation3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qquickanimation3d.h"
+diff -urN old/include/Qt3DQuick/qquickanimation3d.h new/include/Qt3DQuick/qquickanimation3d.h
+--- old/include/Qt3DQuick/qquickanimation3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qquickanimation3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qquickanimation3d.h"
+diff -urN old/include/Qt3DQuick/QQuickEffect new/include/Qt3DQuick/QQuickEffect
+--- old/include/Qt3DQuick/QQuickEffect	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/QQuickEffect	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qquickeffect.h"
+diff -urN old/include/Qt3DQuick/qquickeffect.h new/include/Qt3DQuick/qquickeffect.h
+--- old/include/Qt3DQuick/qquickeffect.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qquickeffect.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qquickeffect.h"
+diff -urN old/include/Qt3DQuick/QQuickItem3D new/include/Qt3DQuick/QQuickItem3D
+--- old/include/Qt3DQuick/QQuickItem3D	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/QQuickItem3D	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qquickitem3d.h"
+diff -urN old/include/Qt3DQuick/qquickitem3d.h new/include/Qt3DQuick/qquickitem3d.h
+--- old/include/Qt3DQuick/qquickitem3d.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qquickitem3d.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qquickitem3d.h"
+diff -urN old/include/Qt3DQuick/QQuickMesh new/include/Qt3DQuick/QQuickMesh
+--- old/include/Qt3DQuick/QQuickMesh	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/QQuickMesh	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qquickmesh.h"
+diff -urN old/include/Qt3DQuick/qquickmesh.h new/include/Qt3DQuick/qquickmesh.h
+--- old/include/Qt3DQuick/qquickmesh.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qquickmesh.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qquickmesh.h"
+diff -urN old/include/Qt3DQuick/QQuickViewport new/include/Qt3DQuick/QQuickViewport
+--- old/include/Qt3DQuick/QQuickViewport	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/QQuickViewport	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "qquickviewport.h"
+diff -urN old/include/Qt3DQuick/qquickviewport.h new/include/Qt3DQuick/qquickviewport.h
+--- old/include/Qt3DQuick/qquickviewport.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qquickviewport.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qquickviewport.h"
+diff -urN old/include/Qt3DQuick/Qt3DQuick new/include/Qt3DQuick/Qt3DQuick
+--- old/include/Qt3DQuick/Qt3DQuick	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/Qt3DQuick	2013-12-17 16:35:20.675962380 +0000
+@@ -0,0 +1,17 @@
++#ifndef QT_QT3DQUICK_MODULE_H
++#define QT_QT3DQUICK_MODULE_H
++#include <Qt3DQuick/Qt3DQuickDepends>
++#include "capsulemesh.h"
++#include "cylindermesh.h"
++#include "line.h"
++#include "point.h"
++#include "qmlres.h"
++#include "qquickanimation3d.h"
++#include "qquickeffect.h"
++#include "qquickitem3d.h"
++#include "qquickmesh.h"
++#include "qquickviewport.h"
++#include "qt3dquickglobal.h"
++#include "spheremesh.h"
++#include "qt3dquickversion.h"
++#endif
+diff -urN old/include/Qt3DQuick/qt3dquickglobal.h new/include/Qt3DQuick/qt3dquickglobal.h
+--- old/include/Qt3DQuick/qt3dquickglobal.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qt3dquickglobal.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/qt3dquickglobal.h"
+diff -urN old/include/Qt3DQuick/Qt3DQuickVersion new/include/Qt3DQuick/Qt3DQuickVersion
+--- old/include/Qt3DQuick/Qt3DQuickVersion	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/Qt3DQuickVersion	2013-12-17 16:35:20.675962380 +0000
+@@ -0,0 +1 @@
++#include "qt3dquickversion.h"
+diff -urN old/include/Qt3DQuick/qt3dquickversion.h new/include/Qt3DQuick/qt3dquickversion.h
+--- old/include/Qt3DQuick/qt3dquickversion.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/qt3dquickversion.h	2013-12-17 16:35:20.675962380 +0000
+@@ -0,0 +1,9 @@
++/* This file was generated by syncqt. */
++#ifndef QT_QT3DQUICK_VERSION_H
++#define QT_QT3DQUICK_VERSION_H
++
++#define QT3DQUICK_VERSION_STR "5.2.0"
++
++#define QT3DQUICK_VERSION 0x050200
++
++#endif // QT_QT3DQUICK_VERSION_H
+diff -urN old/include/Qt3DQuick/spheremesh.h new/include/Qt3DQuick/spheremesh.h
+--- old/include/Qt3DQuick/spheremesh.h	1970-01-01 00:00:00.000000000 +0000
++++ new/include/Qt3DQuick/spheremesh.h	2013-07-31 10:15:41.000000000 +0000
+@@ -0,0 +1 @@
++#include "../../src/quick3d/spheremesh.h"

=== added file 'debian/patches/workaround_zlib_linking_issue.patch'
--- debian/patches/workaround_zlib_linking_issue.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/workaround_zlib_linking_issue.patch	2013-12-20 21:54:23 +0000
@@ -0,0 +1,23 @@
+Description: Workaround build issue by using --no-as-needed
+ The patch workarounds a FTBFS described in a bug report.
+ .
+ Still needed with the latest Qt3d snapshot
+Author: Timo Jyrinki <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1207340
+Forwarded: no
+Last-Updated: 2013-08-01
+
+diff --git a/src/threed/threed.pro b/src/threed/threed.pro
+index 793c160..682db14 100644
+--- a/src/threed/threed.pro
++++ b/src/threed/threed.pro
+@@ -23,4 +23,8 @@ include(threed.pri)
+ PUBLIC_HEADERS = $$HEADERS
+ HEADERS += $$PRIVATE_HEADERS
+ 
++# Workaround zlib issue
++LIBS += -Wl,--no-as-needed
++LIBS += -lz
++
+ !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
+

=== added file 'debian/qt3d5-dev.install'
--- debian/qt3d5-dev.install	1970-01-01 00:00:00 +0000
+++ debian/qt3d5-dev.install	2013-12-20 21:54:23 +0000
@@ -0,0 +1,181 @@
+usr/include/qt5/Qt3D/QAreaAllocator
+usr/include/qt5/Qt3D/QArray
+usr/include/qt5/Qt3D/QArrayAlignedChar
+usr/include/qt5/Qt3D/QArrayAlignedPrealloc
+usr/include/qt5/Qt3D/QBox3D
+usr/include/qt5/Qt3D/QColor4ub
+usr/include/qt5/Qt3D/QCustomDataArray
+usr/include/qt5/Qt3D/QDownloadManager
+usr/include/qt5/Qt3D/QGLAbstractEffect
+usr/include/qt5/Qt3D/QGLAbstractMaterial
+usr/include/qt5/Qt3D/QGLAbstractScene
+usr/include/qt5/Qt3D/QGLAbstractSurface
+usr/include/qt5/Qt3D/QGLAttributeDescription
+usr/include/qt5/Qt3D/QGLAttributeSet
+usr/include/qt5/Qt3D/QGLAttributeValue
+usr/include/qt5/Qt3D/QGLBezierPatches
+usr/include/qt5/Qt3D/QGLBezierScene
+usr/include/qt5/Qt3D/QGLBezierSceneHandler
+usr/include/qt5/Qt3D/QGLBuilder
+usr/include/qt5/Qt3D/QGLCamera
+usr/include/qt5/Qt3D/QGLCameraAnimation
+usr/include/qt5/Qt3D/QGLColladaFxEffect
+usr/include/qt5/Qt3D/QGLColladaFxEffectFactory
+usr/include/qt5/Qt3D/QGLColladaFxEffectLoader
+usr/include/qt5/Qt3D/QGLColladaImageParam
+usr/include/qt5/Qt3D/QGLColladaParam
+usr/include/qt5/Qt3D/QGLColladaSampler2DParam
+usr/include/qt5/Qt3D/QGLColladaSurfaceParam
+usr/include/qt5/Qt3D/QGLColladaTextureParam
+usr/include/qt5/Qt3D/QGLColorMaterial
+usr/include/qt5/Qt3D/QGLCube
+usr/include/qt5/Qt3D/QGLCylinder
+usr/include/qt5/Qt3D/QGLDome
+usr/include/qt5/Qt3D/QGLFramebufferObjectSurface
+usr/include/qt5/Qt3D/QGLIndexBuffer
+usr/include/qt5/Qt3D/QGLLightModel
+usr/include/qt5/Qt3D/QGLLightParameters
+usr/include/qt5/Qt3D/QGLMaterial
+usr/include/qt5/Qt3D/QGLMaterialCollection
+usr/include/qt5/Qt3D/QGLMockView
+usr/include/qt5/Qt3D/QGLPainter
+usr/include/qt5/Qt3D/QGLPickNode
+usr/include/qt5/Qt3D/QGLPixelBufferSurface
+usr/include/qt5/Qt3D/QGLRenderOrder
+usr/include/qt5/Qt3D/QGLRenderOrderComparator
+usr/include/qt5/Qt3D/QGLRenderSequencer
+usr/include/qt5/Qt3D/QGLRenderState
+usr/include/qt5/Qt3D/QGLSceneAnimation
+usr/include/qt5/Qt3D/QGLSceneFormatFactoryInterface
+usr/include/qt5/Qt3D/QGLSceneFormatHandler
+usr/include/qt5/Qt3D/QGLSceneNode
+usr/include/qt5/Qt3D/QGLShaderProgramEffect
+usr/include/qt5/Qt3D/QGLSphere
+usr/include/qt5/Qt3D/QGLSubsurface
+usr/include/qt5/Qt3D/QGLTeapot
+usr/include/qt5/Qt3D/QGLTexture2D
+usr/include/qt5/Qt3D/QGLTextureCube
+usr/include/qt5/Qt3D/QGLTwoSidedMaterial
+usr/include/qt5/Qt3D/QGLVertexBundle
+usr/include/qt5/Qt3D/QGLView
+usr/include/qt5/Qt3D/QGLWindowSurface
+usr/include/qt5/Qt3D/QGeneralAreaAllocator
+usr/include/qt5/Qt3D/QGeometryData
+usr/include/qt5/Qt3D/QGraphicsBillboardTransform
+usr/include/qt5/Qt3D/QGraphicsRotation3D
+usr/include/qt5/Qt3D/QGraphicsScale3D
+usr/include/qt5/Qt3D/QGraphicsTranslation3D
+usr/include/qt5/Qt3D/QLogicalVertex
+usr/include/qt5/Qt3D/QMatrix4x4Stack
+usr/include/qt5/Qt3D/QPlane3D
+usr/include/qt5/Qt3D/QQuickQGraphicsTransform3D
+usr/include/qt5/Qt3D/QRay3D
+usr/include/qt5/Qt3D/QSimpleAreaAllocator
+usr/include/qt5/Qt3D/QSphere3D
+usr/include/qt5/Qt3D/QTriangle3D
+usr/include/qt5/Qt3D/QUniformAreaAllocator
+usr/include/qt5/Qt3D/QVector2DArray
+usr/include/qt5/Qt3D/QVector3DArray
+usr/include/qt5/Qt3D/QVector4DArray
+usr/include/qt5/Qt3D/Qt3D
+usr/include/qt5/Qt3D/Qt3DVersion
+usr/include/qt5/Qt3D/QtArrayData
+usr/include/qt5/Qt3D/qareaallocator.h
+usr/include/qt5/Qt3D/qarray.h
+usr/include/qt5/Qt3D/qbox3d.h
+usr/include/qt5/Qt3D/qcolor4ub.h
+usr/include/qt5/Qt3D/qcustomdataarray.h
+usr/include/qt5/Qt3D/qdownloadmanager.h
+usr/include/qt5/Qt3D/qgeometrydata.h
+usr/include/qt5/Qt3D/qglabstracteffect.h
+usr/include/qt5/Qt3D/qglabstractmaterial.h
+usr/include/qt5/Qt3D/qglabstractscene.h
+usr/include/qt5/Qt3D/qglabstractsurface.h
+usr/include/qt5/Qt3D/qglattributedescription.h
+usr/include/qt5/Qt3D/qglattributeset.h
+usr/include/qt5/Qt3D/qglattributevalue.h
+usr/include/qt5/Qt3D/qglbezierpatches.h
+usr/include/qt5/Qt3D/qglbezierscene.h
+usr/include/qt5/Qt3D/qglbezierscenehandler.h
+usr/include/qt5/Qt3D/qglbuilder.h
+usr/include/qt5/Qt3D/qglcamera.h
+usr/include/qt5/Qt3D/qglcameraanimation.h
+usr/include/qt5/Qt3D/qglcolladafxeffect.h
+usr/include/qt5/Qt3D/qglcolladafxeffectfactory.h
+usr/include/qt5/Qt3D/qglcolladafxeffectloader.h
+usr/include/qt5/Qt3D/qglcolormaterial.h
+usr/include/qt5/Qt3D/qglcube.h
+usr/include/qt5/Qt3D/qglcylinder.h
+usr/include/qt5/Qt3D/qgldome.h
+usr/include/qt5/Qt3D/qglframebufferobjectsurface.h
+usr/include/qt5/Qt3D/qglindexbuffer.h
+usr/include/qt5/Qt3D/qgllightmodel.h
+usr/include/qt5/Qt3D/qgllightparameters.h
+usr/include/qt5/Qt3D/qglmaterial.h
+usr/include/qt5/Qt3D/qglmaterialcollection.h
+usr/include/qt5/Qt3D/qglmockview.h
+usr/include/qt5/Qt3D/qglnamespace.h
+usr/include/qt5/Qt3D/qglpainter.h
+usr/include/qt5/Qt3D/qglpicknode.h
+usr/include/qt5/Qt3D/qglpixelbuffersurface.h
+usr/include/qt5/Qt3D/qglrenderorder.h
+usr/include/qt5/Qt3D/qglrenderordercomparator.h
+usr/include/qt5/Qt3D/qglrendersequencer.h
+usr/include/qt5/Qt3D/qglrenderstate.h
+usr/include/qt5/Qt3D/qglsceneanimation.h
+usr/include/qt5/Qt3D/qglsceneformatplugin.h
+usr/include/qt5/Qt3D/qglscenenode.h
+usr/include/qt5/Qt3D/qglshaderprogrameffect.h
+usr/include/qt5/Qt3D/qglsphere.h
+usr/include/qt5/Qt3D/qglsubsurface.h
+usr/include/qt5/Qt3D/qglteapot.h
+usr/include/qt5/Qt3D/qgltexture2d.h
+usr/include/qt5/Qt3D/qgltexturecube.h
+usr/include/qt5/Qt3D/qgltwosidedmaterial.h
+usr/include/qt5/Qt3D/qglvertexbundle.h
+usr/include/qt5/Qt3D/qglview.h
+usr/include/qt5/Qt3D/qglwindowsurface.h
+usr/include/qt5/Qt3D/qgraphicsbillboardtransform.h
+usr/include/qt5/Qt3D/qgraphicsrotation3d.h
+usr/include/qt5/Qt3D/qgraphicsscale3d.h
+usr/include/qt5/Qt3D/qgraphicstransform3d.h
+usr/include/qt5/Qt3D/qgraphicstranslation3d.h
+usr/include/qt5/Qt3D/qlogicalvertex.h
+usr/include/qt5/Qt3D/qmatrix4x4stack.h
+usr/include/qt5/Qt3D/qplane3d.h
+usr/include/qt5/Qt3D/qray3d.h
+usr/include/qt5/Qt3D/qsphere3d.h
+usr/include/qt5/Qt3D/qt3dglobal.h
+usr/include/qt5/Qt3D/qt3dversion.h
+usr/include/qt5/Qt3D/qtriangle3d.h
+usr/include/qt5/Qt3D/qvector2darray.h
+usr/include/qt5/Qt3D/qvector3darray.h
+usr/include/qt5/Qt3D/qvector4darray.h
+usr/include/qt5/Qt3DQuick/QQuickAnimation3D
+usr/include/qt5/Qt3DQuick/QQuickEffect
+usr/include/qt5/Qt3DQuick/QQuickItem3D
+usr/include/qt5/Qt3DQuick/QQuickMesh
+usr/include/qt5/Qt3DQuick/QQuickViewport
+usr/include/qt5/Qt3DQuick/Qt3DQuick
+usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
+usr/include/qt5/Qt3DQuick/capsulemesh.h
+usr/include/qt5/Qt3DQuick/cylindermesh.h
+usr/include/qt5/Qt3DQuick/line.h
+usr/include/qt5/Qt3DQuick/point.h
+usr/include/qt5/Qt3DQuick/qmlres.h
+usr/include/qt5/Qt3DQuick/qquickanimation3d.h
+usr/include/qt5/Qt3DQuick/qquickeffect.h
+usr/include/qt5/Qt3DQuick/qquickitem3d.h
+usr/include/qt5/Qt3DQuick/qquickmesh.h
+usr/include/qt5/Qt3DQuick/qquickviewport.h
+usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
+usr/include/qt5/Qt3DQuick/qt3dquickversion.h
+usr/include/qt5/Qt3DQuick/spheremesh.h
+usr/lib/*/*.prl
+usr/lib/*/*.so
+usr/lib/*/cmake/*
+usr/lib/*/pkgconfig/*
+usr/lib/*/qt5/bin/qglinfo
+usr/share/qt5/mkspecs/modules/*
+usr/include/qt5/Qt3D/Qt3DDepends
+usr/include/qt5/Qt3DQuick/Qt3DQuickDepends

=== added file 'debian/qt3d5-examples.install'
--- debian/qt3d5-examples.install	1970-01-01 00:00:00 +0000
+++ debian/qt3d5-examples.install	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/examples/*

=== added file 'debian/qt3d5-examples.lintian-overrides'
--- debian/qt3d5-examples.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/qt3d5-examples.lintian-overrides	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1 @@
+qt3d5-examples: image-file-in-usr-lib

=== added file 'debian/qt3d5-private-dev.install'
--- debian/qt3d5-private-dev.install	1970-01-01 00:00:00 +0000
+++ debian/qt3d5-private-dev.install	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1 @@
+usr/include/qt5/Qt3D/*/Qt3D/private/*

=== added file 'debian/qtdeclarative5-qt3d-plugin.install'
--- debian/qtdeclarative5-qt3d-plugin.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-qt3d-plugin.install	2013-12-20 21:54:23 +0000
@@ -0,0 +1,14 @@
+usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
+usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
+usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
+usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
+usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
+usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
+usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
+usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
+usr/lib/*/qt5/qml/Qt3D/qmldir

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2013-12-20 21:54:23 +0000
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export QT_SELECT=qt5
+
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+
+%:
+	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
+
+override_dh_auto_configure:
+	qmake
+
+override_dh_auto_install:
+	dh_auto_install
+	# Fix wrong path in pkgconfig files
+	find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
+	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
+	
+	# Remove libtool-like files
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+
+override_dh_auto_test:
+	export LD_LIBRARY_PATH=$(CURDIR)/lib
+	cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
+

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-12-20 21:54:23 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)