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

Proposed by Allan LeSage
Status: Superseded
Proposed branch: lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtlocation-opensource-src
Diff against target: 2305 lines (+2207/-0) (has conflicts)
19 files modified
debian/changelog (+56/-0)
debian/compat (+1/-0)
debian/control (+115/-0)
debian/copyright (+367/-0)
debian/libqt53d5.install (+1/-0)
debian/not-installed (+39/-0)
debian/patches/enable_coverage_reporting.patch (+79/-0)
debian/patches/link_against_system_zlib.patch (+111/-0)
debian/patches/series (+5/-0)
debian/patches/skip_failing_tests.patch (+41/-0)
debian/patches/syncqt_create_headers.patch (+1137/-0)
debian/patches/workaround_zlib_linking_issue.patch (+23/-0)
debian/qt3d5-dev.install (+181/-0)
debian/qt3d5-examples.install (+1/-0)
debian/qt3d5-examples.lintian-overrides (+1/-0)
debian/qt3d5-private-dev.install (+1/-0)
debian/qtdeclarative5-qt3d-plugin.install (+14/-0)
debian/rules (+33/-0)
debian/source/format (+1/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~allanlesage/kubuntu-packaging/qt3d-enable-tests
Reviewer Review Type Date Requested Status
Timo Jyrinki Pending
Review via email: mp+199870@code.launchpad.net

This proposal has been superseded by a proposal from 2013-12-20.

Description of the change

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

To post a comment you must log in.
37. By Allan LeSage

* 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

Correct patch series, removing enable_coverage.patch.

Unmerged revisions

38. By Allan LeSage

Correct patch series, removing enable_coverage.patch.

37. By Allan LeSage

* 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

Add make check to debian build; enable coverage reporting.

35. By 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

34. By Didier Roche-Tolomelli

releasing version 5.0~git20130731-0ubuntu1

33. By Timo Jyrinki

* 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

Improve override_dh_auto_install, use --fail-missing

31. By Timo Jyrinki

Improve override_dh_auto_install, use --fail-missing

30. By Timo Jyrinki

Run wrap-and-sort -a -t

29. By Didier Roche-Tolomelli

releasing version 5.0~git20130109-0ubuntu3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1qt3d-opensource-src (5.0~git20130731-0ubuntu2) UNRELEASED; urgency=medium
2
3 [ Timo Jyrinki ]
4 * Rebuild against Qt 5.2.0, bump dependencies
5 * Use QT_SELECT instead of depending on qt5-default
6 * Add syncqt_create_headers.patch to fix build against 5.2.0
7
8 [ Allan LeSage ]
9 * Depend on xvfb for existing tests requiring a display.
10 * Add dh_override_auto_test to make check under xvfb-run.
11 * debian/patches/skip_failing_tests.patch
12 - Skip some failing tests pending investigation.
13 * debian/patches/enable_coverage_reporting.patch
14 - Enable standard coverage reporting for Jenkins consumption.
15
16 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Tue, 17 Dec 2013 10:54:56 +0000
17
18qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low
19
20 * New upstream snapshot release
21 * Improve override_dh_auto_install, use --fail-missing
22 * Drop patches:
23 - add_GPL_license_file.patch, merged upstream
24 - add_module_version.patch, added upstream
25 - disable_conflicting_examples.patch, not needed anymore
26 * Refresh link_against_system_zlib.patch
27 * Add bug link to workaround_zlib_linking_issue.patch
28
29 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 02 Aug 2013 11:10:16 +0300
30
31qt3d-opensource-src (5.0~git20130109-0ubuntu3) saucy; urgency=low
32
33 * debian/patches/add_module_version.patch:
34 - Add a module version to fix FTBFS
35
36 -- Didier Roche <didrocks@ubuntu.com> Fri, 21 Jun 2013 17:59:14 +0200
37
38qt3d-opensource-src (5.0~git20130109-0ubuntu2) raring; urgency=low
39
40 [ Timo Jyrinki ]
41 * Fix pkgconfig Libs.private path (LP: #1125156)
42 * debian/patches/workaround_zlib_linking_issue.patch:
43 - Fix FTBFS
44
45 [ Didier Roche ]
46 * Fixed some small copyright issues
47
48 -- Didier Roche <didrocks@ubuntu.com> Fri, 15 Feb 2013 12:52:28 +0100
49
50qt3d-opensource-src (5.0~git20130109-0ubuntu1) raring; urgency=low
51
52 * Initial release
53 * Cherry-pick from upstream:
54 - add_license_files.patch
55
56 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Tue, 22 Jan 2013 14:32:08 +0200
057
=== 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 @@
19
02
=== 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 @@
1Source: qt3d-opensource-src
2Section: libs
3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 9.0.0),
6 libqt5opengl5-dev,
7 pkg-kde-tools,
8 qtbase5-private-dev (>= 5.2.0+dfsg~),
9 qtdeclarative5-private-dev (>= 5.2.0~),
10 xvfb,
11 zlib1g-dev,
12Standards-Version: 3.9.3
13Homepage: http://qt-project.org/
14
15Package: libqt53d5
16Architecture: any
17Multi-Arch: same
18Pre-Depends: ${misc:Pre-Depends},
19Depends: ${misc:Depends},
20 ${shlibs:Depends},
21Description: Qt 3D module
22 Qt is a cross-platform C++ application framework. Qt's primary feature
23 is its rich set of widgets that provide standard GUI functionality.
24 .
25 This package contains Qt 3D module.
26 .
27 WARNING: This module is not an official part of Qt 5, but instead a git
28 snapshot of an ongoing development. The package is very likely to
29 change in a binary incompatible way, and no guarantees are given.
30
31Package: qtdeclarative5-qt3d-plugin
32Architecture: any
33Multi-Arch: same
34Pre-Depends: dpkg (>= 1.15.6~),
35 ${misc:Pre-Depends},
36Depends: ${misc:Depends},
37 ${shlibs:Depends},
38Description: Qt 5 3D QML plugin
39 Qt is a cross-platform C++ application framework. Qt's primary feature
40 is its rich set of widgets that provide standard GUI functionality.
41 .
42 This package contains the Qt 3D QML plugin.
43 .
44 WARNING: This module is not an official part of Qt 5, but instead a git
45 snapshot of an ongoing development. The package is very likely to
46 change in a binary incompatible way, and no guarantees are given.
47
48Package: qt3d5-dev
49Section: libdevel
50Architecture: any
51Depends: libqt53d5 (= ${binary:Version}),
52 qtbase5-dev,
53 ${misc:Depends},
54 ${shlibs:Depends},
55Description: Qt 5 3d development files
56 Qt is a cross-platform C++ application framework. Qt's primary feature
57 is its rich set of widgets that provide standard GUI functionality.
58 .
59 This package contains the header development files used for building Qt 5
60 applications using Qt 3D library.
61 .
62 WARNING: This module is not an official part of Qt 5, but instead a git
63 snapshot of an ongoing development. The package is very likely to
64 change in a binary incompatible way, and no guarantees are given.
65
66Package: qt3d5-private-dev
67Architecture: any
68Section: libdevel
69Depends: qt3d5-dev (= ${binary:Version}),
70 ${misc:Depends},
71 ${shlibs:Depends},
72Description: Qt 5 3d private development files
73 Qt is a cross-platform C++ application framework. Qt's primary feature
74 is its rich set of widgets that provide standard GUI functionality.
75 .
76 This package contains the private header development files for building some
77 Qt 5 applications using 3D private headers.
78 .
79 Use at your own risk.
80 .
81 WARNING: This module is not an official part of Qt 5, but instead a git
82 snapshot of an ongoing development. The package is very likely to
83 change in a binary incompatible way, and no guarantees are given.
84
85Package: qt3d5-examples
86Architecture: any
87Multi-Arch: same
88Section: x11
89Pre-Depends: dpkg (>= 1.15.6~),
90 ${misc:Pre-Depends},
91Depends: ${misc:Depends},
92 ${shlibs:Depends},
93Description: Qt 5 3d examples
94 Qt is a cross-platform C++ application framework. Qt's primary feature
95 is its rich set of widgets that provide standard GUI functionality.
96 .
97 This package contains Qt 5 3D examples.
98 .
99 WARNING: This module is not an official part of Qt 5, but instead a git
100 snapshot of an ongoing development. The package is very likely to
101 change in a binary incompatible way, and no guarantees are given.
102
103Package: qt3d5-dbg
104Priority: extra
105Architecture: any
106Section: debug
107Depends: libqt53d5 (= ${binary:Version}),
108 qt3d5-examples (= ${binary:Version}),
109 ${misc:Depends},
110Description: Qt 3D library debugging symbols
111 Qt is a cross-platform C++ application framework. Qt's primary feature
112 is its rich set of widgets that provide standard GUI functionality.
113 .
114 This package contains the debugging symbols for the Qt 5 3D
115 libraries.
0116
=== 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 @@
1Format: http://dep.debian.net/deps/dep5
2Upstream-Name: qt3d
3Source: http://qt.gitorious.org/qt/qt3d
4
5Files: *
6Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
7License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
8
9Files: debian/*
10Copyright: 2007-2012 Fathi Boudra <fabo@debian.org>
11 2007-2012 Sune Vuorela <debian@pusling.com>
12 2008-2012 Modestas Vainius <modax@debian.org>
13 2007-2009 Ana Beatriz Guerrero Lopez <ana@debian.org>
14 2005-2007 Brian Nelson <pyro@debian.org>
15 2012 Timo Jyrinki <timo.jyrinki@canonical.com>
16License: LGPL-2.1
17
18License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
19 GNU Lesser General Public License version 2.1:
20 This file may be used under the terms of the GNU Lesser General Public
21 License version 2.1 as published by the Free Software Foundation and
22 appearing in the file LICENSE.LGPL included in the packaging of this
23 file. Please review the following information to ensure the GNU Lesser
24 General Public License version 2.1 requirements will be met:
25 http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
26 .
27 In addition, as a special exception, Digia gives you certain additional
28 rights. These rights are described in the Digia Qt LGPL Exception
29 version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
30 .
31 On Debian systems, the complete text of the GNU Lesser General Public License
32 can be found in `/usr/share/common-licenses/LGPL-2.1`.
33 .
34 Digia Qt LGPL Exception version 1.1:
35 As an additional permission to the GNU Lesser General Public License version
36 2.1, the object code form of a "work that uses the Library" may incorporate
37 material from a header file that is part of the Library. You may distribute
38 such object code under terms of your choice, provided that:
39 (i) the header files of the Library have not been modified; and
40 (ii) the incorporated material is limited to numerical parameters, data
41 structure layouts, accessors, macros, inline functions and
42 templates; and
43 (iii) you comply with the terms of Section 6 of the GNU Lesser General
44 Public License version 2.1.
45 .
46 Moreover, you may apply this exception to a modified version of the Library,
47 provided that such modification does not involve copying material from the
48 Library into the modified Library's header files unless such material is
49 limited to (i) numerical parameters; (ii) data structure layouts;
50 (iii) accessors; and (iv) small macros, templates and inline functions of
51 five lines or less in length.
52 .
53 Furthermore, you are not required to apply this additional permission to a
54 modified version of the Library.
55
56Files: tests/auto/cmake/test_modules/main.cpp
57Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
58License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
59
60License: GPL-3
61 GNU General Public License Usage
62 .
63 Alternatively, this file may be used under the terms of the GNU
64 General Public License version 3.0 as published by the Free Software
65 Foundation and appearing in the file LICENSE.GPL included in the
66 packaging of this file. Please review the following information to
67 ensure the GNU General Public License version 3.0 requirements will be
68 met: http://www.gnu.org/copyleft/gpl.html.
69 .
70 On Debian systems, the complete text of the license can be found in
71 `/usr/share/common-licenses/GPL-3`.
72
73License: LGPL-2.1
74 This file may be used under the terms of the GNU Lesser
75 General Public License version 2.1 as published by the Free Software
76 Foundation and appearing in the file LICENSE.LGPL included in the
77 packaging of this file. Please review the following information to
78 ensure the GNU Lesser General Public License version 2.1 requirements
79 will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
80 .
81 On Debian systems, the complete text of the LGPL-2.1 license can be found in
82 `/usr/share/common-licenses/LGPL-2.1`,
83
84Files: 3rdparty/assimp/*
85Copyright: 2006-2010, ASSIMP Development Team
86License: BSD-3-clause
87
88Files: 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
89Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
90License: BSD-3-clause
91
92License: BSD-3-clause
93 You may use this file under the terms of the BSD license as follows:
94 .
95 "Redistribution and use in source and binary forms, with or without
96 modification, are permitted provided that the following conditions are
97 met:
98 * Redistributions of source code must retain the above copyright
99 notice, this list of conditions and the following disclaimer.
100 * Redistributions in binary form must reproduce the above copyright
101 notice, this list of conditions and the following disclaimer in
102 the documentation and/or other materials provided with the
103 distribution.
104 * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
105 of its contributors may be used to endorse or promote products derived
106 from this software without specific prior written permission.
107 .
108 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
109 "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
110 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
111 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
112 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
113 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
114 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
115 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
116 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
117 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
118 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
119
120Files: 3rdparty/assimp/contrib/ConvertUTF/*
121Copyright: 2001-2004 Unicode, Inc.
122License:
123 Disclaimer
124 .
125 This source code is provided as is by Unicode, Inc. No claims are
126 made as to fitness for any particular purpose. No warranties of any
127 kind are expressed or implied. The recipient agrees to determine
128 applicability of information provided. If this file has been
129 purchased on magnetic or optical media from Unicode, Inc., the
130 sole remedy for any claim will be exchange of defective media
131 within 90 days of receipt.
132 .
133 Limitations on Rights to Redistribute This Code
134 .
135 Unicode, Inc. hereby grants the right to freely use the information
136 supplied in this file in the creation of products supporting the
137 Unicode Standard, and to make copies of this file in any form
138 for internal or external distribution as long as this notice
139 remains attached.
140
141Files: 3rdparty/assimp/contrib/zlib/*
142Copyright: 1995-2010 Jean-loup Gailly
143 1995-2010 Mark Adler
144License: Zlib
145 This software is provided 'as-is', without any express or implied
146 warranty. In no event will the authors be held liable for any damages
147 arising from the use of this software.
148 .
149 Permission is granted to anyone to use this software for any purpose,
150 including commercial applications, and to alter it and redistribute it
151 freely, subject to the following restrictions:
152 .
153 1. The origin of this software must not be misrepresented; you must not
154 claim that you wrote the original software. If you use this software
155 in a product, an acknowledgment in the product documentation would be
156 appreciated but is not required.
157 2. Altered source versions must be plainly marked as such, and must not be
158 misrepresented as being the original software.
159 3. This notice may not be removed or altered from any source distribution.
160
161Files: 3rdparty/assimp/contrib/unzip/*
162Copyright: 1998-2005 Gilles Vollant
163License: Zlib
164 This software is provided 'as-is', without any express or implied
165 warranty. In no event will the authors be held liable for any damages
166 arising from the use of this software.
167 .
168 Permission is granted to anyone to use this software for any purpose,
169 including commercial applications, and to alter it and redistribute it
170 freely, subject to the following restrictions:
171 .
172 1. The origin of this software must not be misrepresented; you must not
173 claim that you wrote the original software. If you use this software
174 in a product, an acknowledgment in the product documentation would be
175 appreciated but is not required.
176 2. Altered source versions must be plainly marked as such, and must not be
177 misrepresented as being the original software.
178 3. This notice may not be removed or altered from any source distribution.
179
180Files: 3rdparty/assimp/contrib/unzip/unzip.c
181Copyright: 1990-2000 Info-ZIP
182License: Info-ZIP license
183 See the accompanying file LICENSE, version 2000-Apr-09 or later
184 (the contents of which are also included in zip.h) for terms of use.
185 If, for some reason, all these files are missing, the Info-ZIP license
186 also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
187
188Files: 3rdparty/assimp/contrib/irrXML/*
189Copyright: 2002-2005 Nikolaus Gebhardt
190License: irrXML license
191
192License: irrXML license
193 The irrXML license is based on the zlib license. Basicly, this means you can do with irrXML whatever you want:
194 .
195 This software is provided 'as-is', without any express or implied
196 warranty. In no event will the authors be held liable for any damages
197 arising from the use of this software.
198 .
199 Permission is granted to anyone to use this software for any purpose,
200 including commercial applications, and to alter it and redistribute it
201 freely, subject to the following restrictions:
202 .
203 1. The origin of this software must not be misrepresented; you must not
204 claim that you wrote the original software. If you use this software
205 in a product, an acknowledgment in the product documentation would be
206 appreciated but is not required.
207 .
208 2. Altered source versions must be plainly marked as such, and must not be
209 misrepresented as being the original software.
210 .
211 3. This notice may not be removed or altered from any source distribution.
212
213Files: 3rdparty/assimp/code/BoostWorkaround/*
214Copyright: 1994-1999 Beman Dawes
215License: Boost Software License 1.0
216 Boost Software License - Version 1.0 - August 17th, 2003
217 .
218 Permission is hereby granted, free of charge, to any person or organization
219 obtaining a copy of the software and accompanying documentation covered by
220 this license (the "Software") to use, reproduce, display, distribute,
221 execute, and transmit the Software, and to prepare derivative works of the
222 Software, and to permit third-parties to whom the Software is furnished to
223 do so, all subject to the following:
224 .
225 The copyright notices in the Software and this entire statement, including
226 the above license grant, this restriction and the following disclaimer,
227 must be included in all copies of the Software, in whole or in part, and
228 all derivative works of the Software, unless such copies or derivative
229 works are solely in the form of machine-executable object code generated by
230 a source language processor.
231 .
232 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
233 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
234 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
235 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
236 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
237 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
238 DEALINGS IN THE SOFTWARE.
239
240Files: fast_atof.h
241Copyright: 2002-2007 Nikolaus Gebhardt
242License: irrXML license
243
244Files: doc/config/scripts/superfish.js
245Copyright: 2008 Joel Birch
246License: MIT
247
248Files: doc/config/scripts/jquery.js
249Copyright: 2010 John Resig
250 2010 The Dojo Foundation
251License: MIT
252
253License: MIT
254 Permission is hereby granted, free of charge, to any person obtaining
255 a copy of this software and associated documentation files (the
256 "Software"), to deal in the Software without restriction, including
257 without limitation the rights to use, copy, modify, merge, publish,
258 distribute, sublicense, and/or sell copies of the Software, and to
259 permit persons to whom the Software is furnished to do so, subject
260 to the following conditions:
261 .
262 The above copyright notice and this permission notice shall be
263 included in all copies or substantial portions of the Software.
264 .
265 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
266 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
267 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
268 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
269 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
270 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
271 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
272 OTHER DEALINGS IN THE SOFTWARE.
273
274Files: 3rdparty/assimp/code/MDCNormalTable.h doc/src/legal/snippets/pico-model.txt
275Copyright: 2002 Randy Reddig & seaw0lf
276License: Custom BSD like
277 Redistribution and use in source and binary forms, with or without modification,
278 are permitted provided that the following conditions are met:
279 .
280 Redistributions of source code must retain the above copyright notice, this list
281 of conditions and the following disclaimer.
282 .
283 Redistributions in binary form must reproduce the above copyright notice, this
284 list of conditions and the following disclaimer in the documentation and/or
285 other materials provided with the distribution.
286 .
287 Neither the names of the copyright holders nor the names of its contributors may
288 be used to endorse or promote products derived from this software without
289 specific prior written permission.
290 .
291 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
292 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
293 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
294 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
295 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
296 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
297 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
298 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
299 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
300 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
301
302Files: 3rdparty/assimp/code/pstdint.h doc/src/legal/snippets/pstdint.txt
303Copyright: 2005-2007 Paul Hsieh
304License: BSD-3-clause
305
306Files: 3rdparty/assimp/code/BoostWorkaround/boost/foreach.hpp
307Copyright: 2004 Eric Niebler
308License: BSL
309
310Files: 3rdparty/assimp/code/BoostWorkaround/boost/timer.hpp
311Copyright: 1994-1999 Beman Dawes
312License: BSL
313
314Files: 3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
315Copyright: 2008 Alexander Gessler
316License: BSL
317
318Files: 3rdparty/assimp/code/BoostWorkaround/boost/pointer_cast.hpp
319Copyright: 2005 Ion Gaztanaga
320License: BSL
321
322License: BSL
323 Distributed under the Boost Software License, Version 1.0. (See
324 accompanying file LICENSE_1_0.txt or copy at
325 http://www.boost.org/LICENSE_1_0.txt)
326 .
327 Permission is hereby granted, free of charge, to any person or organization
328 obtaining a copy of the software and accompanying documentation covered by
329 this license (the "Software") to use, reproduce, display, distribute,
330 execute, and transmit the Software, and to prepare derivative works of the
331 Software, and to permit third-parties to whom the Software is furnished to
332 do so, all subject to the following:
333 .
334 The copyright notices in the Software and this entire statement, including
335 the above license grant, this restriction and the following disclaimer,
336 must be included in all copies of the Software, in whole or in part, and
337 all derivative works of the Software, unless such copies or derivative
338 works are solely in the form of machine-executable object code generated by
339 a source language processor.
340 .
341 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
342 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
343 FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
344 SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
345 FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
346 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
347 DEALINGS IN THE SOFTWARE.
348
349Files: *.qdoc
350Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
351License: GFDL-1.3
352
353License: GFDL-1.3
354 GNU Free Documentation License Usage
355 Alternatively, this file may be used under the terms of the GNU Free
356 Documentation License version 1.3 as published by the Free Software
357 Foundation and appearing in the file included in the packaging of
358 this file. Please review the following information to ensure
359 the GNU Free Documentation License version 1.3 requirements
360 will be met: http://www.gnu.org/copyleft/fdl.html.
361 .
362 On Debian systems, the complete text of the GFDL-1.3 license can be found in
363 `/usr/share/common-licenses/GFDL-1.3`,
364
365Files: src/quick3d/cube.qdoc src/quick3d/quad.qdoc src/quick3d/teapot.qdoc
366Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
367License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
0368
=== 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 @@
1usr/lib/*/*.so.*
02
=== 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 @@
1usr/lib/x86_64-linux-gnu/libQt53D.la
2usr/lib/*/qt5/bin/qglinfo
3usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
4usr/lib/*/qt5/qml/Qt3D/qmldir
5usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
6usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
7usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
8usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
9usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
10usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
11usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
12usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
13usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
14usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
15usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
16usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
17usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
18usr/include/qt5/Qt3DQuick/cylindermesh.h
19usr/include/qt5/Qt3DQuick/qquickeffect.h
20usr/include/qt5/Qt3DQuick/line.h
21usr/include/qt5/Qt3DQuick/qquickmesh.h
22usr/include/qt5/Qt3DQuick/spheremesh.h
23usr/include/qt5/Qt3DQuick/capsulemesh.h
24usr/include/qt5/Qt3DQuick/qquickitem3d.h
25usr/include/qt5/Qt3DQuick/Qt3DQuick
26usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
27usr/include/qt5/Qt3DQuick/QQuickAnimation3D
28usr/include/qt5/Qt3DQuick/QQuickMesh
29usr/include/qt5/Qt3DQuick/QQuickViewport
30usr/include/qt5/Qt3DQuick/qquickanimation3d.h
31usr/include/qt5/Qt3DQuick/cube.h
32usr/include/qt5/Qt3DQuick/qquickviewport.h
33usr/include/qt5/Qt3DQuick/point.h
34usr/include/qt5/Qt3DQuick/QQuickItem3D
35usr/include/qt5/Qt3DQuick/qmlres.h
36usr/include/qt5/Qt3DQuick/teapot.h
37usr/include/qt5/Qt3DQuick/QQuickEffect
38usr/include/qt5/Qt3DQuick/qt3dquickversion.h
39
040
=== 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 @@
1--- a/src/imports/threed/threed.pro
2+++ b/src/imports/threed/threed.pro
3@@ -1,3 +1,5 @@
4+include(../../../coverage.pri)
5+
6 CXX_MODULE = 3d
7 TARGET = qthreedqmlplugin
8
9--- a/src/quick3d/quick3d.pro
10+++ b/src/quick3d/quick3d.pro
11@@ -1,3 +1,5 @@
12+include(../../coverage.pri)
13+
14 TARGET = Qt3DQuick
15 MODULE = 3dquick
16 QT = core gui qml quick 3d
17--- a/src/threed/threed.pro
18+++ b/src/threed/threed.pro
19@@ -1,3 +1,5 @@
20+include(../../coverage.pri)
21+
22 TARGET = Qt3D
23 MODULE = 3d
24 QT = core-private gui-private opengl
25--- /dev/null
26+++ b/coverage.pri
27@@ -0,0 +1,44 @@
28+# Coverage
29+CONFIG(coverage) {
30+ LIBS += -lgcov
31+ QMAKE_CXXFLAGS += --coverage
32+ QMAKE_LDFLAGS += --coverage
33+
34+ QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
35+ generate-coverage-html clean-coverage-html coverage-gcovr \
36+ generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
37+
38+ clean-gcno.commands = \
39+ "@echo Removing old coverage instrumentation"; \
40+ "find -name '*.gcno' -print | xargs -r rm"
41+
42+ clean-gcda.commands = \
43+ "@echo Removing old coverage results"; \
44+ "find -name '*.gcda' -print | xargs -r rm"
45+
46+ coverage-html.depends = clean-gcda check generate-coverage-html
47+
48+ generate-coverage-html.commands = \
49+ "@echo Collecting coverage data"; \
50+ "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
51+ "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
52+ "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
53+ "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
54+
55+ clean-coverage-html.depends = clean-gcda
56+ clean-coverage-html.commands = \
57+ "lcov --directory $${TOP_SRC_DIR} -z"; \
58+ "rm -rf coverage.info coverage-html"
59+
60+ coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
61+
62+ generate-coverage-gcovr.commands = \
63+ "@echo Generating coverage GCOVR report"; \
64+ "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
65+
66+ clean-coverage-gcovr.depends = clean-gcda
67+ clean-coverage-gcovr.commands = \
68+ "rm -rf $${TOP_SRC_DIR}/coverage.xml"
69+
70+ QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
71+}
72--- a/qt3d.pro
73+++ b/qt3d.pro
74@@ -1,3 +1,5 @@
75+include(coverage.pri)
76+
77 requires(qtHaveModule(opengl))
78
79 load(qt_parts)
080
=== 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 @@
1diff --git a/3rdparty/assimp/assimp.pri b/3rdparty/assimp/assimp.pri
2index a3810b3..ec8d724 100644
3--- a/3rdparty/assimp/assimp.pri
4+++ b/3rdparty/assimp/assimp.pri
5@@ -5,6 +5,8 @@
6 CONFIG(debug, debug|release) : DEFINES+=_DEBUG
7 CONFIG += exceptions
8
9+DEFINES+=ASSIMP_BUILD_NO_OWN_ZLIB
10+
11 win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
12
13 VPATH += \
14@@ -22,7 +24,6 @@ INCLUDEPATH += \
15 $$PWD/include \
16 $$PWD/include/Compiler \
17 $$PWD/contrib/ConvertUTF \
18- $$PWD/contrib/zlib \
19 $$PWD/contrib/irrXML \
20 $$PWD/contrib/unzip
21
22@@ -203,17 +204,6 @@ HEADERS += \
23 contrib/unzip/crypt.h \
24 contrib/unzip/ioapi.h \
25 contrib/unzip/unzip.h \
26- contrib/zlib/crc32.h \
27- contrib/zlib/deflate.h \
28- contrib/zlib/inffast.h \
29- contrib/zlib/inffixed.h \
30- contrib/zlib/inflate.h \
31- contrib/zlib/inftrees.h \
32- contrib/zlib/trees.h \
33- contrib/zlib/zconf.h \
34- contrib/zlib/zconf.in.h \
35- contrib/zlib/zlib.h \
36- contrib/zlib/zutil.h \
37 include/Compiler/poppack1.h \
38 include/Compiler/pushpack1.h \
39 code/BoostWorkaround/boost/foreach.hpp \
40@@ -337,13 +327,4 @@ SOURCES += \
41 contrib/ConvertUTF/ConvertUTF.c \
42 contrib/irrXML/irrXML.cpp \
43 contrib/unzip/ioapi.c \
44- contrib/unzip/unzip.c \
45- contrib/zlib/adler32.c \
46- contrib/zlib/compress.c \
47- contrib/zlib/crc32.c \
48- contrib/zlib/deflate.c \
49- contrib/zlib/inffast.c \
50- contrib/zlib/inflate.c \
51- contrib/zlib/inftrees.c \
52- contrib/zlib/trees.c \
53- contrib/zlib/zutil.c
54+ contrib/unzip/unzip.c
55diff --git a/3rdparty/assimp/code/makefile b/3rdparty/assimp/code/makefile
56index 5710158..486300d 100644
57--- a/3rdparty/assimp/code/makefile
58+++ b/3rdparty/assimp/code/makefile
59@@ -24,7 +24,7 @@ OBJECTS += $(patsubst %.cpp,%.o, $(wildcard extra/*.cpp))
60 OBJECTS += $(patsubst %.cpp,%.o, $(wildcard ./../contrib/irrXML/*.cpp))
61
62 # C object files
63-OBJECTSC := $(patsubst %.c,%.oc, $(wildcard ./../contrib/zlib/*.c))
64+#OBJECTSC := $(patsubst %.c,%.oc, $(wildcard ./../contrib/zlib/*.c))
65 OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/ConvertUTF/*.c))
66 OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/unzip/*.c))
67
68@@ -47,6 +47,8 @@ INCPATH = ../include
69 # GCC compiler flags
70 CPPFLAGS=-Wall
71
72+DEFINEFLAGS+=ASSIMP_BUILD_NO_OWN_ZLIB
73+
74 # Setup environment for noboost build
75 ifeq ($(NOBOOST),1)
76 SINGLETHREADED = 1
77@@ -85,7 +87,7 @@ STATIC = $(BINPATH)/libassimp$(NAMESUFFIX).a
78 all: $(SHARED_TARGET)
79
80 $(SHARED_TARGET): $(OBJECTS) $(OBJECTSC)
81- gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++
82+ gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++ -lz
83 %.o:%.cpp
84 $(CXX) -g -c $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) -fPIC
85 %.oc:%.c
86diff --git a/qt3d.pro b/qt3d.pro
87index 541d46d..d4d95c9 100644
88--- a/qt3d.pro
89+++ b/qt3d.pro
90@@ -7,6 +7,8 @@ module_qt3d_tutorials.CONFIG = no_default_target no_default_install
91
92 !package: SUBDIRS += module_qt3d_tutorials
93
94+LIBS += -lz
95+
96 gcov: SUBDIRS -= sub_tools
97
98 # We need opengl, minimum es2
99diff --git a/src/threed/threed.pro b/src/threed/threed.pro
100index 793c160..fd992ca 100644
101--- a/src/threed/threed.pro
102+++ b/src/threed/threed.pro
103@@ -7,6 +7,8 @@ load(qt_module)
104
105 QMAKE_DOCS = $$PWD/doc/qt3d.qdocconf
106
107+QMAKE_LFLAGS += -lz
108+
109 gcov {
110 CONFIG += static
111 QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
0112
=== 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 @@
1link_against_system_zlib.patch
2workaround_zlib_linking_issue.patch
3syncqt_create_headers.patch
4skip_failing_tests.patch
5enable_coverage_reporting.patch
06
=== 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 @@
1--- a/tests/auto/threed/threed.pro
2+++ b/tests/auto/threed/threed.pro
3@@ -5,7 +5,8 @@
4 qbox3d \
5 qcolor4ub \
6 qcustomdataarray \
7- qgeometrydata \
8+ # skip a failing test
9+ #qgeometrydata \
10 qglabstractsurface \
11 qglattributedescription \
12 qglattributeset \
13@@ -26,7 +27,8 @@
14 qglscenenode \
15 qglsection \
16 qglsphere \
17- qglvertexbundle \
18+ # skip a failing test
19+ #qglvertexbundle \
20 qgraphicstransform3d \
21 qplane3d \
22 qray3d \
23--- a/tests/auto/auto.pro
24+++ b/tests/auto/auto.pro
25@@ -3,9 +3,10 @@
26 cmake
27
28 qtHaveModule(qml): SUBDIRS += imports
29-qtHaveModule(qmltest) {
30- SUBDIRS += qml3d
31-
32- !win32 : SUBDIRS += qml3d_visual \
33- qml3d_cpp
34-}
35+# skip these failing tests
36+#qtHaveModule(qmltest) {
37+# SUBDIRS += qml3d
38+#
39+# !win32 : SUBDIRS += qml3d_visual \
40+# qml3d_cpp
41+#}
042
=== 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 @@
1diff -urN old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h
2--- old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h 1970-01-01 00:00:00.000000000 +0000
3+++ new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h 2013-07-31 10:15:41.000000000 +0000
4@@ -0,0 +1 @@
5+#include "../../../../../src/threed/scene_ai/ailoaderiostream_p.h"
6diff -urN old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h
7--- old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h 1970-01-01 00:00:00.000000000 +0000
8+++ new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h 2013-07-31 10:15:41.000000000 +0000
9@@ -0,0 +1 @@
10+#include "../../../../../src/threed/scene_ai/ailoaderiosystem_p.h"
11diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h new/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h
12--- old/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h 1970-01-01 00:00:00.000000000 +0000
13+++ new/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h 2013-07-31 10:15:41.000000000 +0000
14@@ -0,0 +1 @@
15+#include "../../../../../src/threed/scene_ai/qailoader_p.h"
16diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h
17--- old/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h 1970-01-01 00:00:00.000000000 +0000
18+++ new/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h 2013-07-31 10:15:41.000000000 +0000
19@@ -0,0 +1 @@
20+#include "../../../../../src/threed/scene_ai/qaimesh_p.h"
21diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h
22--- old/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h 1970-01-01 00:00:00.000000000 +0000
23+++ new/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h 2013-07-31 10:15:41.000000000 +0000
24@@ -0,0 +1 @@
25+#include "../../../../../src/threed/scene_ai/qaiscenehandler_p.h"
26diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h
27--- old/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h 1970-01-01 00:00:00.000000000 +0000
28+++ new/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h 2013-07-31 10:15:41.000000000 +0000
29@@ -0,0 +1 @@
30+#include "../../../../../src/threed/scene_ai/qaiscene_p.h"
31diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h
32--- old/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h 1970-01-01 00:00:00.000000000 +0000
33+++ new/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h 2013-07-31 10:15:41.000000000 +0000
34@@ -0,0 +1 @@
35+#include "../../../../../src/threed/painting/qglabstracteffect_p.h"
36diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h
37--- old/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h 1970-01-01 00:00:00.000000000 +0000
38+++ new/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h 2013-07-31 10:15:41.000000000 +0000
39@@ -0,0 +1 @@
40+#include "../../../../../src/threed/geometry/qglbuilder_p.h"
41diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h
42--- old/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h 1970-01-01 00:00:00.000000000 +0000
43+++ new/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h 2013-07-31 10:15:41.000000000 +0000
44@@ -0,0 +1 @@
45+#include "../../../../../src/threed/effects/qglcolladafxeffect_p.h"
46diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h
47--- old/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h 1970-01-01 00:00:00.000000000 +0000
48+++ new/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h 2013-07-31 10:15:41.000000000 +0000
49@@ -0,0 +1 @@
50+#include "../../../../../src/threed/surfaces/qglcontextsurface_p.h"
51diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h
52--- old/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h 1970-01-01 00:00:00.000000000 +0000
53+++ new/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h 2013-07-31 10:15:41.000000000 +0000
54@@ -0,0 +1 @@
55+#include "../../../../../src/threed/surfaces/qgldrawbuffersurface_p.h"
56diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h
57--- old/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h 1970-01-01 00:00:00.000000000 +0000
58+++ new/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h 2013-07-31 10:15:41.000000000 +0000
59@@ -0,0 +1 @@
60+#include "../../../../../src/threed/painting/qglext_p.h"
61diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h
62--- old/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h 1970-01-01 00:00:00.000000000 +0000
63+++ new/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h 2013-07-31 10:15:41.000000000 +0000
64@@ -0,0 +1 @@
65+#include "../../../../../src/threed/effects/qglflatcoloreffect_p.h"
66diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h
67--- old/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h 1970-01-01 00:00:00.000000000 +0000
68+++ new/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h 2013-07-31 10:15:41.000000000 +0000
69@@ -0,0 +1 @@
70+#include "../../../../../src/threed/effects/qglflattextureeffect_p.h"
71diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h
72--- old/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h 1970-01-01 00:00:00.000000000 +0000
73+++ new/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h 2013-07-31 10:15:41.000000000 +0000
74@@ -0,0 +1 @@
75+#include "../../../../../src/threed/effects/qgllitmaterialeffect_p.h"
76diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h
77--- old/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h 1970-01-01 00:00:00.000000000 +0000
78+++ new/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h 2013-07-31 10:15:41.000000000 +0000
79@@ -0,0 +1 @@
80+#include "../../../../../src/threed/effects/qgllittextureeffect_p.h"
81diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h
82--- old/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h 1970-01-01 00:00:00.000000000 +0000
83+++ new/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h 2013-07-31 10:15:41.000000000 +0000
84@@ -0,0 +1 @@
85+#include "../../../../../src/threed/surfaces/qglmaskedsurface_p.h"
86diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h
87--- old/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h 1970-01-01 00:00:00.000000000 +0000
88+++ new/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h 2013-07-31 10:15:41.000000000 +0000
89@@ -0,0 +1 @@
90+#include "../../../../../src/threed/materials/qglmaterial_p.h"
91diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h
92--- old/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h 1970-01-01 00:00:00.000000000 +0000
93+++ new/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h 2013-07-31 10:15:41.000000000 +0000
94@@ -0,0 +1 @@
95+#include "../../../../../src/threed/viewing/qglmockview_p.h"
96diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h
97--- old/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h 1970-01-01 00:00:00.000000000 +0000
98+++ new/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h 2013-07-31 10:15:41.000000000 +0000
99@@ -0,0 +1 @@
100+#include "../../../../../src/threed/painting/qglpainter_p.h"
101diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h
102--- old/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h 1970-01-01 00:00:00.000000000 +0000
103+++ new/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h 2013-07-31 10:15:41.000000000 +0000
104@@ -0,0 +1 @@
105+#include "../../../../../src/threed/surfaces/qglpaintersurface_p.h"
106diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h
107--- old/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h 1970-01-01 00:00:00.000000000 +0000
108+++ new/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h 2013-07-31 10:15:41.000000000 +0000
109@@ -0,0 +1 @@
110+#include "../../../../../src/threed/painting/qglpickcolors_p.h"
111diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h
112--- old/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h 1970-01-01 00:00:00.000000000 +0000
113+++ new/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h 2013-07-31 10:15:41.000000000 +0000
114@@ -0,0 +1 @@
115+#include "../../../../../src/threed/scene/qglscenenode_p.h"
116diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h
117--- old/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h 1970-01-01 00:00:00.000000000 +0000
118+++ new/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h 2013-07-31 10:15:41.000000000 +0000
119@@ -0,0 +1 @@
120+#include "../../../../../src/threed/geometry/qglsection_p.h"
121diff -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
122--- old/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h 1970-01-01 00:00:00.000000000 +0000
123+++ new/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h 2013-07-31 10:15:41.000000000 +0000
124@@ -0,0 +1 @@
125+#include "../../../../../src/threed/geometry/qglteapot_data_p.h"
126diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h
127--- old/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h 1970-01-01 00:00:00.000000000 +0000
128+++ new/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h 2013-07-31 10:15:41.000000000 +0000
129@@ -0,0 +1 @@
130+#include "../../../../../src/threed/textures/qgltexture2d_p.h"
131diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h
132--- old/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h 1970-01-01 00:00:00.000000000 +0000
133+++ new/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h 2013-07-31 10:15:41.000000000 +0000
134@@ -0,0 +1 @@
135+#include "../../../../../src/threed/textures/qgltextureutils_p.h"
136diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h
137--- old/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h 1970-01-01 00:00:00.000000000 +0000
138+++ new/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h 2013-07-31 10:15:41.000000000 +0000
139@@ -0,0 +1 @@
140+#include "../../../../../src/threed/arrays/qglvertexbundle_p.h"
141diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h new/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h
142--- old/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h 1970-01-01 00:00:00.000000000 +0000
143+++ new/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h 2013-07-31 10:15:41.000000000 +0000
144@@ -0,0 +1 @@
145+#include "../../../../../src/threed/painting/qmatrix4x4stack_p.h"
146diff -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
147--- old/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h 1970-01-01 00:00:00.000000000 +0000
148+++ new/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h 2013-07-31 10:15:41.000000000 +0000
149@@ -0,0 +1 @@
150+#include "../../../../../src/threed/geometry/qvector_utils_p.h"
151diff -urN old/include/Qt3D/headers.pri new/include/Qt3D/headers.pri
152--- old/include/Qt3D/headers.pri 1970-01-01 00:00:00.000000000 +0000
153+++ new/include/Qt3D/headers.pri 2013-12-17 16:35:20.787962383 +0000
154@@ -0,0 +1,4 @@
155+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
156+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
157+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
158+SYNCQT.QPA_HEADER_FILES =
159diff -urN old/include/Qt3D/QAreaAllocator new/include/Qt3D/QAreaAllocator
160--- old/include/Qt3D/QAreaAllocator 1970-01-01 00:00:00.000000000 +0000
161+++ new/include/Qt3D/QAreaAllocator 2013-07-31 10:15:41.000000000 +0000
162@@ -0,0 +1 @@
163+#include "qareaallocator.h"
164diff -urN old/include/Qt3D/qareaallocator.h new/include/Qt3D/qareaallocator.h
165--- old/include/Qt3D/qareaallocator.h 1970-01-01 00:00:00.000000000 +0000
166+++ new/include/Qt3D/qareaallocator.h 2013-07-31 10:15:41.000000000 +0000
167@@ -0,0 +1 @@
168+#include "../../src/threed/textures/qareaallocator.h"
169diff -urN old/include/Qt3D/QArray new/include/Qt3D/QArray
170--- old/include/Qt3D/QArray 1970-01-01 00:00:00.000000000 +0000
171+++ new/include/Qt3D/QArray 2013-07-31 10:15:41.000000000 +0000
172@@ -0,0 +1 @@
173+#include "qarray.h"
174diff -urN old/include/Qt3D/QArrayAlignedChar new/include/Qt3D/QArrayAlignedChar
175--- old/include/Qt3D/QArrayAlignedChar 1970-01-01 00:00:00.000000000 +0000
176+++ new/include/Qt3D/QArrayAlignedChar 2013-07-31 10:15:41.000000000 +0000
177@@ -0,0 +1 @@
178+#include "qarray.h"
179diff -urN old/include/Qt3D/QArrayAlignedPrealloc new/include/Qt3D/QArrayAlignedPrealloc
180--- old/include/Qt3D/QArrayAlignedPrealloc 1970-01-01 00:00:00.000000000 +0000
181+++ new/include/Qt3D/QArrayAlignedPrealloc 2013-07-31 10:15:41.000000000 +0000
182@@ -0,0 +1 @@
183+#include "qarray.h"
184diff -urN old/include/Qt3D/qarray.h new/include/Qt3D/qarray.h
185--- old/include/Qt3D/qarray.h 1970-01-01 00:00:00.000000000 +0000
186+++ new/include/Qt3D/qarray.h 2013-07-31 10:15:41.000000000 +0000
187@@ -0,0 +1 @@
188+#include "../../src/threed/arrays/qarray.h"
189diff -urN old/include/Qt3D/QBox3D new/include/Qt3D/QBox3D
190--- old/include/Qt3D/QBox3D 1970-01-01 00:00:00.000000000 +0000
191+++ new/include/Qt3D/QBox3D 2013-07-31 10:15:41.000000000 +0000
192@@ -0,0 +1 @@
193+#include "qbox3d.h"
194diff -urN old/include/Qt3D/qbox3d.h new/include/Qt3D/qbox3d.h
195--- old/include/Qt3D/qbox3d.h 1970-01-01 00:00:00.000000000 +0000
196+++ new/include/Qt3D/qbox3d.h 2013-07-31 10:15:41.000000000 +0000
197@@ -0,0 +1 @@
198+#include "../../src/threed/math3d/qbox3d.h"
199diff -urN old/include/Qt3D/QColor4ub new/include/Qt3D/QColor4ub
200--- old/include/Qt3D/QColor4ub 1970-01-01 00:00:00.000000000 +0000
201+++ new/include/Qt3D/QColor4ub 2013-07-31 10:15:41.000000000 +0000
202@@ -0,0 +1 @@
203+#include "qcolor4ub.h"
204diff -urN old/include/Qt3D/qcolor4ub.h new/include/Qt3D/qcolor4ub.h
205--- old/include/Qt3D/qcolor4ub.h 1970-01-01 00:00:00.000000000 +0000
206+++ new/include/Qt3D/qcolor4ub.h 2013-07-31 10:15:41.000000000 +0000
207@@ -0,0 +1 @@
208+#include "../../src/threed/arrays/qcolor4ub.h"
209diff -urN old/include/Qt3D/QCustomDataArray new/include/Qt3D/QCustomDataArray
210--- old/include/Qt3D/QCustomDataArray 1970-01-01 00:00:00.000000000 +0000
211+++ new/include/Qt3D/QCustomDataArray 2013-07-31 10:15:41.000000000 +0000
212@@ -0,0 +1 @@
213+#include "qcustomdataarray.h"
214diff -urN old/include/Qt3D/qcustomdataarray.h new/include/Qt3D/qcustomdataarray.h
215--- old/include/Qt3D/qcustomdataarray.h 1970-01-01 00:00:00.000000000 +0000
216+++ new/include/Qt3D/qcustomdataarray.h 2013-07-31 10:15:41.000000000 +0000
217@@ -0,0 +1 @@
218+#include "../../src/threed/arrays/qcustomdataarray.h"
219diff -urN old/include/Qt3D/QDownloadManager new/include/Qt3D/QDownloadManager
220--- old/include/Qt3D/QDownloadManager 1970-01-01 00:00:00.000000000 +0000
221+++ new/include/Qt3D/QDownloadManager 2013-07-31 10:15:41.000000000 +0000
222@@ -0,0 +1 @@
223+#include "qdownloadmanager.h"
224diff -urN old/include/Qt3D/qdownloadmanager.h new/include/Qt3D/qdownloadmanager.h
225--- old/include/Qt3D/qdownloadmanager.h 1970-01-01 00:00:00.000000000 +0000
226+++ new/include/Qt3D/qdownloadmanager.h 2013-07-31 10:15:41.000000000 +0000
227@@ -0,0 +1 @@
228+#include "../../src/threed/network/qdownloadmanager.h"
229diff -urN old/include/Qt3D/QGeneralAreaAllocator new/include/Qt3D/QGeneralAreaAllocator
230--- old/include/Qt3D/QGeneralAreaAllocator 1970-01-01 00:00:00.000000000 +0000
231+++ new/include/Qt3D/QGeneralAreaAllocator 2013-07-31 10:15:41.000000000 +0000
232@@ -0,0 +1 @@
233+#include "qareaallocator.h"
234diff -urN old/include/Qt3D/QGeometryData new/include/Qt3D/QGeometryData
235--- old/include/Qt3D/QGeometryData 1970-01-01 00:00:00.000000000 +0000
236+++ new/include/Qt3D/QGeometryData 2013-07-31 10:15:41.000000000 +0000
237@@ -0,0 +1 @@
238+#include "qgeometrydata.h"
239diff -urN old/include/Qt3D/qgeometrydata.h new/include/Qt3D/qgeometrydata.h
240--- old/include/Qt3D/qgeometrydata.h 1970-01-01 00:00:00.000000000 +0000
241+++ new/include/Qt3D/qgeometrydata.h 2013-07-31 10:15:41.000000000 +0000
242@@ -0,0 +1 @@
243+#include "../../src/threed/geometry/qgeometrydata.h"
244diff -urN old/include/Qt3D/QGLAbstractEffect new/include/Qt3D/QGLAbstractEffect
245--- old/include/Qt3D/QGLAbstractEffect 1970-01-01 00:00:00.000000000 +0000
246+++ new/include/Qt3D/QGLAbstractEffect 2013-07-31 10:15:41.000000000 +0000
247@@ -0,0 +1 @@
248+#include "qglabstracteffect.h"
249diff -urN old/include/Qt3D/qglabstracteffect.h new/include/Qt3D/qglabstracteffect.h
250--- old/include/Qt3D/qglabstracteffect.h 1970-01-01 00:00:00.000000000 +0000
251+++ new/include/Qt3D/qglabstracteffect.h 2013-07-31 10:15:41.000000000 +0000
252@@ -0,0 +1 @@
253+#include "../../src/threed/painting/qglabstracteffect.h"
254diff -urN old/include/Qt3D/QGLAbstractMaterial new/include/Qt3D/QGLAbstractMaterial
255--- old/include/Qt3D/QGLAbstractMaterial 1970-01-01 00:00:00.000000000 +0000
256+++ new/include/Qt3D/QGLAbstractMaterial 2013-07-31 10:15:41.000000000 +0000
257@@ -0,0 +1 @@
258+#include "qglabstractmaterial.h"
259diff -urN old/include/Qt3D/qglabstractmaterial.h new/include/Qt3D/qglabstractmaterial.h
260--- old/include/Qt3D/qglabstractmaterial.h 1970-01-01 00:00:00.000000000 +0000
261+++ new/include/Qt3D/qglabstractmaterial.h 2013-07-31 10:15:41.000000000 +0000
262@@ -0,0 +1 @@
263+#include "../../src/threed/materials/qglabstractmaterial.h"
264diff -urN old/include/Qt3D/QGLAbstractScene new/include/Qt3D/QGLAbstractScene
265--- old/include/Qt3D/QGLAbstractScene 1970-01-01 00:00:00.000000000 +0000
266+++ new/include/Qt3D/QGLAbstractScene 2013-07-31 10:15:41.000000000 +0000
267@@ -0,0 +1 @@
268+#include "qglabstractscene.h"
269diff -urN old/include/Qt3D/qglabstractscene.h new/include/Qt3D/qglabstractscene.h
270--- old/include/Qt3D/qglabstractscene.h 1970-01-01 00:00:00.000000000 +0000
271+++ new/include/Qt3D/qglabstractscene.h 2013-07-31 10:15:41.000000000 +0000
272@@ -0,0 +1 @@
273+#include "../../src/threed/scene/qglabstractscene.h"
274diff -urN old/include/Qt3D/QGLAbstractSurface new/include/Qt3D/QGLAbstractSurface
275--- old/include/Qt3D/QGLAbstractSurface 1970-01-01 00:00:00.000000000 +0000
276+++ new/include/Qt3D/QGLAbstractSurface 2013-07-31 10:15:41.000000000 +0000
277@@ -0,0 +1 @@
278+#include "qglabstractsurface.h"
279diff -urN old/include/Qt3D/qglabstractsurface.h new/include/Qt3D/qglabstractsurface.h
280--- old/include/Qt3D/qglabstractsurface.h 1970-01-01 00:00:00.000000000 +0000
281+++ new/include/Qt3D/qglabstractsurface.h 2013-07-31 10:15:41.000000000 +0000
282@@ -0,0 +1 @@
283+#include "../../src/threed/surfaces/qglabstractsurface.h"
284diff -urN old/include/Qt3D/QGLAttributeDescription new/include/Qt3D/QGLAttributeDescription
285--- old/include/Qt3D/QGLAttributeDescription 1970-01-01 00:00:00.000000000 +0000
286+++ new/include/Qt3D/QGLAttributeDescription 2013-07-31 10:15:41.000000000 +0000
287@@ -0,0 +1 @@
288+#include "qglattributedescription.h"
289diff -urN old/include/Qt3D/qglattributedescription.h new/include/Qt3D/qglattributedescription.h
290--- old/include/Qt3D/qglattributedescription.h 1970-01-01 00:00:00.000000000 +0000
291+++ new/include/Qt3D/qglattributedescription.h 2013-07-31 10:15:41.000000000 +0000
292@@ -0,0 +1 @@
293+#include "../../src/threed/arrays/qglattributedescription.h"
294diff -urN old/include/Qt3D/QGLAttributeSet new/include/Qt3D/QGLAttributeSet
295--- old/include/Qt3D/QGLAttributeSet 1970-01-01 00:00:00.000000000 +0000
296+++ new/include/Qt3D/QGLAttributeSet 2013-07-31 10:15:41.000000000 +0000
297@@ -0,0 +1 @@
298+#include "qglattributeset.h"
299diff -urN old/include/Qt3D/qglattributeset.h new/include/Qt3D/qglattributeset.h
300--- old/include/Qt3D/qglattributeset.h 1970-01-01 00:00:00.000000000 +0000
301+++ new/include/Qt3D/qglattributeset.h 2013-07-31 10:15:41.000000000 +0000
302@@ -0,0 +1 @@
303+#include "../../src/threed/arrays/qglattributeset.h"
304diff -urN old/include/Qt3D/QGLAttributeValue new/include/Qt3D/QGLAttributeValue
305--- old/include/Qt3D/QGLAttributeValue 1970-01-01 00:00:00.000000000 +0000
306+++ new/include/Qt3D/QGLAttributeValue 2013-07-31 10:15:41.000000000 +0000
307@@ -0,0 +1 @@
308+#include "qglattributevalue.h"
309diff -urN old/include/Qt3D/qglattributevalue.h new/include/Qt3D/qglattributevalue.h
310--- old/include/Qt3D/qglattributevalue.h 1970-01-01 00:00:00.000000000 +0000
311+++ new/include/Qt3D/qglattributevalue.h 2013-07-31 10:15:41.000000000 +0000
312@@ -0,0 +1 @@
313+#include "../../src/threed/arrays/qglattributevalue.h"
314diff -urN old/include/Qt3D/QGLBezierPatches new/include/Qt3D/QGLBezierPatches
315--- old/include/Qt3D/QGLBezierPatches 1970-01-01 00:00:00.000000000 +0000
316+++ new/include/Qt3D/QGLBezierPatches 2013-07-31 10:15:41.000000000 +0000
317@@ -0,0 +1 @@
318+#include "qglbezierpatches.h"
319diff -urN old/include/Qt3D/qglbezierpatches.h new/include/Qt3D/qglbezierpatches.h
320--- old/include/Qt3D/qglbezierpatches.h 1970-01-01 00:00:00.000000000 +0000
321+++ new/include/Qt3D/qglbezierpatches.h 2013-07-31 10:15:41.000000000 +0000
322@@ -0,0 +1 @@
323+#include "../../src/threed/geometry/qglbezierpatches.h"
324diff -urN old/include/Qt3D/QGLBezierScene new/include/Qt3D/QGLBezierScene
325--- old/include/Qt3D/QGLBezierScene 1970-01-01 00:00:00.000000000 +0000
326+++ new/include/Qt3D/QGLBezierScene 2013-07-31 10:15:41.000000000 +0000
327@@ -0,0 +1 @@
328+#include "qglbezierscene.h"
329diff -urN old/include/Qt3D/qglbezierscene.h new/include/Qt3D/qglbezierscene.h
330--- old/include/Qt3D/qglbezierscene.h 1970-01-01 00:00:00.000000000 +0000
331+++ new/include/Qt3D/qglbezierscene.h 2013-07-31 10:15:41.000000000 +0000
332@@ -0,0 +1 @@
333+#include "../../src/threed/scene_bezier/qglbezierscene.h"
334diff -urN old/include/Qt3D/QGLBezierSceneHandler new/include/Qt3D/QGLBezierSceneHandler
335--- old/include/Qt3D/QGLBezierSceneHandler 1970-01-01 00:00:00.000000000 +0000
336+++ new/include/Qt3D/QGLBezierSceneHandler 2013-07-31 10:15:41.000000000 +0000
337@@ -0,0 +1 @@
338+#include "qglbezierscenehandler.h"
339diff -urN old/include/Qt3D/qglbezierscenehandler.h new/include/Qt3D/qglbezierscenehandler.h
340--- old/include/Qt3D/qglbezierscenehandler.h 1970-01-01 00:00:00.000000000 +0000
341+++ new/include/Qt3D/qglbezierscenehandler.h 2013-07-31 10:15:41.000000000 +0000
342@@ -0,0 +1 @@
343+#include "../../src/threed/scene_bezier/qglbezierscenehandler.h"
344diff -urN old/include/Qt3D/QGLBuilder new/include/Qt3D/QGLBuilder
345--- old/include/Qt3D/QGLBuilder 1970-01-01 00:00:00.000000000 +0000
346+++ new/include/Qt3D/QGLBuilder 2013-07-31 10:15:41.000000000 +0000
347@@ -0,0 +1 @@
348+#include "qglbuilder.h"
349diff -urN old/include/Qt3D/qglbuilder.h new/include/Qt3D/qglbuilder.h
350--- old/include/Qt3D/qglbuilder.h 1970-01-01 00:00:00.000000000 +0000
351+++ new/include/Qt3D/qglbuilder.h 2013-07-31 10:15:41.000000000 +0000
352@@ -0,0 +1 @@
353+#include "../../src/threed/geometry/qglbuilder.h"
354diff -urN old/include/Qt3D/QGLCamera new/include/Qt3D/QGLCamera
355--- old/include/Qt3D/QGLCamera 1970-01-01 00:00:00.000000000 +0000
356+++ new/include/Qt3D/QGLCamera 2013-07-31 10:15:41.000000000 +0000
357@@ -0,0 +1 @@
358+#include "qglcamera.h"
359diff -urN old/include/Qt3D/QGLCameraAnimation new/include/Qt3D/QGLCameraAnimation
360--- old/include/Qt3D/QGLCameraAnimation 1970-01-01 00:00:00.000000000 +0000
361+++ new/include/Qt3D/QGLCameraAnimation 2013-07-31 10:15:41.000000000 +0000
362@@ -0,0 +1 @@
363+#include "qglcameraanimation.h"
364diff -urN old/include/Qt3D/qglcameraanimation.h new/include/Qt3D/qglcameraanimation.h
365--- old/include/Qt3D/qglcameraanimation.h 1970-01-01 00:00:00.000000000 +0000
366+++ new/include/Qt3D/qglcameraanimation.h 2013-07-31 10:15:41.000000000 +0000
367@@ -0,0 +1 @@
368+#include "../../src/threed/viewing/qglcameraanimation.h"
369diff -urN old/include/Qt3D/qglcamera.h new/include/Qt3D/qglcamera.h
370--- old/include/Qt3D/qglcamera.h 1970-01-01 00:00:00.000000000 +0000
371+++ new/include/Qt3D/qglcamera.h 2013-07-31 10:15:41.000000000 +0000
372@@ -0,0 +1 @@
373+#include "../../src/threed/viewing/qglcamera.h"
374diff -urN old/include/Qt3D/QGLColladaFxEffect new/include/Qt3D/QGLColladaFxEffect
375--- old/include/Qt3D/QGLColladaFxEffect 1970-01-01 00:00:00.000000000 +0000
376+++ new/include/Qt3D/QGLColladaFxEffect 2013-07-31 10:15:41.000000000 +0000
377@@ -0,0 +1 @@
378+#include "qglcolladafxeffect.h"
379diff -urN old/include/Qt3D/QGLColladaFxEffectFactory new/include/Qt3D/QGLColladaFxEffectFactory
380--- old/include/Qt3D/QGLColladaFxEffectFactory 1970-01-01 00:00:00.000000000 +0000
381+++ new/include/Qt3D/QGLColladaFxEffectFactory 2013-07-31 10:15:41.000000000 +0000
382@@ -0,0 +1 @@
383+#include "qglcolladafxeffectfactory.h"
384diff -urN old/include/Qt3D/qglcolladafxeffectfactory.h new/include/Qt3D/qglcolladafxeffectfactory.h
385--- old/include/Qt3D/qglcolladafxeffectfactory.h 1970-01-01 00:00:00.000000000 +0000
386+++ new/include/Qt3D/qglcolladafxeffectfactory.h 2013-07-31 10:15:41.000000000 +0000
387@@ -0,0 +1 @@
388+#include "../../src/threed/effects/qglcolladafxeffectfactory.h"
389diff -urN old/include/Qt3D/qglcolladafxeffect.h new/include/Qt3D/qglcolladafxeffect.h
390--- old/include/Qt3D/qglcolladafxeffect.h 1970-01-01 00:00:00.000000000 +0000
391+++ new/include/Qt3D/qglcolladafxeffect.h 2013-07-31 10:15:41.000000000 +0000
392@@ -0,0 +1 @@
393+#include "../../src/threed/effects/qglcolladafxeffect.h"
394diff -urN old/include/Qt3D/QGLColladaFxEffectLoader new/include/Qt3D/QGLColladaFxEffectLoader
395--- old/include/Qt3D/QGLColladaFxEffectLoader 1970-01-01 00:00:00.000000000 +0000
396+++ new/include/Qt3D/QGLColladaFxEffectLoader 2013-07-31 10:15:41.000000000 +0000
397@@ -0,0 +1 @@
398+#include "qglcolladafxeffectloader.h"
399diff -urN old/include/Qt3D/qglcolladafxeffectloader.h new/include/Qt3D/qglcolladafxeffectloader.h
400--- old/include/Qt3D/qglcolladafxeffectloader.h 1970-01-01 00:00:00.000000000 +0000
401+++ new/include/Qt3D/qglcolladafxeffectloader.h 2013-07-31 10:15:41.000000000 +0000
402@@ -0,0 +1 @@
403+#include "../../src/threed/effects/qglcolladafxeffectloader.h"
404diff -urN old/include/Qt3D/QGLColladaImageParam new/include/Qt3D/QGLColladaImageParam
405--- old/include/Qt3D/QGLColladaImageParam 1970-01-01 00:00:00.000000000 +0000
406+++ new/include/Qt3D/QGLColladaImageParam 2013-07-31 10:15:41.000000000 +0000
407@@ -0,0 +1 @@
408+#include "qglcolladafxeffectfactory.h"
409diff -urN old/include/Qt3D/QGLColladaParam new/include/Qt3D/QGLColladaParam
410--- old/include/Qt3D/QGLColladaParam 1970-01-01 00:00:00.000000000 +0000
411+++ new/include/Qt3D/QGLColladaParam 2013-07-31 10:15:41.000000000 +0000
412@@ -0,0 +1 @@
413+#include "qglcolladafxeffectfactory.h"
414diff -urN old/include/Qt3D/QGLColladaSampler2DParam new/include/Qt3D/QGLColladaSampler2DParam
415--- old/include/Qt3D/QGLColladaSampler2DParam 1970-01-01 00:00:00.000000000 +0000
416+++ new/include/Qt3D/QGLColladaSampler2DParam 2013-07-31 10:15:41.000000000 +0000
417@@ -0,0 +1 @@
418+#include "qglcolladafxeffectfactory.h"
419diff -urN old/include/Qt3D/QGLColladaSurfaceParam new/include/Qt3D/QGLColladaSurfaceParam
420--- old/include/Qt3D/QGLColladaSurfaceParam 1970-01-01 00:00:00.000000000 +0000
421+++ new/include/Qt3D/QGLColladaSurfaceParam 2013-07-31 10:15:41.000000000 +0000
422@@ -0,0 +1 @@
423+#include "qglcolladafxeffectfactory.h"
424diff -urN old/include/Qt3D/QGLColladaTextureParam new/include/Qt3D/QGLColladaTextureParam
425--- old/include/Qt3D/QGLColladaTextureParam 1970-01-01 00:00:00.000000000 +0000
426+++ new/include/Qt3D/QGLColladaTextureParam 2013-07-31 10:15:41.000000000 +0000
427@@ -0,0 +1 @@
428+#include "qglcolladafxeffectfactory.h"
429diff -urN old/include/Qt3D/QGLColorMaterial new/include/Qt3D/QGLColorMaterial
430--- old/include/Qt3D/QGLColorMaterial 1970-01-01 00:00:00.000000000 +0000
431+++ new/include/Qt3D/QGLColorMaterial 2013-07-31 10:15:41.000000000 +0000
432@@ -0,0 +1 @@
433+#include "qglcolormaterial.h"
434diff -urN old/include/Qt3D/qglcolormaterial.h new/include/Qt3D/qglcolormaterial.h
435--- old/include/Qt3D/qglcolormaterial.h 1970-01-01 00:00:00.000000000 +0000
436+++ new/include/Qt3D/qglcolormaterial.h 2013-07-31 10:15:41.000000000 +0000
437@@ -0,0 +1 @@
438+#include "../../src/threed/materials/qglcolormaterial.h"
439diff -urN old/include/Qt3D/QGLCube new/include/Qt3D/QGLCube
440--- old/include/Qt3D/QGLCube 1970-01-01 00:00:00.000000000 +0000
441+++ new/include/Qt3D/QGLCube 2013-07-31 10:15:41.000000000 +0000
442@@ -0,0 +1 @@
443+#include "qglcube.h"
444diff -urN old/include/Qt3D/qglcube.h new/include/Qt3D/qglcube.h
445--- old/include/Qt3D/qglcube.h 1970-01-01 00:00:00.000000000 +0000
446+++ new/include/Qt3D/qglcube.h 2013-07-31 10:15:41.000000000 +0000
447@@ -0,0 +1 @@
448+#include "../../src/threed/geometry/qglcube.h"
449diff -urN old/include/Qt3D/QGLCylinder new/include/Qt3D/QGLCylinder
450--- old/include/Qt3D/QGLCylinder 1970-01-01 00:00:00.000000000 +0000
451+++ new/include/Qt3D/QGLCylinder 2013-07-31 10:15:41.000000000 +0000
452@@ -0,0 +1 @@
453+#include "qglcylinder.h"
454diff -urN old/include/Qt3D/qglcylinder.h new/include/Qt3D/qglcylinder.h
455--- old/include/Qt3D/qglcylinder.h 1970-01-01 00:00:00.000000000 +0000
456+++ new/include/Qt3D/qglcylinder.h 2013-07-31 10:15:41.000000000 +0000
457@@ -0,0 +1 @@
458+#include "../../src/threed/geometry/qglcylinder.h"
459diff -urN old/include/Qt3D/QGLDome new/include/Qt3D/QGLDome
460--- old/include/Qt3D/QGLDome 1970-01-01 00:00:00.000000000 +0000
461+++ new/include/Qt3D/QGLDome 2013-07-31 10:15:41.000000000 +0000
462@@ -0,0 +1 @@
463+#include "qgldome.h"
464diff -urN old/include/Qt3D/qgldome.h new/include/Qt3D/qgldome.h
465--- old/include/Qt3D/qgldome.h 1970-01-01 00:00:00.000000000 +0000
466+++ new/include/Qt3D/qgldome.h 2013-07-31 10:15:41.000000000 +0000
467@@ -0,0 +1 @@
468+#include "../../src/threed/geometry/qgldome.h"
469diff -urN old/include/Qt3D/QGLFramebufferObjectSurface new/include/Qt3D/QGLFramebufferObjectSurface
470--- old/include/Qt3D/QGLFramebufferObjectSurface 1970-01-01 00:00:00.000000000 +0000
471+++ new/include/Qt3D/QGLFramebufferObjectSurface 2013-07-31 10:15:41.000000000 +0000
472@@ -0,0 +1 @@
473+#include "qglframebufferobjectsurface.h"
474diff -urN old/include/Qt3D/qglframebufferobjectsurface.h new/include/Qt3D/qglframebufferobjectsurface.h
475--- old/include/Qt3D/qglframebufferobjectsurface.h 1970-01-01 00:00:00.000000000 +0000
476+++ new/include/Qt3D/qglframebufferobjectsurface.h 2013-07-31 10:15:41.000000000 +0000
477@@ -0,0 +1 @@
478+#include "../../src/threed/surfaces/qglframebufferobjectsurface.h"
479diff -urN old/include/Qt3D/QGLIndexBuffer new/include/Qt3D/QGLIndexBuffer
480--- old/include/Qt3D/QGLIndexBuffer 1970-01-01 00:00:00.000000000 +0000
481+++ new/include/Qt3D/QGLIndexBuffer 2013-07-31 10:15:41.000000000 +0000
482@@ -0,0 +1 @@
483+#include "qglindexbuffer.h"
484diff -urN old/include/Qt3D/qglindexbuffer.h new/include/Qt3D/qglindexbuffer.h
485--- old/include/Qt3D/qglindexbuffer.h 1970-01-01 00:00:00.000000000 +0000
486+++ new/include/Qt3D/qglindexbuffer.h 2013-07-31 10:15:41.000000000 +0000
487@@ -0,0 +1 @@
488+#include "../../src/threed/arrays/qglindexbuffer.h"
489diff -urN old/include/Qt3D/QGLLightModel new/include/Qt3D/QGLLightModel
490--- old/include/Qt3D/QGLLightModel 1970-01-01 00:00:00.000000000 +0000
491+++ new/include/Qt3D/QGLLightModel 2013-07-31 10:15:41.000000000 +0000
492@@ -0,0 +1 @@
493+#include "qgllightmodel.h"
494diff -urN old/include/Qt3D/qgllightmodel.h new/include/Qt3D/qgllightmodel.h
495--- old/include/Qt3D/qgllightmodel.h 1970-01-01 00:00:00.000000000 +0000
496+++ new/include/Qt3D/qgllightmodel.h 2013-07-31 10:15:41.000000000 +0000
497@@ -0,0 +1 @@
498+#include "../../src/threed/painting/qgllightmodel.h"
499diff -urN old/include/Qt3D/QGLLightParameters new/include/Qt3D/QGLLightParameters
500--- old/include/Qt3D/QGLLightParameters 1970-01-01 00:00:00.000000000 +0000
501+++ new/include/Qt3D/QGLLightParameters 2013-07-31 10:15:41.000000000 +0000
502@@ -0,0 +1 @@
503+#include "qgllightparameters.h"
504diff -urN old/include/Qt3D/qgllightparameters.h new/include/Qt3D/qgllightparameters.h
505--- old/include/Qt3D/qgllightparameters.h 1970-01-01 00:00:00.000000000 +0000
506+++ new/include/Qt3D/qgllightparameters.h 2013-07-31 10:15:41.000000000 +0000
507@@ -0,0 +1 @@
508+#include "../../src/threed/painting/qgllightparameters.h"
509diff -urN old/include/Qt3D/QGLMaterial new/include/Qt3D/QGLMaterial
510--- old/include/Qt3D/QGLMaterial 1970-01-01 00:00:00.000000000 +0000
511+++ new/include/Qt3D/QGLMaterial 2013-07-31 10:15:41.000000000 +0000
512@@ -0,0 +1 @@
513+#include "qglmaterial.h"
514diff -urN old/include/Qt3D/QGLMaterialCollection new/include/Qt3D/QGLMaterialCollection
515--- old/include/Qt3D/QGLMaterialCollection 1970-01-01 00:00:00.000000000 +0000
516+++ new/include/Qt3D/QGLMaterialCollection 2013-07-31 10:15:41.000000000 +0000
517@@ -0,0 +1 @@
518+#include "qglmaterialcollection.h"
519diff -urN old/include/Qt3D/qglmaterialcollection.h new/include/Qt3D/qglmaterialcollection.h
520--- old/include/Qt3D/qglmaterialcollection.h 1970-01-01 00:00:00.000000000 +0000
521+++ new/include/Qt3D/qglmaterialcollection.h 2013-07-31 10:15:41.000000000 +0000
522@@ -0,0 +1 @@
523+#include "../../src/threed/geometry/qglmaterialcollection.h"
524diff -urN old/include/Qt3D/qglmaterial.h new/include/Qt3D/qglmaterial.h
525--- old/include/Qt3D/qglmaterial.h 1970-01-01 00:00:00.000000000 +0000
526+++ new/include/Qt3D/qglmaterial.h 2013-07-31 10:15:41.000000000 +0000
527@@ -0,0 +1 @@
528+#include "../../src/threed/materials/qglmaterial.h"
529diff -urN old/include/Qt3D/QGLMockView new/include/Qt3D/QGLMockView
530--- old/include/Qt3D/QGLMockView 1970-01-01 00:00:00.000000000 +0000
531+++ new/include/Qt3D/QGLMockView 2013-07-31 10:15:41.000000000 +0000
532@@ -0,0 +1 @@
533+#include "qglmockview.h"
534diff -urN old/include/Qt3D/qglmockview.h new/include/Qt3D/qglmockview.h
535--- old/include/Qt3D/qglmockview.h 1970-01-01 00:00:00.000000000 +0000
536+++ new/include/Qt3D/qglmockview.h 2013-07-31 10:15:41.000000000 +0000
537@@ -0,0 +1 @@
538+#include "../../src/threed/viewing/qglmockview.h"
539diff -urN old/include/Qt3D/qglnamespace.h new/include/Qt3D/qglnamespace.h
540--- old/include/Qt3D/qglnamespace.h 1970-01-01 00:00:00.000000000 +0000
541+++ new/include/Qt3D/qglnamespace.h 2013-07-31 10:15:41.000000000 +0000
542@@ -0,0 +1 @@
543+#include "../../src/threed/global/qglnamespace.h"
544diff -urN old/include/Qt3D/QGLPainter new/include/Qt3D/QGLPainter
545--- old/include/Qt3D/QGLPainter 1970-01-01 00:00:00.000000000 +0000
546+++ new/include/Qt3D/QGLPainter 2013-07-31 10:15:41.000000000 +0000
547@@ -0,0 +1 @@
548+#include "qglpainter.h"
549diff -urN old/include/Qt3D/qglpainter.h new/include/Qt3D/qglpainter.h
550--- old/include/Qt3D/qglpainter.h 1970-01-01 00:00:00.000000000 +0000
551+++ new/include/Qt3D/qglpainter.h 2013-07-31 10:15:41.000000000 +0000
552@@ -0,0 +1 @@
553+#include "../../src/threed/painting/qglpainter.h"
554diff -urN old/include/Qt3D/QGLPickNode new/include/Qt3D/QGLPickNode
555--- old/include/Qt3D/QGLPickNode 1970-01-01 00:00:00.000000000 +0000
556+++ new/include/Qt3D/QGLPickNode 2013-07-31 10:15:41.000000000 +0000
557@@ -0,0 +1 @@
558+#include "qglpicknode.h"
559diff -urN old/include/Qt3D/qglpicknode.h new/include/Qt3D/qglpicknode.h
560--- old/include/Qt3D/qglpicknode.h 1970-01-01 00:00:00.000000000 +0000
561+++ new/include/Qt3D/qglpicknode.h 2013-07-31 10:15:41.000000000 +0000
562@@ -0,0 +1 @@
563+#include "../../src/threed/scene/qglpicknode.h"
564diff -urN old/include/Qt3D/QGLPixelBufferSurface new/include/Qt3D/QGLPixelBufferSurface
565--- old/include/Qt3D/QGLPixelBufferSurface 1970-01-01 00:00:00.000000000 +0000
566+++ new/include/Qt3D/QGLPixelBufferSurface 2013-07-31 10:15:41.000000000 +0000
567@@ -0,0 +1 @@
568+#include "qglpixelbuffersurface.h"
569diff -urN old/include/Qt3D/qglpixelbuffersurface.h new/include/Qt3D/qglpixelbuffersurface.h
570--- old/include/Qt3D/qglpixelbuffersurface.h 1970-01-01 00:00:00.000000000 +0000
571+++ new/include/Qt3D/qglpixelbuffersurface.h 2013-07-31 10:15:41.000000000 +0000
572@@ -0,0 +1 @@
573+#include "../../src/threed/surfaces/qglpixelbuffersurface.h"
574diff -urN old/include/Qt3D/QGLRenderOrder new/include/Qt3D/QGLRenderOrder
575--- old/include/Qt3D/QGLRenderOrder 1970-01-01 00:00:00.000000000 +0000
576+++ new/include/Qt3D/QGLRenderOrder 2013-07-31 10:15:41.000000000 +0000
577@@ -0,0 +1 @@
578+#include "qglrenderorder.h"
579diff -urN old/include/Qt3D/QGLRenderOrderComparator new/include/Qt3D/QGLRenderOrderComparator
580--- old/include/Qt3D/QGLRenderOrderComparator 1970-01-01 00:00:00.000000000 +0000
581+++ new/include/Qt3D/QGLRenderOrderComparator 2013-07-31 10:15:41.000000000 +0000
582@@ -0,0 +1 @@
583+#include "qglrenderordercomparator.h"
584diff -urN old/include/Qt3D/qglrenderordercomparator.h new/include/Qt3D/qglrenderordercomparator.h
585--- old/include/Qt3D/qglrenderordercomparator.h 1970-01-01 00:00:00.000000000 +0000
586+++ new/include/Qt3D/qglrenderordercomparator.h 2013-07-31 10:15:41.000000000 +0000
587@@ -0,0 +1 @@
588+#include "../../src/threed/scene/qglrenderordercomparator.h"
589diff -urN old/include/Qt3D/qglrenderorder.h new/include/Qt3D/qglrenderorder.h
590--- old/include/Qt3D/qglrenderorder.h 1970-01-01 00:00:00.000000000 +0000
591+++ new/include/Qt3D/qglrenderorder.h 2013-07-31 10:15:41.000000000 +0000
592@@ -0,0 +1 @@
593+#include "../../src/threed/scene/qglrenderorder.h"
594diff -urN old/include/Qt3D/QGLRenderSequencer new/include/Qt3D/QGLRenderSequencer
595--- old/include/Qt3D/QGLRenderSequencer 1970-01-01 00:00:00.000000000 +0000
596+++ new/include/Qt3D/QGLRenderSequencer 2013-07-31 10:15:41.000000000 +0000
597@@ -0,0 +1 @@
598+#include "qglrendersequencer.h"
599diff -urN old/include/Qt3D/qglrendersequencer.h new/include/Qt3D/qglrendersequencer.h
600--- old/include/Qt3D/qglrendersequencer.h 1970-01-01 00:00:00.000000000 +0000
601+++ new/include/Qt3D/qglrendersequencer.h 2013-07-31 10:15:41.000000000 +0000
602@@ -0,0 +1 @@
603+#include "../../src/threed/scene/qglrendersequencer.h"
604diff -urN old/include/Qt3D/QGLRenderState new/include/Qt3D/QGLRenderState
605--- old/include/Qt3D/QGLRenderState 1970-01-01 00:00:00.000000000 +0000
606+++ new/include/Qt3D/QGLRenderState 2013-07-31 10:15:41.000000000 +0000
607@@ -0,0 +1 @@
608+#include "qglrenderstate.h"
609diff -urN old/include/Qt3D/qglrenderstate.h new/include/Qt3D/qglrenderstate.h
610--- old/include/Qt3D/qglrenderstate.h 1970-01-01 00:00:00.000000000 +0000
611+++ new/include/Qt3D/qglrenderstate.h 2013-07-31 10:15:41.000000000 +0000
612@@ -0,0 +1 @@
613+#include "../../src/threed/scene/qglrenderstate.h"
614diff -urN old/include/Qt3D/QGLSceneAnimation new/include/Qt3D/QGLSceneAnimation
615--- old/include/Qt3D/QGLSceneAnimation 1970-01-01 00:00:00.000000000 +0000
616+++ new/include/Qt3D/QGLSceneAnimation 2013-07-31 10:15:41.000000000 +0000
617@@ -0,0 +1 @@
618+#include "qglsceneanimation.h"
619diff -urN old/include/Qt3D/qglsceneanimation.h new/include/Qt3D/qglsceneanimation.h
620--- old/include/Qt3D/qglsceneanimation.h 1970-01-01 00:00:00.000000000 +0000
621+++ new/include/Qt3D/qglsceneanimation.h 2013-07-31 10:15:41.000000000 +0000
622@@ -0,0 +1 @@
623+#include "../../src/threed/scene/qglsceneanimation.h"
624diff -urN old/include/Qt3D/QGLSceneFormatFactoryInterface new/include/Qt3D/QGLSceneFormatFactoryInterface
625--- old/include/Qt3D/QGLSceneFormatFactoryInterface 1970-01-01 00:00:00.000000000 +0000
626+++ new/include/Qt3D/QGLSceneFormatFactoryInterface 2013-07-31 10:15:41.000000000 +0000
627@@ -0,0 +1 @@
628+#include "qglsceneformatplugin.h"
629diff -urN old/include/Qt3D/QGLSceneFormatHandler new/include/Qt3D/QGLSceneFormatHandler
630--- old/include/Qt3D/QGLSceneFormatHandler 1970-01-01 00:00:00.000000000 +0000
631+++ new/include/Qt3D/QGLSceneFormatHandler 2013-07-31 10:15:41.000000000 +0000
632@@ -0,0 +1 @@
633+#include "qglsceneformatplugin.h"
634diff -urN old/include/Qt3D/qglsceneformatplugin.h new/include/Qt3D/qglsceneformatplugin.h
635--- old/include/Qt3D/qglsceneformatplugin.h 1970-01-01 00:00:00.000000000 +0000
636+++ new/include/Qt3D/qglsceneformatplugin.h 2013-07-31 10:15:41.000000000 +0000
637@@ -0,0 +1 @@
638+#include "../../src/threed/scene/qglsceneformatplugin.h"
639diff -urN old/include/Qt3D/QGLSceneNode new/include/Qt3D/QGLSceneNode
640--- old/include/Qt3D/QGLSceneNode 1970-01-01 00:00:00.000000000 +0000
641+++ new/include/Qt3D/QGLSceneNode 2013-07-31 10:15:41.000000000 +0000
642@@ -0,0 +1 @@
643+#include "qglscenenode.h"
644diff -urN old/include/Qt3D/qglscenenode.h new/include/Qt3D/qglscenenode.h
645--- old/include/Qt3D/qglscenenode.h 1970-01-01 00:00:00.000000000 +0000
646+++ new/include/Qt3D/qglscenenode.h 2013-07-31 10:15:41.000000000 +0000
647@@ -0,0 +1 @@
648+#include "../../src/threed/scene/qglscenenode.h"
649diff -urN old/include/Qt3D/QGLShaderProgramEffect new/include/Qt3D/QGLShaderProgramEffect
650--- old/include/Qt3D/QGLShaderProgramEffect 1970-01-01 00:00:00.000000000 +0000
651+++ new/include/Qt3D/QGLShaderProgramEffect 2013-07-31 10:15:41.000000000 +0000
652@@ -0,0 +1 @@
653+#include "qglshaderprogrameffect.h"
654diff -urN old/include/Qt3D/qglshaderprogrameffect.h new/include/Qt3D/qglshaderprogrameffect.h
655--- old/include/Qt3D/qglshaderprogrameffect.h 1970-01-01 00:00:00.000000000 +0000
656+++ new/include/Qt3D/qglshaderprogrameffect.h 2013-07-31 10:15:41.000000000 +0000
657@@ -0,0 +1 @@
658+#include "../../src/threed/effects/qglshaderprogrameffect.h"
659diff -urN old/include/Qt3D/QGLSphere new/include/Qt3D/QGLSphere
660--- old/include/Qt3D/QGLSphere 1970-01-01 00:00:00.000000000 +0000
661+++ new/include/Qt3D/QGLSphere 2013-07-31 10:15:41.000000000 +0000
662@@ -0,0 +1 @@
663+#include "qglsphere.h"
664diff -urN old/include/Qt3D/qglsphere.h new/include/Qt3D/qglsphere.h
665--- old/include/Qt3D/qglsphere.h 1970-01-01 00:00:00.000000000 +0000
666+++ new/include/Qt3D/qglsphere.h 2013-07-31 10:15:41.000000000 +0000
667@@ -0,0 +1 @@
668+#include "../../src/threed/geometry/qglsphere.h"
669diff -urN old/include/Qt3D/QGLSubsurface new/include/Qt3D/QGLSubsurface
670--- old/include/Qt3D/QGLSubsurface 1970-01-01 00:00:00.000000000 +0000
671+++ new/include/Qt3D/QGLSubsurface 2013-07-31 10:15:41.000000000 +0000
672@@ -0,0 +1 @@
673+#include "qglsubsurface.h"
674diff -urN old/include/Qt3D/qglsubsurface.h new/include/Qt3D/qglsubsurface.h
675--- old/include/Qt3D/qglsubsurface.h 1970-01-01 00:00:00.000000000 +0000
676+++ new/include/Qt3D/qglsubsurface.h 2013-07-31 10:15:41.000000000 +0000
677@@ -0,0 +1 @@
678+#include "../../src/threed/surfaces/qglsubsurface.h"
679diff -urN old/include/Qt3D/QGLTeapot new/include/Qt3D/QGLTeapot
680--- old/include/Qt3D/QGLTeapot 1970-01-01 00:00:00.000000000 +0000
681+++ new/include/Qt3D/QGLTeapot 2013-07-31 10:15:41.000000000 +0000
682@@ -0,0 +1 @@
683+#include "qglteapot.h"
684diff -urN old/include/Qt3D/qglteapot.h new/include/Qt3D/qglteapot.h
685--- old/include/Qt3D/qglteapot.h 1970-01-01 00:00:00.000000000 +0000
686+++ new/include/Qt3D/qglteapot.h 2013-07-31 10:15:41.000000000 +0000
687@@ -0,0 +1 @@
688+#include "../../src/threed/geometry/qglteapot.h"
689diff -urN old/include/Qt3D/QGLTexture2D new/include/Qt3D/QGLTexture2D
690--- old/include/Qt3D/QGLTexture2D 1970-01-01 00:00:00.000000000 +0000
691+++ new/include/Qt3D/QGLTexture2D 2013-07-31 10:15:41.000000000 +0000
692@@ -0,0 +1 @@
693+#include "qgltexture2d.h"
694diff -urN old/include/Qt3D/qgltexture2d.h new/include/Qt3D/qgltexture2d.h
695--- old/include/Qt3D/qgltexture2d.h 1970-01-01 00:00:00.000000000 +0000
696+++ new/include/Qt3D/qgltexture2d.h 2013-07-31 10:15:41.000000000 +0000
697@@ -0,0 +1 @@
698+#include "../../src/threed/textures/qgltexture2d.h"
699diff -urN old/include/Qt3D/QGLTextureCube new/include/Qt3D/QGLTextureCube
700--- old/include/Qt3D/QGLTextureCube 1970-01-01 00:00:00.000000000 +0000
701+++ new/include/Qt3D/QGLTextureCube 2013-07-31 10:15:41.000000000 +0000
702@@ -0,0 +1 @@
703+#include "qgltexturecube.h"
704diff -urN old/include/Qt3D/qgltexturecube.h new/include/Qt3D/qgltexturecube.h
705--- old/include/Qt3D/qgltexturecube.h 1970-01-01 00:00:00.000000000 +0000
706+++ new/include/Qt3D/qgltexturecube.h 2013-07-31 10:15:41.000000000 +0000
707@@ -0,0 +1 @@
708+#include "../../src/threed/textures/qgltexturecube.h"
709diff -urN old/include/Qt3D/QGLTwoSidedMaterial new/include/Qt3D/QGLTwoSidedMaterial
710--- old/include/Qt3D/QGLTwoSidedMaterial 1970-01-01 00:00:00.000000000 +0000
711+++ new/include/Qt3D/QGLTwoSidedMaterial 2013-07-31 10:15:41.000000000 +0000
712@@ -0,0 +1 @@
713+#include "qgltwosidedmaterial.h"
714diff -urN old/include/Qt3D/qgltwosidedmaterial.h new/include/Qt3D/qgltwosidedmaterial.h
715--- old/include/Qt3D/qgltwosidedmaterial.h 1970-01-01 00:00:00.000000000 +0000
716+++ new/include/Qt3D/qgltwosidedmaterial.h 2013-07-31 10:15:41.000000000 +0000
717@@ -0,0 +1 @@
718+#include "../../src/threed/materials/qgltwosidedmaterial.h"
719diff -urN old/include/Qt3D/QGLVertexBundle new/include/Qt3D/QGLVertexBundle
720--- old/include/Qt3D/QGLVertexBundle 1970-01-01 00:00:00.000000000 +0000
721+++ new/include/Qt3D/QGLVertexBundle 2013-07-31 10:15:41.000000000 +0000
722@@ -0,0 +1 @@
723+#include "qglvertexbundle.h"
724diff -urN old/include/Qt3D/qglvertexbundle.h new/include/Qt3D/qglvertexbundle.h
725--- old/include/Qt3D/qglvertexbundle.h 1970-01-01 00:00:00.000000000 +0000
726+++ new/include/Qt3D/qglvertexbundle.h 2013-07-31 10:15:41.000000000 +0000
727@@ -0,0 +1 @@
728+#include "../../src/threed/arrays/qglvertexbundle.h"
729diff -urN old/include/Qt3D/QGLView new/include/Qt3D/QGLView
730--- old/include/Qt3D/QGLView 1970-01-01 00:00:00.000000000 +0000
731+++ new/include/Qt3D/QGLView 2013-07-31 10:15:41.000000000 +0000
732@@ -0,0 +1 @@
733+#include "qglview.h"
734diff -urN old/include/Qt3D/qglview.h new/include/Qt3D/qglview.h
735--- old/include/Qt3D/qglview.h 1970-01-01 00:00:00.000000000 +0000
736+++ new/include/Qt3D/qglview.h 2013-07-31 10:15:41.000000000 +0000
737@@ -0,0 +1 @@
738+#include "../../src/threed/viewing/qglview.h"
739diff -urN old/include/Qt3D/QGLWindowSurface new/include/Qt3D/QGLWindowSurface
740--- old/include/Qt3D/QGLWindowSurface 1970-01-01 00:00:00.000000000 +0000
741+++ new/include/Qt3D/QGLWindowSurface 2013-07-31 10:15:41.000000000 +0000
742@@ -0,0 +1 @@
743+#include "qglwindowsurface.h"
744diff -urN old/include/Qt3D/qglwindowsurface.h new/include/Qt3D/qglwindowsurface.h
745--- old/include/Qt3D/qglwindowsurface.h 1970-01-01 00:00:00.000000000 +0000
746+++ new/include/Qt3D/qglwindowsurface.h 2013-07-31 10:15:41.000000000 +0000
747@@ -0,0 +1 @@
748+#include "../../src/threed/surfaces/qglwindowsurface.h"
749diff -urN old/include/Qt3D/QGraphicsBillboardTransform new/include/Qt3D/QGraphicsBillboardTransform
750--- old/include/Qt3D/QGraphicsBillboardTransform 1970-01-01 00:00:00.000000000 +0000
751+++ new/include/Qt3D/QGraphicsBillboardTransform 2013-07-31 10:15:41.000000000 +0000
752@@ -0,0 +1 @@
753+#include "qgraphicsbillboardtransform.h"
754diff -urN old/include/Qt3D/qgraphicsbillboardtransform.h new/include/Qt3D/qgraphicsbillboardtransform.h
755--- old/include/Qt3D/qgraphicsbillboardtransform.h 1970-01-01 00:00:00.000000000 +0000
756+++ new/include/Qt3D/qgraphicsbillboardtransform.h 2013-07-31 10:15:41.000000000 +0000
757@@ -0,0 +1 @@
758+#include "../../src/threed/graphicsview/qgraphicsbillboardtransform.h"
759diff -urN old/include/Qt3D/QGraphicsRotation3D new/include/Qt3D/QGraphicsRotation3D
760--- old/include/Qt3D/QGraphicsRotation3D 1970-01-01 00:00:00.000000000 +0000
761+++ new/include/Qt3D/QGraphicsRotation3D 2013-07-31 10:15:41.000000000 +0000
762@@ -0,0 +1 @@
763+#include "qgraphicsrotation3d.h"
764diff -urN old/include/Qt3D/qgraphicsrotation3d.h new/include/Qt3D/qgraphicsrotation3d.h
765--- old/include/Qt3D/qgraphicsrotation3d.h 1970-01-01 00:00:00.000000000 +0000
766+++ new/include/Qt3D/qgraphicsrotation3d.h 2013-07-31 10:15:41.000000000 +0000
767@@ -0,0 +1 @@
768+#include "../../src/threed/graphicsview/qgraphicsrotation3d.h"
769diff -urN old/include/Qt3D/QGraphicsScale3D new/include/Qt3D/QGraphicsScale3D
770--- old/include/Qt3D/QGraphicsScale3D 1970-01-01 00:00:00.000000000 +0000
771+++ new/include/Qt3D/QGraphicsScale3D 2013-07-31 10:15:41.000000000 +0000
772@@ -0,0 +1 @@
773+#include "qgraphicsscale3d.h"
774diff -urN old/include/Qt3D/qgraphicsscale3d.h new/include/Qt3D/qgraphicsscale3d.h
775--- old/include/Qt3D/qgraphicsscale3d.h 1970-01-01 00:00:00.000000000 +0000
776+++ new/include/Qt3D/qgraphicsscale3d.h 2013-07-31 10:15:41.000000000 +0000
777@@ -0,0 +1 @@
778+#include "../../src/threed/graphicsview/qgraphicsscale3d.h"
779diff -urN old/include/Qt3D/qgraphicstransform3d.h new/include/Qt3D/qgraphicstransform3d.h
780--- old/include/Qt3D/qgraphicstransform3d.h 1970-01-01 00:00:00.000000000 +0000
781+++ new/include/Qt3D/qgraphicstransform3d.h 2013-07-31 10:15:41.000000000 +0000
782@@ -0,0 +1 @@
783+#include "../../src/threed/graphicsview/qgraphicstransform3d.h"
784diff -urN old/include/Qt3D/QGraphicsTranslation3D new/include/Qt3D/QGraphicsTranslation3D
785--- old/include/Qt3D/QGraphicsTranslation3D 1970-01-01 00:00:00.000000000 +0000
786+++ new/include/Qt3D/QGraphicsTranslation3D 2013-07-31 10:15:41.000000000 +0000
787@@ -0,0 +1 @@
788+#include "qgraphicstranslation3d.h"
789diff -urN old/include/Qt3D/qgraphicstranslation3d.h new/include/Qt3D/qgraphicstranslation3d.h
790--- old/include/Qt3D/qgraphicstranslation3d.h 1970-01-01 00:00:00.000000000 +0000
791+++ new/include/Qt3D/qgraphicstranslation3d.h 2013-07-31 10:15:41.000000000 +0000
792@@ -0,0 +1 @@
793+#include "../../src/threed/graphicsview/qgraphicstranslation3d.h"
794diff -urN old/include/Qt3D/QLogicalVertex new/include/Qt3D/QLogicalVertex
795--- old/include/Qt3D/QLogicalVertex 1970-01-01 00:00:00.000000000 +0000
796+++ new/include/Qt3D/QLogicalVertex 2013-07-31 10:15:41.000000000 +0000
797@@ -0,0 +1 @@
798+#include "qlogicalvertex.h"
799diff -urN old/include/Qt3D/qlogicalvertex.h new/include/Qt3D/qlogicalvertex.h
800--- old/include/Qt3D/qlogicalvertex.h 1970-01-01 00:00:00.000000000 +0000
801+++ new/include/Qt3D/qlogicalvertex.h 2013-07-31 10:15:41.000000000 +0000
802@@ -0,0 +1 @@
803+#include "../../src/threed/geometry/qlogicalvertex.h"
804diff -urN old/include/Qt3D/QMatrix4x4Stack new/include/Qt3D/QMatrix4x4Stack
805--- old/include/Qt3D/QMatrix4x4Stack 1970-01-01 00:00:00.000000000 +0000
806+++ new/include/Qt3D/QMatrix4x4Stack 2013-07-31 10:15:41.000000000 +0000
807@@ -0,0 +1 @@
808+#include "qmatrix4x4stack.h"
809diff -urN old/include/Qt3D/qmatrix4x4stack.h new/include/Qt3D/qmatrix4x4stack.h
810--- old/include/Qt3D/qmatrix4x4stack.h 1970-01-01 00:00:00.000000000 +0000
811+++ new/include/Qt3D/qmatrix4x4stack.h 2013-07-31 10:15:41.000000000 +0000
812@@ -0,0 +1 @@
813+#include "../../src/threed/painting/qmatrix4x4stack.h"
814diff -urN old/include/Qt3D/QPlane3D new/include/Qt3D/QPlane3D
815--- old/include/Qt3D/QPlane3D 1970-01-01 00:00:00.000000000 +0000
816+++ new/include/Qt3D/QPlane3D 2013-07-31 10:15:41.000000000 +0000
817@@ -0,0 +1 @@
818+#include "qplane3d.h"
819diff -urN old/include/Qt3D/qplane3d.h new/include/Qt3D/qplane3d.h
820--- old/include/Qt3D/qplane3d.h 1970-01-01 00:00:00.000000000 +0000
821+++ new/include/Qt3D/qplane3d.h 2013-07-31 10:15:41.000000000 +0000
822@@ -0,0 +1 @@
823+#include "../../src/threed/math3d/qplane3d.h"
824diff -urN old/include/Qt3D/QQuickQGraphicsTransform3D new/include/Qt3D/QQuickQGraphicsTransform3D
825--- old/include/Qt3D/QQuickQGraphicsTransform3D 1970-01-01 00:00:00.000000000 +0000
826+++ new/include/Qt3D/QQuickQGraphicsTransform3D 2013-07-31 10:15:41.000000000 +0000
827@@ -0,0 +1 @@
828+#include "qgraphicstransform3d.h"
829diff -urN old/include/Qt3D/QRay3D new/include/Qt3D/QRay3D
830--- old/include/Qt3D/QRay3D 1970-01-01 00:00:00.000000000 +0000
831+++ new/include/Qt3D/QRay3D 2013-07-31 10:15:41.000000000 +0000
832@@ -0,0 +1 @@
833+#include "qray3d.h"
834diff -urN old/include/Qt3D/qray3d.h new/include/Qt3D/qray3d.h
835--- old/include/Qt3D/qray3d.h 1970-01-01 00:00:00.000000000 +0000
836+++ new/include/Qt3D/qray3d.h 2013-07-31 10:15:41.000000000 +0000
837@@ -0,0 +1 @@
838+#include "../../src/threed/math3d/qray3d.h"
839diff -urN old/include/Qt3D/QSimpleAreaAllocator new/include/Qt3D/QSimpleAreaAllocator
840--- old/include/Qt3D/QSimpleAreaAllocator 1970-01-01 00:00:00.000000000 +0000
841+++ new/include/Qt3D/QSimpleAreaAllocator 2013-07-31 10:15:41.000000000 +0000
842@@ -0,0 +1 @@
843+#include "qareaallocator.h"
844diff -urN old/include/Qt3D/QSphere3D new/include/Qt3D/QSphere3D
845--- old/include/Qt3D/QSphere3D 1970-01-01 00:00:00.000000000 +0000
846+++ new/include/Qt3D/QSphere3D 2013-07-31 10:15:41.000000000 +0000
847@@ -0,0 +1 @@
848+#include "qsphere3d.h"
849diff -urN old/include/Qt3D/qsphere3d.h new/include/Qt3D/qsphere3d.h
850--- old/include/Qt3D/qsphere3d.h 1970-01-01 00:00:00.000000000 +0000
851+++ new/include/Qt3D/qsphere3d.h 2013-07-31 10:15:41.000000000 +0000
852@@ -0,0 +1 @@
853+#include "../../src/threed/math3d/qsphere3d.h"
854diff -urN old/include/Qt3D/Qt3D new/include/Qt3D/Qt3D
855--- old/include/Qt3D/Qt3D 1970-01-01 00:00:00.000000000 +0000
856+++ new/include/Qt3D/Qt3D 2013-12-17 16:35:20.787962383 +0000
857@@ -0,0 +1,75 @@
858+#ifndef QT_QT3D_MODULE_H
859+#define QT_QT3D_MODULE_H
860+#include <Qt3D/Qt3DDepends>
861+#include "qarray.h"
862+#include "qcolor4ub.h"
863+#include "qcustomdataarray.h"
864+#include "qglattributedescription.h"
865+#include "qglattributeset.h"
866+#include "qglattributevalue.h"
867+#include "qglindexbuffer.h"
868+#include "qglvertexbundle.h"
869+#include "qvector2darray.h"
870+#include "qvector3darray.h"
871+#include "qvector4darray.h"
872+#include "qglcolladafxeffect.h"
873+#include "qglcolladafxeffectfactory.h"
874+#include "qglcolladafxeffectloader.h"
875+#include "qglshaderprogrameffect.h"
876+#include "qgeometrydata.h"
877+#include "qglbezierpatches.h"
878+#include "qglbuilder.h"
879+#include "qglcube.h"
880+#include "qglcylinder.h"
881+#include "qgldome.h"
882+#include "qglmaterialcollection.h"
883+#include "qglsphere.h"
884+#include "qglteapot.h"
885+#include "qlogicalvertex.h"
886+#include "qglnamespace.h"
887+#include "qt3dglobal.h"
888+#include "qgraphicsbillboardtransform.h"
889+#include "qgraphicsrotation3d.h"
890+#include "qgraphicsscale3d.h"
891+#include "qgraphicstransform3d.h"
892+#include "qgraphicstranslation3d.h"
893+#include "qglabstractmaterial.h"
894+#include "qglcolormaterial.h"
895+#include "qglmaterial.h"
896+#include "qgltwosidedmaterial.h"
897+#include "qbox3d.h"
898+#include "qplane3d.h"
899+#include "qray3d.h"
900+#include "qsphere3d.h"
901+#include "qtriangle3d.h"
902+#include "qdownloadmanager.h"
903+#include "qglabstracteffect.h"
904+#include "qgllightmodel.h"
905+#include "qgllightparameters.h"
906+#include "qglpainter.h"
907+#include "qmatrix4x4stack.h"
908+#include "qglabstractscene.h"
909+#include "qglpicknode.h"
910+#include "qglrenderorder.h"
911+#include "qglrenderordercomparator.h"
912+#include "qglrendersequencer.h"
913+#include "qglrenderstate.h"
914+#include "qglsceneanimation.h"
915+#include "qglsceneformatplugin.h"
916+#include "qglscenenode.h"
917+#include "qglbezierscene.h"
918+#include "qglbezierscenehandler.h"
919+#include "qglabstractsurface.h"
920+#include "qglframebufferobjectsurface.h"
921+#include "qglpixelbuffersurface.h"
922+#include "qglsubsurface.h"
923+#include "qglwindowsurface.h"
924+#include "qareaallocator.h"
925+#include "qgltexture2d.h"
926+#include "qgltexturecube.h"
927+#include "qglcamera.h"
928+#include "qglcameraanimation.h"
929+#include "qglmockview.h"
930+#include "qglview.h"
931+#include "qt3dversion.h"
932+#endif
933diff -urN old/include/Qt3D/qt3dglobal.h new/include/Qt3D/qt3dglobal.h
934--- old/include/Qt3D/qt3dglobal.h 1970-01-01 00:00:00.000000000 +0000
935+++ new/include/Qt3D/qt3dglobal.h 2013-07-31 10:15:41.000000000 +0000
936@@ -0,0 +1 @@
937+#include "../../src/threed/global/qt3dglobal.h"
938diff -urN old/include/Qt3D/Qt3DVersion new/include/Qt3D/Qt3DVersion
939--- old/include/Qt3D/Qt3DVersion 1970-01-01 00:00:00.000000000 +0000
940+++ new/include/Qt3D/Qt3DVersion 2013-12-17 16:35:20.787962383 +0000
941@@ -0,0 +1 @@
942+#include "qt3dversion.h"
943diff -urN old/include/Qt3D/qt3dversion.h new/include/Qt3D/qt3dversion.h
944--- old/include/Qt3D/qt3dversion.h 1970-01-01 00:00:00.000000000 +0000
945+++ new/include/Qt3D/qt3dversion.h 2013-12-17 16:35:20.787962383 +0000
946@@ -0,0 +1,9 @@
947+/* This file was generated by syncqt. */
948+#ifndef QT_QT3D_VERSION_H
949+#define QT_QT3D_VERSION_H
950+
951+#define QT3D_VERSION_STR "5.2.0"
952+
953+#define QT3D_VERSION 0x050200
954+
955+#endif // QT_QT3D_VERSION_H
956diff -urN old/include/Qt3D/QtArrayData new/include/Qt3D/QtArrayData
957--- old/include/Qt3D/QtArrayData 1970-01-01 00:00:00.000000000 +0000
958+++ new/include/Qt3D/QtArrayData 2013-07-31 10:15:41.000000000 +0000
959@@ -0,0 +1 @@
960+#include "qarray.h"
961diff -urN old/include/Qt3D/QTriangle3D new/include/Qt3D/QTriangle3D
962--- old/include/Qt3D/QTriangle3D 1970-01-01 00:00:00.000000000 +0000
963+++ new/include/Qt3D/QTriangle3D 2013-07-31 10:15:41.000000000 +0000
964@@ -0,0 +1 @@
965+#include "qtriangle3d.h"
966diff -urN old/include/Qt3D/qtriangle3d.h new/include/Qt3D/qtriangle3d.h
967--- old/include/Qt3D/qtriangle3d.h 1970-01-01 00:00:00.000000000 +0000
968+++ new/include/Qt3D/qtriangle3d.h 2013-07-31 10:15:41.000000000 +0000
969@@ -0,0 +1 @@
970+#include "../../src/threed/math3d/qtriangle3d.h"
971diff -urN old/include/Qt3D/QUniformAreaAllocator new/include/Qt3D/QUniformAreaAllocator
972--- old/include/Qt3D/QUniformAreaAllocator 1970-01-01 00:00:00.000000000 +0000
973+++ new/include/Qt3D/QUniformAreaAllocator 2013-07-31 10:15:41.000000000 +0000
974@@ -0,0 +1 @@
975+#include "qareaallocator.h"
976diff -urN old/include/Qt3D/QVector2DArray new/include/Qt3D/QVector2DArray
977--- old/include/Qt3D/QVector2DArray 1970-01-01 00:00:00.000000000 +0000
978+++ new/include/Qt3D/QVector2DArray 2013-07-31 10:15:41.000000000 +0000
979@@ -0,0 +1 @@
980+#include "qvector2darray.h"
981diff -urN old/include/Qt3D/qvector2darray.h new/include/Qt3D/qvector2darray.h
982--- old/include/Qt3D/qvector2darray.h 1970-01-01 00:00:00.000000000 +0000
983+++ new/include/Qt3D/qvector2darray.h 2013-07-31 10:15:41.000000000 +0000
984@@ -0,0 +1 @@
985+#include "../../src/threed/arrays/qvector2darray.h"
986diff -urN old/include/Qt3D/QVector3DArray new/include/Qt3D/QVector3DArray
987--- old/include/Qt3D/QVector3DArray 1970-01-01 00:00:00.000000000 +0000
988+++ new/include/Qt3D/QVector3DArray 2013-07-31 10:15:41.000000000 +0000
989@@ -0,0 +1 @@
990+#include "qvector3darray.h"
991diff -urN old/include/Qt3D/qvector3darray.h new/include/Qt3D/qvector3darray.h
992--- old/include/Qt3D/qvector3darray.h 1970-01-01 00:00:00.000000000 +0000
993+++ new/include/Qt3D/qvector3darray.h 2013-07-31 10:15:41.000000000 +0000
994@@ -0,0 +1 @@
995+#include "../../src/threed/arrays/qvector3darray.h"
996diff -urN old/include/Qt3D/QVector4DArray new/include/Qt3D/QVector4DArray
997--- old/include/Qt3D/QVector4DArray 1970-01-01 00:00:00.000000000 +0000
998+++ new/include/Qt3D/QVector4DArray 2013-07-31 10:15:41.000000000 +0000
999@@ -0,0 +1 @@
1000+#include "qvector4darray.h"
1001diff -urN old/include/Qt3D/qvector4darray.h new/include/Qt3D/qvector4darray.h
1002--- old/include/Qt3D/qvector4darray.h 1970-01-01 00:00:00.000000000 +0000
1003+++ new/include/Qt3D/qvector4darray.h 2013-07-31 10:15:41.000000000 +0000
1004@@ -0,0 +1 @@
1005+#include "../../src/threed/arrays/qvector4darray.h"
1006diff -urN old/include/Qt3DQuick/capsulemesh.h new/include/Qt3DQuick/capsulemesh.h
1007--- old/include/Qt3DQuick/capsulemesh.h 1970-01-01 00:00:00.000000000 +0000
1008+++ new/include/Qt3DQuick/capsulemesh.h 2013-07-31 10:15:41.000000000 +0000
1009@@ -0,0 +1 @@
1010+#include "../../src/quick3d/capsulemesh.h"
1011diff -urN old/include/Qt3DQuick/cylindermesh.h new/include/Qt3DQuick/cylindermesh.h
1012--- old/include/Qt3DQuick/cylindermesh.h 1970-01-01 00:00:00.000000000 +0000
1013+++ new/include/Qt3DQuick/cylindermesh.h 2013-07-31 10:15:41.000000000 +0000
1014@@ -0,0 +1 @@
1015+#include "../../src/quick3d/cylindermesh.h"
1016diff -urN old/include/Qt3DQuick/headers.pri new/include/Qt3DQuick/headers.pri
1017--- old/include/Qt3DQuick/headers.pri 1970-01-01 00:00:00.000000000 +0000
1018+++ new/include/Qt3DQuick/headers.pri 2013-12-17 16:35:20.675962380 +0000
1019@@ -0,0 +1,4 @@
1020+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
1021+SYNCQT.HEADER_CLASSES = ../../include/Qt3DQuick/QQuickAnimation3D ../../include/Qt3DQuick/QQuickEffect ../../include/Qt3DQuick/QQuickItem3D ../../include/Qt3DQuick/QQuickMesh ../../include/Qt3DQuick/QQuickViewport ../../include/Qt3DQuick/Qt3DQuickVersion
1022+SYNCQT.PRIVATE_HEADER_FILES =
1023+SYNCQT.QPA_HEADER_FILES =
1024diff -urN old/include/Qt3DQuick/line.h new/include/Qt3DQuick/line.h
1025--- old/include/Qt3DQuick/line.h 1970-01-01 00:00:00.000000000 +0000
1026+++ new/include/Qt3DQuick/line.h 2013-07-31 10:15:41.000000000 +0000
1027@@ -0,0 +1 @@
1028+#include "../../src/quick3d/line.h"
1029diff -urN old/include/Qt3DQuick/point.h new/include/Qt3DQuick/point.h
1030--- old/include/Qt3DQuick/point.h 1970-01-01 00:00:00.000000000 +0000
1031+++ new/include/Qt3DQuick/point.h 2013-07-31 10:15:41.000000000 +0000
1032@@ -0,0 +1 @@
1033+#include "../../src/quick3d/point.h"
1034diff -urN old/include/Qt3DQuick/qmlres.h new/include/Qt3DQuick/qmlres.h
1035--- old/include/Qt3DQuick/qmlres.h 1970-01-01 00:00:00.000000000 +0000
1036+++ new/include/Qt3DQuick/qmlres.h 2013-07-31 10:15:41.000000000 +0000
1037@@ -0,0 +1 @@
1038+#include "../../src/quick3d/qmlres.h"
1039diff -urN old/include/Qt3DQuick/QQuickAnimation3D new/include/Qt3DQuick/QQuickAnimation3D
1040--- old/include/Qt3DQuick/QQuickAnimation3D 1970-01-01 00:00:00.000000000 +0000
1041+++ new/include/Qt3DQuick/QQuickAnimation3D 2013-07-31 10:15:41.000000000 +0000
1042@@ -0,0 +1 @@
1043+#include "qquickanimation3d.h"
1044diff -urN old/include/Qt3DQuick/qquickanimation3d.h new/include/Qt3DQuick/qquickanimation3d.h
1045--- old/include/Qt3DQuick/qquickanimation3d.h 1970-01-01 00:00:00.000000000 +0000
1046+++ new/include/Qt3DQuick/qquickanimation3d.h 2013-07-31 10:15:41.000000000 +0000
1047@@ -0,0 +1 @@
1048+#include "../../src/quick3d/qquickanimation3d.h"
1049diff -urN old/include/Qt3DQuick/QQuickEffect new/include/Qt3DQuick/QQuickEffect
1050--- old/include/Qt3DQuick/QQuickEffect 1970-01-01 00:00:00.000000000 +0000
1051+++ new/include/Qt3DQuick/QQuickEffect 2013-07-31 10:15:41.000000000 +0000
1052@@ -0,0 +1 @@
1053+#include "qquickeffect.h"
1054diff -urN old/include/Qt3DQuick/qquickeffect.h new/include/Qt3DQuick/qquickeffect.h
1055--- old/include/Qt3DQuick/qquickeffect.h 1970-01-01 00:00:00.000000000 +0000
1056+++ new/include/Qt3DQuick/qquickeffect.h 2013-07-31 10:15:41.000000000 +0000
1057@@ -0,0 +1 @@
1058+#include "../../src/quick3d/qquickeffect.h"
1059diff -urN old/include/Qt3DQuick/QQuickItem3D new/include/Qt3DQuick/QQuickItem3D
1060--- old/include/Qt3DQuick/QQuickItem3D 1970-01-01 00:00:00.000000000 +0000
1061+++ new/include/Qt3DQuick/QQuickItem3D 2013-07-31 10:15:41.000000000 +0000
1062@@ -0,0 +1 @@
1063+#include "qquickitem3d.h"
1064diff -urN old/include/Qt3DQuick/qquickitem3d.h new/include/Qt3DQuick/qquickitem3d.h
1065--- old/include/Qt3DQuick/qquickitem3d.h 1970-01-01 00:00:00.000000000 +0000
1066+++ new/include/Qt3DQuick/qquickitem3d.h 2013-07-31 10:15:41.000000000 +0000
1067@@ -0,0 +1 @@
1068+#include "../../src/quick3d/qquickitem3d.h"
1069diff -urN old/include/Qt3DQuick/QQuickMesh new/include/Qt3DQuick/QQuickMesh
1070--- old/include/Qt3DQuick/QQuickMesh 1970-01-01 00:00:00.000000000 +0000
1071+++ new/include/Qt3DQuick/QQuickMesh 2013-07-31 10:15:41.000000000 +0000
1072@@ -0,0 +1 @@
1073+#include "qquickmesh.h"
1074diff -urN old/include/Qt3DQuick/qquickmesh.h new/include/Qt3DQuick/qquickmesh.h
1075--- old/include/Qt3DQuick/qquickmesh.h 1970-01-01 00:00:00.000000000 +0000
1076+++ new/include/Qt3DQuick/qquickmesh.h 2013-07-31 10:15:41.000000000 +0000
1077@@ -0,0 +1 @@
1078+#include "../../src/quick3d/qquickmesh.h"
1079diff -urN old/include/Qt3DQuick/QQuickViewport new/include/Qt3DQuick/QQuickViewport
1080--- old/include/Qt3DQuick/QQuickViewport 1970-01-01 00:00:00.000000000 +0000
1081+++ new/include/Qt3DQuick/QQuickViewport 2013-07-31 10:15:41.000000000 +0000
1082@@ -0,0 +1 @@
1083+#include "qquickviewport.h"
1084diff -urN old/include/Qt3DQuick/qquickviewport.h new/include/Qt3DQuick/qquickviewport.h
1085--- old/include/Qt3DQuick/qquickviewport.h 1970-01-01 00:00:00.000000000 +0000
1086+++ new/include/Qt3DQuick/qquickviewport.h 2013-07-31 10:15:41.000000000 +0000
1087@@ -0,0 +1 @@
1088+#include "../../src/quick3d/qquickviewport.h"
1089diff -urN old/include/Qt3DQuick/Qt3DQuick new/include/Qt3DQuick/Qt3DQuick
1090--- old/include/Qt3DQuick/Qt3DQuick 1970-01-01 00:00:00.000000000 +0000
1091+++ new/include/Qt3DQuick/Qt3DQuick 2013-12-17 16:35:20.675962380 +0000
1092@@ -0,0 +1,17 @@
1093+#ifndef QT_QT3DQUICK_MODULE_H
1094+#define QT_QT3DQUICK_MODULE_H
1095+#include <Qt3DQuick/Qt3DQuickDepends>
1096+#include "capsulemesh.h"
1097+#include "cylindermesh.h"
1098+#include "line.h"
1099+#include "point.h"
1100+#include "qmlres.h"
1101+#include "qquickanimation3d.h"
1102+#include "qquickeffect.h"
1103+#include "qquickitem3d.h"
1104+#include "qquickmesh.h"
1105+#include "qquickviewport.h"
1106+#include "qt3dquickglobal.h"
1107+#include "spheremesh.h"
1108+#include "qt3dquickversion.h"
1109+#endif
1110diff -urN old/include/Qt3DQuick/qt3dquickglobal.h new/include/Qt3DQuick/qt3dquickglobal.h
1111--- old/include/Qt3DQuick/qt3dquickglobal.h 1970-01-01 00:00:00.000000000 +0000
1112+++ new/include/Qt3DQuick/qt3dquickglobal.h 2013-07-31 10:15:41.000000000 +0000
1113@@ -0,0 +1 @@
1114+#include "../../src/quick3d/qt3dquickglobal.h"
1115diff -urN old/include/Qt3DQuick/Qt3DQuickVersion new/include/Qt3DQuick/Qt3DQuickVersion
1116--- old/include/Qt3DQuick/Qt3DQuickVersion 1970-01-01 00:00:00.000000000 +0000
1117+++ new/include/Qt3DQuick/Qt3DQuickVersion 2013-12-17 16:35:20.675962380 +0000
1118@@ -0,0 +1 @@
1119+#include "qt3dquickversion.h"
1120diff -urN old/include/Qt3DQuick/qt3dquickversion.h new/include/Qt3DQuick/qt3dquickversion.h
1121--- old/include/Qt3DQuick/qt3dquickversion.h 1970-01-01 00:00:00.000000000 +0000
1122+++ new/include/Qt3DQuick/qt3dquickversion.h 2013-12-17 16:35:20.675962380 +0000
1123@@ -0,0 +1,9 @@
1124+/* This file was generated by syncqt. */
1125+#ifndef QT_QT3DQUICK_VERSION_H
1126+#define QT_QT3DQUICK_VERSION_H
1127+
1128+#define QT3DQUICK_VERSION_STR "5.2.0"
1129+
1130+#define QT3DQUICK_VERSION 0x050200
1131+
1132+#endif // QT_QT3DQUICK_VERSION_H
1133diff -urN old/include/Qt3DQuick/spheremesh.h new/include/Qt3DQuick/spheremesh.h
1134--- old/include/Qt3DQuick/spheremesh.h 1970-01-01 00:00:00.000000000 +0000
1135+++ new/include/Qt3DQuick/spheremesh.h 2013-07-31 10:15:41.000000000 +0000
1136@@ -0,0 +1 @@
1137+#include "../../src/quick3d/spheremesh.h"
01138
=== 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 @@
1Description: Workaround build issue by using --no-as-needed
2 The patch workarounds a FTBFS described in a bug report.
3 .
4 Still needed with the latest Qt3d snapshot
5Author: Timo Jyrinki <timo.jyrinki@canonical.com>
6Bug-Ubuntu: https://bugs.launchpad.net/bugs/1207340
7Forwarded: no
8Last-Updated: 2013-08-01
9
10diff --git a/src/threed/threed.pro b/src/threed/threed.pro
11index 793c160..682db14 100644
12--- a/src/threed/threed.pro
13+++ b/src/threed/threed.pro
14@@ -23,4 +23,8 @@ include(threed.pri)
15 PUBLIC_HEADERS = $$HEADERS
16 HEADERS += $$PRIVATE_HEADERS
17
18+# Workaround zlib issue
19+LIBS += -Wl,--no-as-needed
20+LIBS += -lz
21+
22 !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
23
024
=== 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 @@
1usr/include/qt5/Qt3D/QAreaAllocator
2usr/include/qt5/Qt3D/QArray
3usr/include/qt5/Qt3D/QArrayAlignedChar
4usr/include/qt5/Qt3D/QArrayAlignedPrealloc
5usr/include/qt5/Qt3D/QBox3D
6usr/include/qt5/Qt3D/QColor4ub
7usr/include/qt5/Qt3D/QCustomDataArray
8usr/include/qt5/Qt3D/QDownloadManager
9usr/include/qt5/Qt3D/QGLAbstractEffect
10usr/include/qt5/Qt3D/QGLAbstractMaterial
11usr/include/qt5/Qt3D/QGLAbstractScene
12usr/include/qt5/Qt3D/QGLAbstractSurface
13usr/include/qt5/Qt3D/QGLAttributeDescription
14usr/include/qt5/Qt3D/QGLAttributeSet
15usr/include/qt5/Qt3D/QGLAttributeValue
16usr/include/qt5/Qt3D/QGLBezierPatches
17usr/include/qt5/Qt3D/QGLBezierScene
18usr/include/qt5/Qt3D/QGLBezierSceneHandler
19usr/include/qt5/Qt3D/QGLBuilder
20usr/include/qt5/Qt3D/QGLCamera
21usr/include/qt5/Qt3D/QGLCameraAnimation
22usr/include/qt5/Qt3D/QGLColladaFxEffect
23usr/include/qt5/Qt3D/QGLColladaFxEffectFactory
24usr/include/qt5/Qt3D/QGLColladaFxEffectLoader
25usr/include/qt5/Qt3D/QGLColladaImageParam
26usr/include/qt5/Qt3D/QGLColladaParam
27usr/include/qt5/Qt3D/QGLColladaSampler2DParam
28usr/include/qt5/Qt3D/QGLColladaSurfaceParam
29usr/include/qt5/Qt3D/QGLColladaTextureParam
30usr/include/qt5/Qt3D/QGLColorMaterial
31usr/include/qt5/Qt3D/QGLCube
32usr/include/qt5/Qt3D/QGLCylinder
33usr/include/qt5/Qt3D/QGLDome
34usr/include/qt5/Qt3D/QGLFramebufferObjectSurface
35usr/include/qt5/Qt3D/QGLIndexBuffer
36usr/include/qt5/Qt3D/QGLLightModel
37usr/include/qt5/Qt3D/QGLLightParameters
38usr/include/qt5/Qt3D/QGLMaterial
39usr/include/qt5/Qt3D/QGLMaterialCollection
40usr/include/qt5/Qt3D/QGLMockView
41usr/include/qt5/Qt3D/QGLPainter
42usr/include/qt5/Qt3D/QGLPickNode
43usr/include/qt5/Qt3D/QGLPixelBufferSurface
44usr/include/qt5/Qt3D/QGLRenderOrder
45usr/include/qt5/Qt3D/QGLRenderOrderComparator
46usr/include/qt5/Qt3D/QGLRenderSequencer
47usr/include/qt5/Qt3D/QGLRenderState
48usr/include/qt5/Qt3D/QGLSceneAnimation
49usr/include/qt5/Qt3D/QGLSceneFormatFactoryInterface
50usr/include/qt5/Qt3D/QGLSceneFormatHandler
51usr/include/qt5/Qt3D/QGLSceneNode
52usr/include/qt5/Qt3D/QGLShaderProgramEffect
53usr/include/qt5/Qt3D/QGLSphere
54usr/include/qt5/Qt3D/QGLSubsurface
55usr/include/qt5/Qt3D/QGLTeapot
56usr/include/qt5/Qt3D/QGLTexture2D
57usr/include/qt5/Qt3D/QGLTextureCube
58usr/include/qt5/Qt3D/QGLTwoSidedMaterial
59usr/include/qt5/Qt3D/QGLVertexBundle
60usr/include/qt5/Qt3D/QGLView
61usr/include/qt5/Qt3D/QGLWindowSurface
62usr/include/qt5/Qt3D/QGeneralAreaAllocator
63usr/include/qt5/Qt3D/QGeometryData
64usr/include/qt5/Qt3D/QGraphicsBillboardTransform
65usr/include/qt5/Qt3D/QGraphicsRotation3D
66usr/include/qt5/Qt3D/QGraphicsScale3D
67usr/include/qt5/Qt3D/QGraphicsTranslation3D
68usr/include/qt5/Qt3D/QLogicalVertex
69usr/include/qt5/Qt3D/QMatrix4x4Stack
70usr/include/qt5/Qt3D/QPlane3D
71usr/include/qt5/Qt3D/QQuickQGraphicsTransform3D
72usr/include/qt5/Qt3D/QRay3D
73usr/include/qt5/Qt3D/QSimpleAreaAllocator
74usr/include/qt5/Qt3D/QSphere3D
75usr/include/qt5/Qt3D/QTriangle3D
76usr/include/qt5/Qt3D/QUniformAreaAllocator
77usr/include/qt5/Qt3D/QVector2DArray
78usr/include/qt5/Qt3D/QVector3DArray
79usr/include/qt5/Qt3D/QVector4DArray
80usr/include/qt5/Qt3D/Qt3D
81usr/include/qt5/Qt3D/Qt3DVersion
82usr/include/qt5/Qt3D/QtArrayData
83usr/include/qt5/Qt3D/qareaallocator.h
84usr/include/qt5/Qt3D/qarray.h
85usr/include/qt5/Qt3D/qbox3d.h
86usr/include/qt5/Qt3D/qcolor4ub.h
87usr/include/qt5/Qt3D/qcustomdataarray.h
88usr/include/qt5/Qt3D/qdownloadmanager.h
89usr/include/qt5/Qt3D/qgeometrydata.h
90usr/include/qt5/Qt3D/qglabstracteffect.h
91usr/include/qt5/Qt3D/qglabstractmaterial.h
92usr/include/qt5/Qt3D/qglabstractscene.h
93usr/include/qt5/Qt3D/qglabstractsurface.h
94usr/include/qt5/Qt3D/qglattributedescription.h
95usr/include/qt5/Qt3D/qglattributeset.h
96usr/include/qt5/Qt3D/qglattributevalue.h
97usr/include/qt5/Qt3D/qglbezierpatches.h
98usr/include/qt5/Qt3D/qglbezierscene.h
99usr/include/qt5/Qt3D/qglbezierscenehandler.h
100usr/include/qt5/Qt3D/qglbuilder.h
101usr/include/qt5/Qt3D/qglcamera.h
102usr/include/qt5/Qt3D/qglcameraanimation.h
103usr/include/qt5/Qt3D/qglcolladafxeffect.h
104usr/include/qt5/Qt3D/qglcolladafxeffectfactory.h
105usr/include/qt5/Qt3D/qglcolladafxeffectloader.h
106usr/include/qt5/Qt3D/qglcolormaterial.h
107usr/include/qt5/Qt3D/qglcube.h
108usr/include/qt5/Qt3D/qglcylinder.h
109usr/include/qt5/Qt3D/qgldome.h
110usr/include/qt5/Qt3D/qglframebufferobjectsurface.h
111usr/include/qt5/Qt3D/qglindexbuffer.h
112usr/include/qt5/Qt3D/qgllightmodel.h
113usr/include/qt5/Qt3D/qgllightparameters.h
114usr/include/qt5/Qt3D/qglmaterial.h
115usr/include/qt5/Qt3D/qglmaterialcollection.h
116usr/include/qt5/Qt3D/qglmockview.h
117usr/include/qt5/Qt3D/qglnamespace.h
118usr/include/qt5/Qt3D/qglpainter.h
119usr/include/qt5/Qt3D/qglpicknode.h
120usr/include/qt5/Qt3D/qglpixelbuffersurface.h
121usr/include/qt5/Qt3D/qglrenderorder.h
122usr/include/qt5/Qt3D/qglrenderordercomparator.h
123usr/include/qt5/Qt3D/qglrendersequencer.h
124usr/include/qt5/Qt3D/qglrenderstate.h
125usr/include/qt5/Qt3D/qglsceneanimation.h
126usr/include/qt5/Qt3D/qglsceneformatplugin.h
127usr/include/qt5/Qt3D/qglscenenode.h
128usr/include/qt5/Qt3D/qglshaderprogrameffect.h
129usr/include/qt5/Qt3D/qglsphere.h
130usr/include/qt5/Qt3D/qglsubsurface.h
131usr/include/qt5/Qt3D/qglteapot.h
132usr/include/qt5/Qt3D/qgltexture2d.h
133usr/include/qt5/Qt3D/qgltexturecube.h
134usr/include/qt5/Qt3D/qgltwosidedmaterial.h
135usr/include/qt5/Qt3D/qglvertexbundle.h
136usr/include/qt5/Qt3D/qglview.h
137usr/include/qt5/Qt3D/qglwindowsurface.h
138usr/include/qt5/Qt3D/qgraphicsbillboardtransform.h
139usr/include/qt5/Qt3D/qgraphicsrotation3d.h
140usr/include/qt5/Qt3D/qgraphicsscale3d.h
141usr/include/qt5/Qt3D/qgraphicstransform3d.h
142usr/include/qt5/Qt3D/qgraphicstranslation3d.h
143usr/include/qt5/Qt3D/qlogicalvertex.h
144usr/include/qt5/Qt3D/qmatrix4x4stack.h
145usr/include/qt5/Qt3D/qplane3d.h
146usr/include/qt5/Qt3D/qray3d.h
147usr/include/qt5/Qt3D/qsphere3d.h
148usr/include/qt5/Qt3D/qt3dglobal.h
149usr/include/qt5/Qt3D/qt3dversion.h
150usr/include/qt5/Qt3D/qtriangle3d.h
151usr/include/qt5/Qt3D/qvector2darray.h
152usr/include/qt5/Qt3D/qvector3darray.h
153usr/include/qt5/Qt3D/qvector4darray.h
154usr/include/qt5/Qt3DQuick/QQuickAnimation3D
155usr/include/qt5/Qt3DQuick/QQuickEffect
156usr/include/qt5/Qt3DQuick/QQuickItem3D
157usr/include/qt5/Qt3DQuick/QQuickMesh
158usr/include/qt5/Qt3DQuick/QQuickViewport
159usr/include/qt5/Qt3DQuick/Qt3DQuick
160usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
161usr/include/qt5/Qt3DQuick/capsulemesh.h
162usr/include/qt5/Qt3DQuick/cylindermesh.h
163usr/include/qt5/Qt3DQuick/line.h
164usr/include/qt5/Qt3DQuick/point.h
165usr/include/qt5/Qt3DQuick/qmlres.h
166usr/include/qt5/Qt3DQuick/qquickanimation3d.h
167usr/include/qt5/Qt3DQuick/qquickeffect.h
168usr/include/qt5/Qt3DQuick/qquickitem3d.h
169usr/include/qt5/Qt3DQuick/qquickmesh.h
170usr/include/qt5/Qt3DQuick/qquickviewport.h
171usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
172usr/include/qt5/Qt3DQuick/qt3dquickversion.h
173usr/include/qt5/Qt3DQuick/spheremesh.h
174usr/lib/*/*.prl
175usr/lib/*/*.so
176usr/lib/*/cmake/*
177usr/lib/*/pkgconfig/*
178usr/lib/*/qt5/bin/qglinfo
179usr/share/qt5/mkspecs/modules/*
180usr/include/qt5/Qt3D/Qt3DDepends
181usr/include/qt5/Qt3DQuick/Qt3DQuickDepends
0182
=== 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 @@
1usr/lib/*/qt5/examples/*
02
=== 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 @@
1qt3d5-examples: image-file-in-usr-lib
02
=== 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 @@
1usr/include/qt5/Qt3D/*/Qt3D/private/*
02
=== 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 @@
1usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
2usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
3usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
4usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
5usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
6usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
7usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
8usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
9usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
10usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
11usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
12usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
13usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
14usr/lib/*/qt5/qml/Qt3D/qmldir
015
=== 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 @@
1#!/usr/bin/make -f
2
3# Uncomment this to turn on verbose mode.
4#export DH_VERBOSE=1
5
6export QT_SELECT=qt5
7
8export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
9export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
10export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
11
12%:
13 dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
14
15override_dh_auto_configure:
16 qmake
17
18override_dh_auto_install:
19 dh_auto_install
20 # Fix wrong path in pkgconfig files
21 find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
22 -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
23
24 # Remove libtool-like files
25 rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
26
27override_dh_auto_test:
28 export LD_LIBRARY_PATH=$(CURDIR)/lib
29 cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
30
31override_dh_builddeb:
32 dh_builddeb -- -Zxz
33
034
=== 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 @@
13.0 (quilt)

Subscribers

People subscribed via source and target branches