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

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

releasing version 5.0~git20130109-0ubuntu3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== renamed directory 'debian' => 'debian.moved'
3=== added file 'debian/changelog'
4--- debian/changelog 1970-01-01 00:00:00 +0000
5+++ debian/changelog 2013-12-20 21:54:23 +0000
6@@ -0,0 +1,56 @@
7+qt3d-opensource-src (5.0~git20130731-0ubuntu2) UNRELEASED; urgency=medium
8+
9+ [ Timo Jyrinki ]
10+ * Rebuild against Qt 5.2.0, bump dependencies
11+ * Use QT_SELECT instead of depending on qt5-default
12+ * Add syncqt_create_headers.patch to fix build against 5.2.0
13+
14+ [ Allan LeSage ]
15+ * Depend on xvfb for existing tests requiring a display.
16+ * Add dh_override_auto_test to make check under xvfb-run.
17+ * debian/patches/skip_failing_tests.patch
18+ - Skip some failing tests pending investigation.
19+ * debian/patches/enable_coverage_reporting.patch
20+ - Enable standard coverage reporting for Jenkins consumption.
21+
22+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Tue, 17 Dec 2013 10:54:56 +0000
23+
24+qt3d-opensource-src (5.0~git20130731-0ubuntu1) saucy; urgency=low
25+
26+ * New upstream snapshot release
27+ * Improve override_dh_auto_install, use --fail-missing
28+ * Drop patches:
29+ - add_GPL_license_file.patch, merged upstream
30+ - add_module_version.patch, added upstream
31+ - disable_conflicting_examples.patch, not needed anymore
32+ * Refresh link_against_system_zlib.patch
33+ * Add bug link to workaround_zlib_linking_issue.patch
34+
35+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Fri, 02 Aug 2013 11:10:16 +0300
36+
37+qt3d-opensource-src (5.0~git20130109-0ubuntu3) saucy; urgency=low
38+
39+ * debian/patches/add_module_version.patch:
40+ - Add a module version to fix FTBFS
41+
42+ -- Didier Roche <didrocks@ubuntu.com> Fri, 21 Jun 2013 17:59:14 +0200
43+
44+qt3d-opensource-src (5.0~git20130109-0ubuntu2) raring; urgency=low
45+
46+ [ Timo Jyrinki ]
47+ * Fix pkgconfig Libs.private path (LP: #1125156)
48+ * debian/patches/workaround_zlib_linking_issue.patch:
49+ - Fix FTBFS
50+
51+ [ Didier Roche ]
52+ * Fixed some small copyright issues
53+
54+ -- Didier Roche <didrocks@ubuntu.com> Fri, 15 Feb 2013 12:52:28 +0100
55+
56+qt3d-opensource-src (5.0~git20130109-0ubuntu1) raring; urgency=low
57+
58+ * Initial release
59+ * Cherry-pick from upstream:
60+ - add_license_files.patch
61+
62+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Tue, 22 Jan 2013 14:32:08 +0200
63
64=== added file 'debian/compat'
65--- debian/compat 1970-01-01 00:00:00 +0000
66+++ debian/compat 2013-12-20 21:54:23 +0000
67@@ -0,0 +1,1 @@
68+9
69
70=== added file 'debian/control'
71--- debian/control 1970-01-01 00:00:00 +0000
72+++ debian/control 2013-12-20 21:54:23 +0000
73@@ -0,0 +1,115 @@
74+Source: qt3d-opensource-src
75+Section: libs
76+Priority: optional
77+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
78+Build-Depends: debhelper (>= 9.0.0),
79+ libqt5opengl5-dev,
80+ pkg-kde-tools,
81+ qtbase5-private-dev (>= 5.2.0+dfsg~),
82+ qtdeclarative5-private-dev (>= 5.2.0~),
83+ xvfb,
84+ zlib1g-dev,
85+Standards-Version: 3.9.3
86+Homepage: http://qt-project.org/
87+
88+Package: libqt53d5
89+Architecture: any
90+Multi-Arch: same
91+Pre-Depends: ${misc:Pre-Depends},
92+Depends: ${misc:Depends},
93+ ${shlibs:Depends},
94+Description: Qt 3D module
95+ Qt is a cross-platform C++ application framework. Qt's primary feature
96+ is its rich set of widgets that provide standard GUI functionality.
97+ .
98+ This package contains Qt 3D module.
99+ .
100+ WARNING: This module is not an official part of Qt 5, but instead a git
101+ snapshot of an ongoing development. The package is very likely to
102+ change in a binary incompatible way, and no guarantees are given.
103+
104+Package: qtdeclarative5-qt3d-plugin
105+Architecture: any
106+Multi-Arch: same
107+Pre-Depends: dpkg (>= 1.15.6~),
108+ ${misc:Pre-Depends},
109+Depends: ${misc:Depends},
110+ ${shlibs:Depends},
111+Description: Qt 5 3D QML plugin
112+ Qt is a cross-platform C++ application framework. Qt's primary feature
113+ is its rich set of widgets that provide standard GUI functionality.
114+ .
115+ This package contains the Qt 3D QML plugin.
116+ .
117+ WARNING: This module is not an official part of Qt 5, but instead a git
118+ snapshot of an ongoing development. The package is very likely to
119+ change in a binary incompatible way, and no guarantees are given.
120+
121+Package: qt3d5-dev
122+Section: libdevel
123+Architecture: any
124+Depends: libqt53d5 (= ${binary:Version}),
125+ qtbase5-dev,
126+ ${misc:Depends},
127+ ${shlibs:Depends},
128+Description: Qt 5 3d development files
129+ Qt is a cross-platform C++ application framework. Qt's primary feature
130+ is its rich set of widgets that provide standard GUI functionality.
131+ .
132+ This package contains the header development files used for building Qt 5
133+ applications using Qt 3D library.
134+ .
135+ WARNING: This module is not an official part of Qt 5, but instead a git
136+ snapshot of an ongoing development. The package is very likely to
137+ change in a binary incompatible way, and no guarantees are given.
138+
139+Package: qt3d5-private-dev
140+Architecture: any
141+Section: libdevel
142+Depends: qt3d5-dev (= ${binary:Version}),
143+ ${misc:Depends},
144+ ${shlibs:Depends},
145+Description: Qt 5 3d private development files
146+ Qt is a cross-platform C++ application framework. Qt's primary feature
147+ is its rich set of widgets that provide standard GUI functionality.
148+ .
149+ This package contains the private header development files for building some
150+ Qt 5 applications using 3D private headers.
151+ .
152+ Use at your own risk.
153+ .
154+ WARNING: This module is not an official part of Qt 5, but instead a git
155+ snapshot of an ongoing development. The package is very likely to
156+ change in a binary incompatible way, and no guarantees are given.
157+
158+Package: qt3d5-examples
159+Architecture: any
160+Multi-Arch: same
161+Section: x11
162+Pre-Depends: dpkg (>= 1.15.6~),
163+ ${misc:Pre-Depends},
164+Depends: ${misc:Depends},
165+ ${shlibs:Depends},
166+Description: Qt 5 3d examples
167+ Qt is a cross-platform C++ application framework. Qt's primary feature
168+ is its rich set of widgets that provide standard GUI functionality.
169+ .
170+ This package contains Qt 5 3D examples.
171+ .
172+ WARNING: This module is not an official part of Qt 5, but instead a git
173+ snapshot of an ongoing development. The package is very likely to
174+ change in a binary incompatible way, and no guarantees are given.
175+
176+Package: qt3d5-dbg
177+Priority: extra
178+Architecture: any
179+Section: debug
180+Depends: libqt53d5 (= ${binary:Version}),
181+ qt3d5-examples (= ${binary:Version}),
182+ ${misc:Depends},
183+Description: Qt 3D library debugging symbols
184+ Qt is a cross-platform C++ application framework. Qt's primary feature
185+ is its rich set of widgets that provide standard GUI functionality.
186+ .
187+ This package contains the debugging symbols for the Qt 5 3D
188+ libraries.
189
190=== added file 'debian/copyright'
191--- debian/copyright 1970-01-01 00:00:00 +0000
192+++ debian/copyright 2013-12-20 21:54:23 +0000
193@@ -0,0 +1,367 @@
194+Format: http://dep.debian.net/deps/dep5
195+Upstream-Name: qt3d
196+Source: http://qt.gitorious.org/qt/qt3d
197+
198+Files: *
199+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
200+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
201+
202+Files: debian/*
203+Copyright: 2007-2012 Fathi Boudra <fabo@debian.org>
204+ 2007-2012 Sune Vuorela <debian@pusling.com>
205+ 2008-2012 Modestas Vainius <modax@debian.org>
206+ 2007-2009 Ana Beatriz Guerrero Lopez <ana@debian.org>
207+ 2005-2007 Brian Nelson <pyro@debian.org>
208+ 2012 Timo Jyrinki <timo.jyrinki@canonical.com>
209+License: LGPL-2.1
210+
211+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
212+ GNU Lesser General Public License version 2.1:
213+ This file may be used under the terms of the GNU Lesser General Public
214+ License version 2.1 as published by the Free Software Foundation and
215+ appearing in the file LICENSE.LGPL included in the packaging of this
216+ file. Please review the following information to ensure the GNU Lesser
217+ General Public License version 2.1 requirements will be met:
218+ http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
219+ .
220+ In addition, as a special exception, Digia gives you certain additional
221+ rights. These rights are described in the Digia Qt LGPL Exception
222+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
223+ .
224+ On Debian systems, the complete text of the GNU Lesser General Public License
225+ can be found in `/usr/share/common-licenses/LGPL-2.1`.
226+ .
227+ Digia Qt LGPL Exception version 1.1:
228+ As an additional permission to the GNU Lesser General Public License version
229+ 2.1, the object code form of a "work that uses the Library" may incorporate
230+ material from a header file that is part of the Library. You may distribute
231+ such object code under terms of your choice, provided that:
232+ (i) the header files of the Library have not been modified; and
233+ (ii) the incorporated material is limited to numerical parameters, data
234+ structure layouts, accessors, macros, inline functions and
235+ templates; and
236+ (iii) you comply with the terms of Section 6 of the GNU Lesser General
237+ Public License version 2.1.
238+ .
239+ Moreover, you may apply this exception to a modified version of the Library,
240+ provided that such modification does not involve copying material from the
241+ Library into the modified Library's header files unless such material is
242+ limited to (i) numerical parameters; (ii) data structure layouts;
243+ (iii) accessors; and (iv) small macros, templates and inline functions of
244+ five lines or less in length.
245+ .
246+ Furthermore, you are not required to apply this additional permission to a
247+ modified version of the Library.
248+
249+Files: tests/auto/cmake/test_modules/main.cpp
250+Copyright: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company
251+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
252+
253+License: GPL-3
254+ GNU General Public License Usage
255+ .
256+ Alternatively, this file may be used under the terms of the GNU
257+ General Public License version 3.0 as published by the Free Software
258+ Foundation and appearing in the file LICENSE.GPL included in the
259+ packaging of this file. Please review the following information to
260+ ensure the GNU General Public License version 3.0 requirements will be
261+ met: http://www.gnu.org/copyleft/gpl.html.
262+ .
263+ On Debian systems, the complete text of the license can be found in
264+ `/usr/share/common-licenses/GPL-3`.
265+
266+License: LGPL-2.1
267+ This file may be used under the terms of the GNU Lesser
268+ General Public License version 2.1 as published by the Free Software
269+ Foundation and appearing in the file LICENSE.LGPL included in the
270+ packaging of this file. Please review the following information to
271+ ensure the GNU Lesser General Public License version 2.1 requirements
272+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
273+ .
274+ On Debian systems, the complete text of the LGPL-2.1 license can be found in
275+ `/usr/share/common-licenses/LGPL-2.1`,
276+
277+Files: 3rdparty/assimp/*
278+Copyright: 2006-2010, ASSIMP Development Team
279+License: BSD-3-clause
280+
281+Files: examples/* src/quick3d/qmlres.cpp src/quick3d/qmlres.h src/imports/threed/DefaultNavigator.qml tests/manual/qrc/qml/tst_qrc.qml tests/manual/transformations/qml/desktop.qml tests/manual/shapes/qml/desktop.qml tests/manual/scaling/qml/desktop.qml tests/manual/submesh/qml/desktop.qml tests/manual/navigation1/qml/desktop.qml tests/manual/basic/qml/desktop.qml tests/manual/model3ds/qml/desktop.qml tests/manual/translation/qml/desktop.qml tests/manual/background/qml/desktop.qml tests/manual/rotation/qml/desktop.qml tests/manual/fullreferencing/qml/desktop.qml tests/manual/displaymodel/qml/desktop.qml tests/manual/animations/qml/desktop.qml tutorials/quick3d/teapot_qml/qml/desktop.qml tutorials/quick3d/teapot_qml/qml/Teapot.qml tutorials/quick3d/shadertut/main.cpp tutorials/quick3d/shadertut/qml/TutorialTeapot.qml tutorials/quick3d/shadertut/qml/shader-tutorial.qml tutorials/quick3d/shadertut/qml/desktop.qml tutorials/quick3d/teapot_bounce_qml/qml/TeapotBounce.qml tutorials/quick3d/teapot_bounce_qml/qml/desktop.qml tutorials/qt3d/penguin_advanced/modelview.h tutorials/qt3d/penguin_advanced/main.cpp tutorials/qt3d/penguin_advanced/modelview.cpp tutorials/qt3d/cube2/main.cpp tutorials/qt3d/cube2/cubeview.h tutorials/qt3d/cube2/cubeview.cpp tutorials/qt3d/cube4/main.cpp tutorials/qt3d/cube4/cube.qml tutorials/qt3d/cube4/cubeview.h tutorials/qt3d/cube4/cubeview.cpp tutorials/qt3d/penguin/modelview.h tutorials/qt3d/penguin/main.cpp tutorials/qt3d/penguin/modelview.cpp tutorials/qt3d/cube1/main.cpp tutorials/qt3d/cube1/cubeview.h tutorials/qt3d/cube1/cubeview.cpp tutorials/qt3d/cube3/main.cpp tutorials/qt3d/cube3/cubeview.h tutorials/qt3d/cube3/cubeview.cpp
282+Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
283+License: BSD-3-clause
284+
285+License: BSD-3-clause
286+ You may use this file under the terms of the BSD license as follows:
287+ .
288+ "Redistribution and use in source and binary forms, with or without
289+ modification, are permitted provided that the following conditions are
290+ met:
291+ * Redistributions of source code must retain the above copyright
292+ notice, this list of conditions and the following disclaimer.
293+ * Redistributions in binary form must reproduce the above copyright
294+ notice, this list of conditions and the following disclaimer in
295+ the documentation and/or other materials provided with the
296+ distribution.
297+ * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
298+ of its contributors may be used to endorse or promote products derived
299+ from this software without specific prior written permission.
300+ .
301+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
302+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
303+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
304+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
305+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
306+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
307+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
308+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
309+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
310+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
311+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
312+
313+Files: 3rdparty/assimp/contrib/ConvertUTF/*
314+Copyright: 2001-2004 Unicode, Inc.
315+License:
316+ Disclaimer
317+ .
318+ This source code is provided as is by Unicode, Inc. No claims are
319+ made as to fitness for any particular purpose. No warranties of any
320+ kind are expressed or implied. The recipient agrees to determine
321+ applicability of information provided. If this file has been
322+ purchased on magnetic or optical media from Unicode, Inc., the
323+ sole remedy for any claim will be exchange of defective media
324+ within 90 days of receipt.
325+ .
326+ Limitations on Rights to Redistribute This Code
327+ .
328+ Unicode, Inc. hereby grants the right to freely use the information
329+ supplied in this file in the creation of products supporting the
330+ Unicode Standard, and to make copies of this file in any form
331+ for internal or external distribution as long as this notice
332+ remains attached.
333+
334+Files: 3rdparty/assimp/contrib/zlib/*
335+Copyright: 1995-2010 Jean-loup Gailly
336+ 1995-2010 Mark Adler
337+License: Zlib
338+ This software is provided 'as-is', without any express or implied
339+ warranty. In no event will the authors be held liable for any damages
340+ arising from the use of this software.
341+ .
342+ Permission is granted to anyone to use this software for any purpose,
343+ including commercial applications, and to alter it and redistribute it
344+ freely, subject to the following restrictions:
345+ .
346+ 1. The origin of this software must not be misrepresented; you must not
347+ claim that you wrote the original software. If you use this software
348+ in a product, an acknowledgment in the product documentation would be
349+ appreciated but is not required.
350+ 2. Altered source versions must be plainly marked as such, and must not be
351+ misrepresented as being the original software.
352+ 3. This notice may not be removed or altered from any source distribution.
353+
354+Files: 3rdparty/assimp/contrib/unzip/*
355+Copyright: 1998-2005 Gilles Vollant
356+License: Zlib
357+ This software is provided 'as-is', without any express or implied
358+ warranty. In no event will the authors be held liable for any damages
359+ arising from the use of this software.
360+ .
361+ Permission is granted to anyone to use this software for any purpose,
362+ including commercial applications, and to alter it and redistribute it
363+ freely, subject to the following restrictions:
364+ .
365+ 1. The origin of this software must not be misrepresented; you must not
366+ claim that you wrote the original software. If you use this software
367+ in a product, an acknowledgment in the product documentation would be
368+ appreciated but is not required.
369+ 2. Altered source versions must be plainly marked as such, and must not be
370+ misrepresented as being the original software.
371+ 3. This notice may not be removed or altered from any source distribution.
372+
373+Files: 3rdparty/assimp/contrib/unzip/unzip.c
374+Copyright: 1990-2000 Info-ZIP
375+License: Info-ZIP license
376+ See the accompanying file LICENSE, version 2000-Apr-09 or later
377+ (the contents of which are also included in zip.h) for terms of use.
378+ If, for some reason, all these files are missing, the Info-ZIP license
379+ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html
380+
381+Files: 3rdparty/assimp/contrib/irrXML/*
382+Copyright: 2002-2005 Nikolaus Gebhardt
383+License: irrXML license
384+
385+License: irrXML license
386+ The irrXML license is based on the zlib license. Basicly, this means you can do with irrXML whatever you want:
387+ .
388+ This software is provided 'as-is', without any express or implied
389+ warranty. In no event will the authors be held liable for any damages
390+ arising from the use of this software.
391+ .
392+ Permission is granted to anyone to use this software for any purpose,
393+ including commercial applications, and to alter it and redistribute it
394+ freely, subject to the following restrictions:
395+ .
396+ 1. The origin of this software must not be misrepresented; you must not
397+ claim that you wrote the original software. If you use this software
398+ in a product, an acknowledgment in the product documentation would be
399+ appreciated but is not required.
400+ .
401+ 2. Altered source versions must be plainly marked as such, and must not be
402+ misrepresented as being the original software.
403+ .
404+ 3. This notice may not be removed or altered from any source distribution.
405+
406+Files: 3rdparty/assimp/code/BoostWorkaround/*
407+Copyright: 1994-1999 Beman Dawes
408+License: Boost Software License 1.0
409+ Boost Software License - Version 1.0 - August 17th, 2003
410+ .
411+ Permission is hereby granted, free of charge, to any person or organization
412+ obtaining a copy of the software and accompanying documentation covered by
413+ this license (the "Software") to use, reproduce, display, distribute,
414+ execute, and transmit the Software, and to prepare derivative works of the
415+ Software, and to permit third-parties to whom the Software is furnished to
416+ do so, all subject to the following:
417+ .
418+ The copyright notices in the Software and this entire statement, including
419+ the above license grant, this restriction and the following disclaimer,
420+ must be included in all copies of the Software, in whole or in part, and
421+ all derivative works of the Software, unless such copies or derivative
422+ works are solely in the form of machine-executable object code generated by
423+ a source language processor.
424+ .
425+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
426+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
427+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
428+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
429+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
430+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
431+ DEALINGS IN THE SOFTWARE.
432+
433+Files: fast_atof.h
434+Copyright: 2002-2007 Nikolaus Gebhardt
435+License: irrXML license
436+
437+Files: doc/config/scripts/superfish.js
438+Copyright: 2008 Joel Birch
439+License: MIT
440+
441+Files: doc/config/scripts/jquery.js
442+Copyright: 2010 John Resig
443+ 2010 The Dojo Foundation
444+License: MIT
445+
446+License: MIT
447+ Permission is hereby granted, free of charge, to any person obtaining
448+ a copy of this software and associated documentation files (the
449+ "Software"), to deal in the Software without restriction, including
450+ without limitation the rights to use, copy, modify, merge, publish,
451+ distribute, sublicense, and/or sell copies of the Software, and to
452+ permit persons to whom the Software is furnished to do so, subject
453+ to the following conditions:
454+ .
455+ The above copyright notice and this permission notice shall be
456+ included in all copies or substantial portions of the Software.
457+ .
458+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
459+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
460+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
461+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
462+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
463+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
464+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
465+ OTHER DEALINGS IN THE SOFTWARE.
466+
467+Files: 3rdparty/assimp/code/MDCNormalTable.h doc/src/legal/snippets/pico-model.txt
468+Copyright: 2002 Randy Reddig & seaw0lf
469+License: Custom BSD like
470+ Redistribution and use in source and binary forms, with or without modification,
471+ are permitted provided that the following conditions are met:
472+ .
473+ Redistributions of source code must retain the above copyright notice, this list
474+ of conditions and the following disclaimer.
475+ .
476+ Redistributions in binary form must reproduce the above copyright notice, this
477+ list of conditions and the following disclaimer in the documentation and/or
478+ other materials provided with the distribution.
479+ .
480+ Neither the names of the copyright holders nor the names of its contributors may
481+ be used to endorse or promote products derived from this software without
482+ specific prior written permission.
483+ .
484+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
485+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
486+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
487+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
488+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
489+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
490+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
491+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
492+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
493+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
494+
495+Files: 3rdparty/assimp/code/pstdint.h doc/src/legal/snippets/pstdint.txt
496+Copyright: 2005-2007 Paul Hsieh
497+License: BSD-3-clause
498+
499+Files: 3rdparty/assimp/code/BoostWorkaround/boost/foreach.hpp
500+Copyright: 2004 Eric Niebler
501+License: BSL
502+
503+Files: 3rdparty/assimp/code/BoostWorkaround/boost/timer.hpp
504+Copyright: 1994-1999 Beman Dawes
505+License: BSL
506+
507+Files: 3rdparty/assimp/code/BoostWorkaround/boost/tuple/tuple.hpp
508+Copyright: 2008 Alexander Gessler
509+License: BSL
510+
511+Files: 3rdparty/assimp/code/BoostWorkaround/boost/pointer_cast.hpp
512+Copyright: 2005 Ion Gaztanaga
513+License: BSL
514+
515+License: BSL
516+ Distributed under the Boost Software License, Version 1.0. (See
517+ accompanying file LICENSE_1_0.txt or copy at
518+ http://www.boost.org/LICENSE_1_0.txt)
519+ .
520+ Permission is hereby granted, free of charge, to any person or organization
521+ obtaining a copy of the software and accompanying documentation covered by
522+ this license (the "Software") to use, reproduce, display, distribute,
523+ execute, and transmit the Software, and to prepare derivative works of the
524+ Software, and to permit third-parties to whom the Software is furnished to
525+ do so, all subject to the following:
526+ .
527+ The copyright notices in the Software and this entire statement, including
528+ the above license grant, this restriction and the following disclaimer,
529+ must be included in all copies of the Software, in whole or in part, and
530+ all derivative works of the Software, unless such copies or derivative
531+ works are solely in the form of machine-executable object code generated by
532+ a source language processor.
533+ .
534+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
535+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
536+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
537+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
538+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
539+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
540+ DEALINGS IN THE SOFTWARE.
541+
542+Files: *.qdoc
543+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
544+License: GFDL-1.3
545+
546+License: GFDL-1.3
547+ GNU Free Documentation License Usage
548+ Alternatively, this file may be used under the terms of the GNU Free
549+ Documentation License version 1.3 as published by the Free Software
550+ Foundation and appearing in the file included in the packaging of
551+ this file. Please review the following information to ensure
552+ the GNU Free Documentation License version 1.3 requirements
553+ will be met: http://www.gnu.org/copyleft/fdl.html.
554+ .
555+ On Debian systems, the complete text of the GFDL-1.3 license can be found in
556+ `/usr/share/common-licenses/GFDL-1.3`,
557+
558+Files: src/quick3d/cube.qdoc src/quick3d/quad.qdoc src/quick3d/teapot.qdoc
559+Copyright: 2012 Digia Plc and/or its subsidiary(-ies).
560+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
561
562=== added file 'debian/libqt53d5.install'
563--- debian/libqt53d5.install 1970-01-01 00:00:00 +0000
564+++ debian/libqt53d5.install 2013-12-20 21:54:23 +0000
565@@ -0,0 +1,1 @@
566+usr/lib/*/*.so.*
567
568=== added file 'debian/not-installed'
569--- debian/not-installed 1970-01-01 00:00:00 +0000
570+++ debian/not-installed 2013-12-20 21:54:23 +0000
571@@ -0,0 +1,39 @@
572+usr/lib/x86_64-linux-gnu/libQt53D.la
573+usr/lib/*/qt5/bin/qglinfo
574+usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
575+usr/lib/*/qt5/qml/Qt3D/qmldir
576+usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
577+usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
578+usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
579+usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
580+usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
581+usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
582+usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
583+usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
584+usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
585+usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
586+usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
587+usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
588+usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
589+usr/include/qt5/Qt3DQuick/cylindermesh.h
590+usr/include/qt5/Qt3DQuick/qquickeffect.h
591+usr/include/qt5/Qt3DQuick/line.h
592+usr/include/qt5/Qt3DQuick/qquickmesh.h
593+usr/include/qt5/Qt3DQuick/spheremesh.h
594+usr/include/qt5/Qt3DQuick/capsulemesh.h
595+usr/include/qt5/Qt3DQuick/qquickitem3d.h
596+usr/include/qt5/Qt3DQuick/Qt3DQuick
597+usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
598+usr/include/qt5/Qt3DQuick/QQuickAnimation3D
599+usr/include/qt5/Qt3DQuick/QQuickMesh
600+usr/include/qt5/Qt3DQuick/QQuickViewport
601+usr/include/qt5/Qt3DQuick/qquickanimation3d.h
602+usr/include/qt5/Qt3DQuick/cube.h
603+usr/include/qt5/Qt3DQuick/qquickviewport.h
604+usr/include/qt5/Qt3DQuick/point.h
605+usr/include/qt5/Qt3DQuick/QQuickItem3D
606+usr/include/qt5/Qt3DQuick/qmlres.h
607+usr/include/qt5/Qt3DQuick/teapot.h
608+usr/include/qt5/Qt3DQuick/QQuickEffect
609+usr/include/qt5/Qt3DQuick/qt3dquickversion.h
610+
611
612=== added directory 'debian/patches'
613=== added file 'debian/patches/enable_coverage_reporting.patch'
614--- debian/patches/enable_coverage_reporting.patch 1970-01-01 00:00:00 +0000
615+++ debian/patches/enable_coverage_reporting.patch 2013-12-20 21:54:23 +0000
616@@ -0,0 +1,79 @@
617+--- a/src/imports/threed/threed.pro
618++++ b/src/imports/threed/threed.pro
619+@@ -1,3 +1,5 @@
620++include(../../../coverage.pri)
621++
622+ CXX_MODULE = 3d
623+ TARGET = qthreedqmlplugin
624+
625+--- a/src/quick3d/quick3d.pro
626++++ b/src/quick3d/quick3d.pro
627+@@ -1,3 +1,5 @@
628++include(../../coverage.pri)
629++
630+ TARGET = Qt3DQuick
631+ MODULE = 3dquick
632+ QT = core gui qml quick 3d
633+--- a/src/threed/threed.pro
634++++ b/src/threed/threed.pro
635+@@ -1,3 +1,5 @@
636++include(../../coverage.pri)
637++
638+ TARGET = Qt3D
639+ MODULE = 3d
640+ QT = core-private gui-private opengl
641+--- /dev/null
642++++ b/coverage.pri
643+@@ -0,0 +1,44 @@
644++# Coverage
645++CONFIG(coverage) {
646++ LIBS += -lgcov
647++ QMAKE_CXXFLAGS += --coverage
648++ QMAKE_LDFLAGS += --coverage
649++
650++ QMAKE_EXTRA_TARGETS += clean-gcno clean-gcda coverage-html \
651++ generate-coverage-html clean-coverage-html coverage-gcovr \
652++ generate-gcovr generate-coverage-gcovr clean-coverage-gcovr
653++
654++ clean-gcno.commands = \
655++ "@echo Removing old coverage instrumentation"; \
656++ "find -name '*.gcno' -print | xargs -r rm"
657++
658++ clean-gcda.commands = \
659++ "@echo Removing old coverage results"; \
660++ "find -name '*.gcda' -print | xargs -r rm"
661++
662++ coverage-html.depends = clean-gcda check generate-coverage-html
663++
664++ generate-coverage-html.commands = \
665++ "@echo Collecting coverage data"; \
666++ "lcov --directory $${TOP_SRC_DIR} --capture --output-file coverage.info --no-checksum --compat-libtool"; \
667++ "lcov --extract coverage.info \"*/src/*.cpp\" -o coverage.info"; \
668++ "lcov --remove coverage.info \"moc_*.cpp\" -o coverage.info"; \
669++ "LANG=C genhtml --prefix $${TOP_SRC_DIR} --output-directory coverage-html --title \"Code Coverage\" --legend --show-details coverage.info"
670++
671++ clean-coverage-html.depends = clean-gcda
672++ clean-coverage-html.commands = \
673++ "lcov --directory $${TOP_SRC_DIR} -z"; \
674++ "rm -rf coverage.info coverage-html"
675++
676++ coverage-gcovr.depends = clean-gcda check generate-coverage-gcovr
677++
678++ generate-coverage-gcovr.commands = \
679++ "@echo Generating coverage GCOVR report"; \
680++ "gcovr -x -r $${TOP_SRC_DIR} -o $${TOP_SRC_DIR}/coverage.xml -e \".*/moc_.*\" -e \"tests/.*\" -e \".*\\.h\""
681++
682++ clean-coverage-gcovr.depends = clean-gcda
683++ clean-coverage-gcovr.commands = \
684++ "rm -rf $${TOP_SRC_DIR}/coverage.xml"
685++
686++ QMAKE_CLEAN += *.gcda *.gcno coverage.info coverage.xml
687++}
688+--- a/qt3d.pro
689++++ b/qt3d.pro
690+@@ -1,3 +1,5 @@
691++include(coverage.pri)
692++
693+ requires(qtHaveModule(opengl))
694+
695+ load(qt_parts)
696
697=== added file 'debian/patches/link_against_system_zlib.patch'
698--- debian/patches/link_against_system_zlib.patch 1970-01-01 00:00:00 +0000
699+++ debian/patches/link_against_system_zlib.patch 2013-12-20 21:54:23 +0000
700@@ -0,0 +1,111 @@
701+diff --git a/3rdparty/assimp/assimp.pri b/3rdparty/assimp/assimp.pri
702+index a3810b3..ec8d724 100644
703+--- a/3rdparty/assimp/assimp.pri
704++++ b/3rdparty/assimp/assimp.pri
705+@@ -5,6 +5,8 @@
706+ CONFIG(debug, debug|release) : DEFINES+=_DEBUG
707+ CONFIG += exceptions
708+
709++DEFINES+=ASSIMP_BUILD_NO_OWN_ZLIB
710++
711+ win32:DEFINES+=_CRT_SECURE_NO_WARNINGS
712+
713+ VPATH += \
714+@@ -22,7 +24,6 @@ INCLUDEPATH += \
715+ $$PWD/include \
716+ $$PWD/include/Compiler \
717+ $$PWD/contrib/ConvertUTF \
718+- $$PWD/contrib/zlib \
719+ $$PWD/contrib/irrXML \
720+ $$PWD/contrib/unzip
721+
722+@@ -203,17 +204,6 @@ HEADERS += \
723+ contrib/unzip/crypt.h \
724+ contrib/unzip/ioapi.h \
725+ contrib/unzip/unzip.h \
726+- contrib/zlib/crc32.h \
727+- contrib/zlib/deflate.h \
728+- contrib/zlib/inffast.h \
729+- contrib/zlib/inffixed.h \
730+- contrib/zlib/inflate.h \
731+- contrib/zlib/inftrees.h \
732+- contrib/zlib/trees.h \
733+- contrib/zlib/zconf.h \
734+- contrib/zlib/zconf.in.h \
735+- contrib/zlib/zlib.h \
736+- contrib/zlib/zutil.h \
737+ include/Compiler/poppack1.h \
738+ include/Compiler/pushpack1.h \
739+ code/BoostWorkaround/boost/foreach.hpp \
740+@@ -337,13 +327,4 @@ SOURCES += \
741+ contrib/ConvertUTF/ConvertUTF.c \
742+ contrib/irrXML/irrXML.cpp \
743+ contrib/unzip/ioapi.c \
744+- contrib/unzip/unzip.c \
745+- contrib/zlib/adler32.c \
746+- contrib/zlib/compress.c \
747+- contrib/zlib/crc32.c \
748+- contrib/zlib/deflate.c \
749+- contrib/zlib/inffast.c \
750+- contrib/zlib/inflate.c \
751+- contrib/zlib/inftrees.c \
752+- contrib/zlib/trees.c \
753+- contrib/zlib/zutil.c
754++ contrib/unzip/unzip.c
755+diff --git a/3rdparty/assimp/code/makefile b/3rdparty/assimp/code/makefile
756+index 5710158..486300d 100644
757+--- a/3rdparty/assimp/code/makefile
758++++ b/3rdparty/assimp/code/makefile
759+@@ -24,7 +24,7 @@ OBJECTS += $(patsubst %.cpp,%.o, $(wildcard extra/*.cpp))
760+ OBJECTS += $(patsubst %.cpp,%.o, $(wildcard ./../contrib/irrXML/*.cpp))
761+
762+ # C object files
763+-OBJECTSC := $(patsubst %.c,%.oc, $(wildcard ./../contrib/zlib/*.c))
764++#OBJECTSC := $(patsubst %.c,%.oc, $(wildcard ./../contrib/zlib/*.c))
765+ OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/ConvertUTF/*.c))
766+ OBJECTSC += $(patsubst %.c,%.oc, $(wildcard ./../contrib/unzip/*.c))
767+
768+@@ -47,6 +47,8 @@ INCPATH = ../include
769+ # GCC compiler flags
770+ CPPFLAGS=-Wall
771+
772++DEFINEFLAGS+=ASSIMP_BUILD_NO_OWN_ZLIB
773++
774+ # Setup environment for noboost build
775+ ifeq ($(NOBOOST),1)
776+ SINGLETHREADED = 1
777+@@ -85,7 +87,7 @@ STATIC = $(BINPATH)/libassimp$(NAMESUFFIX).a
778+ all: $(SHARED_TARGET)
779+
780+ $(SHARED_TARGET): $(OBJECTS) $(OBJECTSC)
781+- gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++
782++ gcc -o $@ $(OBJECTS) $(OBJECTSC) -shared -lstdc++ -lz
783+ %.o:%.cpp
784+ $(CXX) -g -c $(CPPFLAGS) $? -o $@ $(INCLUDEFLAGS) $(DEFINEFLAGS) -fPIC
785+ %.oc:%.c
786+diff --git a/qt3d.pro b/qt3d.pro
787+index 541d46d..d4d95c9 100644
788+--- a/qt3d.pro
789++++ b/qt3d.pro
790+@@ -7,6 +7,8 @@ module_qt3d_tutorials.CONFIG = no_default_target no_default_install
791+
792+ !package: SUBDIRS += module_qt3d_tutorials
793+
794++LIBS += -lz
795++
796+ gcov: SUBDIRS -= sub_tools
797+
798+ # We need opengl, minimum es2
799+diff --git a/src/threed/threed.pro b/src/threed/threed.pro
800+index 793c160..fd992ca 100644
801+--- a/src/threed/threed.pro
802++++ b/src/threed/threed.pro
803+@@ -7,6 +7,8 @@ load(qt_module)
804+
805+ QMAKE_DOCS = $$PWD/doc/qt3d.qdocconf
806+
807++QMAKE_LFLAGS += -lz
808++
809+ gcov {
810+ CONFIG += static
811+ QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
812
813=== added file 'debian/patches/series'
814--- debian/patches/series 1970-01-01 00:00:00 +0000
815+++ debian/patches/series 2013-12-20 21:54:23 +0000
816@@ -0,0 +1,5 @@
817+link_against_system_zlib.patch
818+workaround_zlib_linking_issue.patch
819+syncqt_create_headers.patch
820+skip_failing_tests.patch
821+enable_coverage_reporting.patch
822
823=== added file 'debian/patches/skip_failing_tests.patch'
824--- debian/patches/skip_failing_tests.patch 1970-01-01 00:00:00 +0000
825+++ debian/patches/skip_failing_tests.patch 2013-12-20 21:54:23 +0000
826@@ -0,0 +1,41 @@
827+--- a/tests/auto/threed/threed.pro
828++++ b/tests/auto/threed/threed.pro
829+@@ -5,7 +5,8 @@
830+ qbox3d \
831+ qcolor4ub \
832+ qcustomdataarray \
833+- qgeometrydata \
834++ # skip a failing test
835++ #qgeometrydata \
836+ qglabstractsurface \
837+ qglattributedescription \
838+ qglattributeset \
839+@@ -26,7 +27,8 @@
840+ qglscenenode \
841+ qglsection \
842+ qglsphere \
843+- qglvertexbundle \
844++ # skip a failing test
845++ #qglvertexbundle \
846+ qgraphicstransform3d \
847+ qplane3d \
848+ qray3d \
849+--- a/tests/auto/auto.pro
850++++ b/tests/auto/auto.pro
851+@@ -3,9 +3,10 @@
852+ cmake
853+
854+ qtHaveModule(qml): SUBDIRS += imports
855+-qtHaveModule(qmltest) {
856+- SUBDIRS += qml3d
857+-
858+- !win32 : SUBDIRS += qml3d_visual \
859+- qml3d_cpp
860+-}
861++# skip these failing tests
862++#qtHaveModule(qmltest) {
863++# SUBDIRS += qml3d
864++#
865++# !win32 : SUBDIRS += qml3d_visual \
866++# qml3d_cpp
867++#}
868
869=== added file 'debian/patches/syncqt_create_headers.patch'
870--- debian/patches/syncqt_create_headers.patch 1970-01-01 00:00:00 +0000
871+++ debian/patches/syncqt_create_headers.patch 2013-12-20 21:54:23 +0000
872@@ -0,0 +1,1137 @@
873+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h
874+--- old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h 1970-01-01 00:00:00.000000000 +0000
875++++ new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiostream_p.h 2013-07-31 10:15:41.000000000 +0000
876+@@ -0,0 +1 @@
877++#include "../../../../../src/threed/scene_ai/ailoaderiostream_p.h"
878+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h
879+--- old/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h 1970-01-01 00:00:00.000000000 +0000
880++++ new/include/Qt3D/5.2.0/Qt3D/private/ailoaderiosystem_p.h 2013-07-31 10:15:41.000000000 +0000
881+@@ -0,0 +1 @@
882++#include "../../../../../src/threed/scene_ai/ailoaderiosystem_p.h"
883+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h new/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h
884+--- old/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h 1970-01-01 00:00:00.000000000 +0000
885++++ new/include/Qt3D/5.2.0/Qt3D/private/qailoader_p.h 2013-07-31 10:15:41.000000000 +0000
886+@@ -0,0 +1 @@
887++#include "../../../../../src/threed/scene_ai/qailoader_p.h"
888+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h
889+--- old/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h 1970-01-01 00:00:00.000000000 +0000
890++++ new/include/Qt3D/5.2.0/Qt3D/private/qaimesh_p.h 2013-07-31 10:15:41.000000000 +0000
891+@@ -0,0 +1 @@
892++#include "../../../../../src/threed/scene_ai/qaimesh_p.h"
893+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h
894+--- old/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h 1970-01-01 00:00:00.000000000 +0000
895++++ new/include/Qt3D/5.2.0/Qt3D/private/qaiscenehandler_p.h 2013-07-31 10:15:41.000000000 +0000
896+@@ -0,0 +1 @@
897++#include "../../../../../src/threed/scene_ai/qaiscenehandler_p.h"
898+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h new/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h
899+--- old/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h 1970-01-01 00:00:00.000000000 +0000
900++++ new/include/Qt3D/5.2.0/Qt3D/private/qaiscene_p.h 2013-07-31 10:15:41.000000000 +0000
901+@@ -0,0 +1 @@
902++#include "../../../../../src/threed/scene_ai/qaiscene_p.h"
903+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h
904+--- old/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h 1970-01-01 00:00:00.000000000 +0000
905++++ new/include/Qt3D/5.2.0/Qt3D/private/qglabstracteffect_p.h 2013-07-31 10:15:41.000000000 +0000
906+@@ -0,0 +1 @@
907++#include "../../../../../src/threed/painting/qglabstracteffect_p.h"
908+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h
909+--- old/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h 1970-01-01 00:00:00.000000000 +0000
910++++ new/include/Qt3D/5.2.0/Qt3D/private/qglbuilder_p.h 2013-07-31 10:15:41.000000000 +0000
911+@@ -0,0 +1 @@
912++#include "../../../../../src/threed/geometry/qglbuilder_p.h"
913+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h
914+--- old/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h 1970-01-01 00:00:00.000000000 +0000
915++++ new/include/Qt3D/5.2.0/Qt3D/private/qglcolladafxeffect_p.h 2013-07-31 10:15:41.000000000 +0000
916+@@ -0,0 +1 @@
917++#include "../../../../../src/threed/effects/qglcolladafxeffect_p.h"
918+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h
919+--- old/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h 1970-01-01 00:00:00.000000000 +0000
920++++ new/include/Qt3D/5.2.0/Qt3D/private/qglcontextsurface_p.h 2013-07-31 10:15:41.000000000 +0000
921+@@ -0,0 +1 @@
922++#include "../../../../../src/threed/surfaces/qglcontextsurface_p.h"
923+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h
924+--- old/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h 1970-01-01 00:00:00.000000000 +0000
925++++ new/include/Qt3D/5.2.0/Qt3D/private/qgldrawbuffersurface_p.h 2013-07-31 10:15:41.000000000 +0000
926+@@ -0,0 +1 @@
927++#include "../../../../../src/threed/surfaces/qgldrawbuffersurface_p.h"
928+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h
929+--- old/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h 1970-01-01 00:00:00.000000000 +0000
930++++ new/include/Qt3D/5.2.0/Qt3D/private/qglext_p.h 2013-07-31 10:15:41.000000000 +0000
931+@@ -0,0 +1 @@
932++#include "../../../../../src/threed/painting/qglext_p.h"
933+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h
934+--- old/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h 1970-01-01 00:00:00.000000000 +0000
935++++ new/include/Qt3D/5.2.0/Qt3D/private/qglflatcoloreffect_p.h 2013-07-31 10:15:41.000000000 +0000
936+@@ -0,0 +1 @@
937++#include "../../../../../src/threed/effects/qglflatcoloreffect_p.h"
938+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h
939+--- old/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h 1970-01-01 00:00:00.000000000 +0000
940++++ new/include/Qt3D/5.2.0/Qt3D/private/qglflattextureeffect_p.h 2013-07-31 10:15:41.000000000 +0000
941+@@ -0,0 +1 @@
942++#include "../../../../../src/threed/effects/qglflattextureeffect_p.h"
943+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h
944+--- old/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h 1970-01-01 00:00:00.000000000 +0000
945++++ new/include/Qt3D/5.2.0/Qt3D/private/qgllitmaterialeffect_p.h 2013-07-31 10:15:41.000000000 +0000
946+@@ -0,0 +1 @@
947++#include "../../../../../src/threed/effects/qgllitmaterialeffect_p.h"
948+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h
949+--- old/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h 1970-01-01 00:00:00.000000000 +0000
950++++ new/include/Qt3D/5.2.0/Qt3D/private/qgllittextureeffect_p.h 2013-07-31 10:15:41.000000000 +0000
951+@@ -0,0 +1 @@
952++#include "../../../../../src/threed/effects/qgllittextureeffect_p.h"
953+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h
954+--- old/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h 1970-01-01 00:00:00.000000000 +0000
955++++ new/include/Qt3D/5.2.0/Qt3D/private/qglmaskedsurface_p.h 2013-07-31 10:15:41.000000000 +0000
956+@@ -0,0 +1 @@
957++#include "../../../../../src/threed/surfaces/qglmaskedsurface_p.h"
958+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h
959+--- old/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h 1970-01-01 00:00:00.000000000 +0000
960++++ new/include/Qt3D/5.2.0/Qt3D/private/qglmaterial_p.h 2013-07-31 10:15:41.000000000 +0000
961+@@ -0,0 +1 @@
962++#include "../../../../../src/threed/materials/qglmaterial_p.h"
963+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h
964+--- old/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h 1970-01-01 00:00:00.000000000 +0000
965++++ new/include/Qt3D/5.2.0/Qt3D/private/qglmockview_p.h 2013-07-31 10:15:41.000000000 +0000
966+@@ -0,0 +1 @@
967++#include "../../../../../src/threed/viewing/qglmockview_p.h"
968+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h
969+--- old/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h 1970-01-01 00:00:00.000000000 +0000
970++++ new/include/Qt3D/5.2.0/Qt3D/private/qglpainter_p.h 2013-07-31 10:15:41.000000000 +0000
971+@@ -0,0 +1 @@
972++#include "../../../../../src/threed/painting/qglpainter_p.h"
973+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h
974+--- old/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h 1970-01-01 00:00:00.000000000 +0000
975++++ new/include/Qt3D/5.2.0/Qt3D/private/qglpaintersurface_p.h 2013-07-31 10:15:41.000000000 +0000
976+@@ -0,0 +1 @@
977++#include "../../../../../src/threed/surfaces/qglpaintersurface_p.h"
978+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h
979+--- old/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h 1970-01-01 00:00:00.000000000 +0000
980++++ new/include/Qt3D/5.2.0/Qt3D/private/qglpickcolors_p.h 2013-07-31 10:15:41.000000000 +0000
981+@@ -0,0 +1 @@
982++#include "../../../../../src/threed/painting/qglpickcolors_p.h"
983+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h
984+--- old/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h 1970-01-01 00:00:00.000000000 +0000
985++++ new/include/Qt3D/5.2.0/Qt3D/private/qglscenenode_p.h 2013-07-31 10:15:41.000000000 +0000
986+@@ -0,0 +1 @@
987++#include "../../../../../src/threed/scene/qglscenenode_p.h"
988+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h
989+--- old/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h 1970-01-01 00:00:00.000000000 +0000
990++++ new/include/Qt3D/5.2.0/Qt3D/private/qglsection_p.h 2013-07-31 10:15:41.000000000 +0000
991+@@ -0,0 +1 @@
992++#include "../../../../../src/threed/geometry/qglsection_p.h"
993+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h
994+--- old/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h 1970-01-01 00:00:00.000000000 +0000
995++++ new/include/Qt3D/5.2.0/Qt3D/private/qglteapot_data_p.h 2013-07-31 10:15:41.000000000 +0000
996+@@ -0,0 +1 @@
997++#include "../../../../../src/threed/geometry/qglteapot_data_p.h"
998+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h
999+--- old/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h 1970-01-01 00:00:00.000000000 +0000
1000++++ new/include/Qt3D/5.2.0/Qt3D/private/qgltexture2d_p.h 2013-07-31 10:15:41.000000000 +0000
1001+@@ -0,0 +1 @@
1002++#include "../../../../../src/threed/textures/qgltexture2d_p.h"
1003+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h new/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h
1004+--- old/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h 1970-01-01 00:00:00.000000000 +0000
1005++++ new/include/Qt3D/5.2.0/Qt3D/private/qgltextureutils_p.h 2013-07-31 10:15:41.000000000 +0000
1006+@@ -0,0 +1 @@
1007++#include "../../../../../src/threed/textures/qgltextureutils_p.h"
1008+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h new/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h
1009+--- old/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h 1970-01-01 00:00:00.000000000 +0000
1010++++ new/include/Qt3D/5.2.0/Qt3D/private/qglvertexbundle_p.h 2013-07-31 10:15:41.000000000 +0000
1011+@@ -0,0 +1 @@
1012++#include "../../../../../src/threed/arrays/qglvertexbundle_p.h"
1013+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h new/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h
1014+--- old/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h 1970-01-01 00:00:00.000000000 +0000
1015++++ new/include/Qt3D/5.2.0/Qt3D/private/qmatrix4x4stack_p.h 2013-07-31 10:15:41.000000000 +0000
1016+@@ -0,0 +1 @@
1017++#include "../../../../../src/threed/painting/qmatrix4x4stack_p.h"
1018+diff -urN old/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h new/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h
1019+--- old/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h 1970-01-01 00:00:00.000000000 +0000
1020++++ new/include/Qt3D/5.2.0/Qt3D/private/qvector_utils_p.h 2013-07-31 10:15:41.000000000 +0000
1021+@@ -0,0 +1 @@
1022++#include "../../../../../src/threed/geometry/qvector_utils_p.h"
1023+diff -urN old/include/Qt3D/headers.pri new/include/Qt3D/headers.pri
1024+--- old/include/Qt3D/headers.pri 1970-01-01 00:00:00.000000000 +0000
1025++++ new/include/Qt3D/headers.pri 2013-12-17 16:35:20.787962383 +0000
1026+@@ -0,0 +1,4 @@
1027++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
1028++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
1029++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
1030++SYNCQT.QPA_HEADER_FILES =
1031+diff -urN old/include/Qt3D/QAreaAllocator new/include/Qt3D/QAreaAllocator
1032+--- old/include/Qt3D/QAreaAllocator 1970-01-01 00:00:00.000000000 +0000
1033++++ new/include/Qt3D/QAreaAllocator 2013-07-31 10:15:41.000000000 +0000
1034+@@ -0,0 +1 @@
1035++#include "qareaallocator.h"
1036+diff -urN old/include/Qt3D/qareaallocator.h new/include/Qt3D/qareaallocator.h
1037+--- old/include/Qt3D/qareaallocator.h 1970-01-01 00:00:00.000000000 +0000
1038++++ new/include/Qt3D/qareaallocator.h 2013-07-31 10:15:41.000000000 +0000
1039+@@ -0,0 +1 @@
1040++#include "../../src/threed/textures/qareaallocator.h"
1041+diff -urN old/include/Qt3D/QArray new/include/Qt3D/QArray
1042+--- old/include/Qt3D/QArray 1970-01-01 00:00:00.000000000 +0000
1043++++ new/include/Qt3D/QArray 2013-07-31 10:15:41.000000000 +0000
1044+@@ -0,0 +1 @@
1045++#include "qarray.h"
1046+diff -urN old/include/Qt3D/QArrayAlignedChar new/include/Qt3D/QArrayAlignedChar
1047+--- old/include/Qt3D/QArrayAlignedChar 1970-01-01 00:00:00.000000000 +0000
1048++++ new/include/Qt3D/QArrayAlignedChar 2013-07-31 10:15:41.000000000 +0000
1049+@@ -0,0 +1 @@
1050++#include "qarray.h"
1051+diff -urN old/include/Qt3D/QArrayAlignedPrealloc new/include/Qt3D/QArrayAlignedPrealloc
1052+--- old/include/Qt3D/QArrayAlignedPrealloc 1970-01-01 00:00:00.000000000 +0000
1053++++ new/include/Qt3D/QArrayAlignedPrealloc 2013-07-31 10:15:41.000000000 +0000
1054+@@ -0,0 +1 @@
1055++#include "qarray.h"
1056+diff -urN old/include/Qt3D/qarray.h new/include/Qt3D/qarray.h
1057+--- old/include/Qt3D/qarray.h 1970-01-01 00:00:00.000000000 +0000
1058++++ new/include/Qt3D/qarray.h 2013-07-31 10:15:41.000000000 +0000
1059+@@ -0,0 +1 @@
1060++#include "../../src/threed/arrays/qarray.h"
1061+diff -urN old/include/Qt3D/QBox3D new/include/Qt3D/QBox3D
1062+--- old/include/Qt3D/QBox3D 1970-01-01 00:00:00.000000000 +0000
1063++++ new/include/Qt3D/QBox3D 2013-07-31 10:15:41.000000000 +0000
1064+@@ -0,0 +1 @@
1065++#include "qbox3d.h"
1066+diff -urN old/include/Qt3D/qbox3d.h new/include/Qt3D/qbox3d.h
1067+--- old/include/Qt3D/qbox3d.h 1970-01-01 00:00:00.000000000 +0000
1068++++ new/include/Qt3D/qbox3d.h 2013-07-31 10:15:41.000000000 +0000
1069+@@ -0,0 +1 @@
1070++#include "../../src/threed/math3d/qbox3d.h"
1071+diff -urN old/include/Qt3D/QColor4ub new/include/Qt3D/QColor4ub
1072+--- old/include/Qt3D/QColor4ub 1970-01-01 00:00:00.000000000 +0000
1073++++ new/include/Qt3D/QColor4ub 2013-07-31 10:15:41.000000000 +0000
1074+@@ -0,0 +1 @@
1075++#include "qcolor4ub.h"
1076+diff -urN old/include/Qt3D/qcolor4ub.h new/include/Qt3D/qcolor4ub.h
1077+--- old/include/Qt3D/qcolor4ub.h 1970-01-01 00:00:00.000000000 +0000
1078++++ new/include/Qt3D/qcolor4ub.h 2013-07-31 10:15:41.000000000 +0000
1079+@@ -0,0 +1 @@
1080++#include "../../src/threed/arrays/qcolor4ub.h"
1081+diff -urN old/include/Qt3D/QCustomDataArray new/include/Qt3D/QCustomDataArray
1082+--- old/include/Qt3D/QCustomDataArray 1970-01-01 00:00:00.000000000 +0000
1083++++ new/include/Qt3D/QCustomDataArray 2013-07-31 10:15:41.000000000 +0000
1084+@@ -0,0 +1 @@
1085++#include "qcustomdataarray.h"
1086+diff -urN old/include/Qt3D/qcustomdataarray.h new/include/Qt3D/qcustomdataarray.h
1087+--- old/include/Qt3D/qcustomdataarray.h 1970-01-01 00:00:00.000000000 +0000
1088++++ new/include/Qt3D/qcustomdataarray.h 2013-07-31 10:15:41.000000000 +0000
1089+@@ -0,0 +1 @@
1090++#include "../../src/threed/arrays/qcustomdataarray.h"
1091+diff -urN old/include/Qt3D/QDownloadManager new/include/Qt3D/QDownloadManager
1092+--- old/include/Qt3D/QDownloadManager 1970-01-01 00:00:00.000000000 +0000
1093++++ new/include/Qt3D/QDownloadManager 2013-07-31 10:15:41.000000000 +0000
1094+@@ -0,0 +1 @@
1095++#include "qdownloadmanager.h"
1096+diff -urN old/include/Qt3D/qdownloadmanager.h new/include/Qt3D/qdownloadmanager.h
1097+--- old/include/Qt3D/qdownloadmanager.h 1970-01-01 00:00:00.000000000 +0000
1098++++ new/include/Qt3D/qdownloadmanager.h 2013-07-31 10:15:41.000000000 +0000
1099+@@ -0,0 +1 @@
1100++#include "../../src/threed/network/qdownloadmanager.h"
1101+diff -urN old/include/Qt3D/QGeneralAreaAllocator new/include/Qt3D/QGeneralAreaAllocator
1102+--- old/include/Qt3D/QGeneralAreaAllocator 1970-01-01 00:00:00.000000000 +0000
1103++++ new/include/Qt3D/QGeneralAreaAllocator 2013-07-31 10:15:41.000000000 +0000
1104+@@ -0,0 +1 @@
1105++#include "qareaallocator.h"
1106+diff -urN old/include/Qt3D/QGeometryData new/include/Qt3D/QGeometryData
1107+--- old/include/Qt3D/QGeometryData 1970-01-01 00:00:00.000000000 +0000
1108++++ new/include/Qt3D/QGeometryData 2013-07-31 10:15:41.000000000 +0000
1109+@@ -0,0 +1 @@
1110++#include "qgeometrydata.h"
1111+diff -urN old/include/Qt3D/qgeometrydata.h new/include/Qt3D/qgeometrydata.h
1112+--- old/include/Qt3D/qgeometrydata.h 1970-01-01 00:00:00.000000000 +0000
1113++++ new/include/Qt3D/qgeometrydata.h 2013-07-31 10:15:41.000000000 +0000
1114+@@ -0,0 +1 @@
1115++#include "../../src/threed/geometry/qgeometrydata.h"
1116+diff -urN old/include/Qt3D/QGLAbstractEffect new/include/Qt3D/QGLAbstractEffect
1117+--- old/include/Qt3D/QGLAbstractEffect 1970-01-01 00:00:00.000000000 +0000
1118++++ new/include/Qt3D/QGLAbstractEffect 2013-07-31 10:15:41.000000000 +0000
1119+@@ -0,0 +1 @@
1120++#include "qglabstracteffect.h"
1121+diff -urN old/include/Qt3D/qglabstracteffect.h new/include/Qt3D/qglabstracteffect.h
1122+--- old/include/Qt3D/qglabstracteffect.h 1970-01-01 00:00:00.000000000 +0000
1123++++ new/include/Qt3D/qglabstracteffect.h 2013-07-31 10:15:41.000000000 +0000
1124+@@ -0,0 +1 @@
1125++#include "../../src/threed/painting/qglabstracteffect.h"
1126+diff -urN old/include/Qt3D/QGLAbstractMaterial new/include/Qt3D/QGLAbstractMaterial
1127+--- old/include/Qt3D/QGLAbstractMaterial 1970-01-01 00:00:00.000000000 +0000
1128++++ new/include/Qt3D/QGLAbstractMaterial 2013-07-31 10:15:41.000000000 +0000
1129+@@ -0,0 +1 @@
1130++#include "qglabstractmaterial.h"
1131+diff -urN old/include/Qt3D/qglabstractmaterial.h new/include/Qt3D/qglabstractmaterial.h
1132+--- old/include/Qt3D/qglabstractmaterial.h 1970-01-01 00:00:00.000000000 +0000
1133++++ new/include/Qt3D/qglabstractmaterial.h 2013-07-31 10:15:41.000000000 +0000
1134+@@ -0,0 +1 @@
1135++#include "../../src/threed/materials/qglabstractmaterial.h"
1136+diff -urN old/include/Qt3D/QGLAbstractScene new/include/Qt3D/QGLAbstractScene
1137+--- old/include/Qt3D/QGLAbstractScene 1970-01-01 00:00:00.000000000 +0000
1138++++ new/include/Qt3D/QGLAbstractScene 2013-07-31 10:15:41.000000000 +0000
1139+@@ -0,0 +1 @@
1140++#include "qglabstractscene.h"
1141+diff -urN old/include/Qt3D/qglabstractscene.h new/include/Qt3D/qglabstractscene.h
1142+--- old/include/Qt3D/qglabstractscene.h 1970-01-01 00:00:00.000000000 +0000
1143++++ new/include/Qt3D/qglabstractscene.h 2013-07-31 10:15:41.000000000 +0000
1144+@@ -0,0 +1 @@
1145++#include "../../src/threed/scene/qglabstractscene.h"
1146+diff -urN old/include/Qt3D/QGLAbstractSurface new/include/Qt3D/QGLAbstractSurface
1147+--- old/include/Qt3D/QGLAbstractSurface 1970-01-01 00:00:00.000000000 +0000
1148++++ new/include/Qt3D/QGLAbstractSurface 2013-07-31 10:15:41.000000000 +0000
1149+@@ -0,0 +1 @@
1150++#include "qglabstractsurface.h"
1151+diff -urN old/include/Qt3D/qglabstractsurface.h new/include/Qt3D/qglabstractsurface.h
1152+--- old/include/Qt3D/qglabstractsurface.h 1970-01-01 00:00:00.000000000 +0000
1153++++ new/include/Qt3D/qglabstractsurface.h 2013-07-31 10:15:41.000000000 +0000
1154+@@ -0,0 +1 @@
1155++#include "../../src/threed/surfaces/qglabstractsurface.h"
1156+diff -urN old/include/Qt3D/QGLAttributeDescription new/include/Qt3D/QGLAttributeDescription
1157+--- old/include/Qt3D/QGLAttributeDescription 1970-01-01 00:00:00.000000000 +0000
1158++++ new/include/Qt3D/QGLAttributeDescription 2013-07-31 10:15:41.000000000 +0000
1159+@@ -0,0 +1 @@
1160++#include "qglattributedescription.h"
1161+diff -urN old/include/Qt3D/qglattributedescription.h new/include/Qt3D/qglattributedescription.h
1162+--- old/include/Qt3D/qglattributedescription.h 1970-01-01 00:00:00.000000000 +0000
1163++++ new/include/Qt3D/qglattributedescription.h 2013-07-31 10:15:41.000000000 +0000
1164+@@ -0,0 +1 @@
1165++#include "../../src/threed/arrays/qglattributedescription.h"
1166+diff -urN old/include/Qt3D/QGLAttributeSet new/include/Qt3D/QGLAttributeSet
1167+--- old/include/Qt3D/QGLAttributeSet 1970-01-01 00:00:00.000000000 +0000
1168++++ new/include/Qt3D/QGLAttributeSet 2013-07-31 10:15:41.000000000 +0000
1169+@@ -0,0 +1 @@
1170++#include "qglattributeset.h"
1171+diff -urN old/include/Qt3D/qglattributeset.h new/include/Qt3D/qglattributeset.h
1172+--- old/include/Qt3D/qglattributeset.h 1970-01-01 00:00:00.000000000 +0000
1173++++ new/include/Qt3D/qglattributeset.h 2013-07-31 10:15:41.000000000 +0000
1174+@@ -0,0 +1 @@
1175++#include "../../src/threed/arrays/qglattributeset.h"
1176+diff -urN old/include/Qt3D/QGLAttributeValue new/include/Qt3D/QGLAttributeValue
1177+--- old/include/Qt3D/QGLAttributeValue 1970-01-01 00:00:00.000000000 +0000
1178++++ new/include/Qt3D/QGLAttributeValue 2013-07-31 10:15:41.000000000 +0000
1179+@@ -0,0 +1 @@
1180++#include "qglattributevalue.h"
1181+diff -urN old/include/Qt3D/qglattributevalue.h new/include/Qt3D/qglattributevalue.h
1182+--- old/include/Qt3D/qglattributevalue.h 1970-01-01 00:00:00.000000000 +0000
1183++++ new/include/Qt3D/qglattributevalue.h 2013-07-31 10:15:41.000000000 +0000
1184+@@ -0,0 +1 @@
1185++#include "../../src/threed/arrays/qglattributevalue.h"
1186+diff -urN old/include/Qt3D/QGLBezierPatches new/include/Qt3D/QGLBezierPatches
1187+--- old/include/Qt3D/QGLBezierPatches 1970-01-01 00:00:00.000000000 +0000
1188++++ new/include/Qt3D/QGLBezierPatches 2013-07-31 10:15:41.000000000 +0000
1189+@@ -0,0 +1 @@
1190++#include "qglbezierpatches.h"
1191+diff -urN old/include/Qt3D/qglbezierpatches.h new/include/Qt3D/qglbezierpatches.h
1192+--- old/include/Qt3D/qglbezierpatches.h 1970-01-01 00:00:00.000000000 +0000
1193++++ new/include/Qt3D/qglbezierpatches.h 2013-07-31 10:15:41.000000000 +0000
1194+@@ -0,0 +1 @@
1195++#include "../../src/threed/geometry/qglbezierpatches.h"
1196+diff -urN old/include/Qt3D/QGLBezierScene new/include/Qt3D/QGLBezierScene
1197+--- old/include/Qt3D/QGLBezierScene 1970-01-01 00:00:00.000000000 +0000
1198++++ new/include/Qt3D/QGLBezierScene 2013-07-31 10:15:41.000000000 +0000
1199+@@ -0,0 +1 @@
1200++#include "qglbezierscene.h"
1201+diff -urN old/include/Qt3D/qglbezierscene.h new/include/Qt3D/qglbezierscene.h
1202+--- old/include/Qt3D/qglbezierscene.h 1970-01-01 00:00:00.000000000 +0000
1203++++ new/include/Qt3D/qglbezierscene.h 2013-07-31 10:15:41.000000000 +0000
1204+@@ -0,0 +1 @@
1205++#include "../../src/threed/scene_bezier/qglbezierscene.h"
1206+diff -urN old/include/Qt3D/QGLBezierSceneHandler new/include/Qt3D/QGLBezierSceneHandler
1207+--- old/include/Qt3D/QGLBezierSceneHandler 1970-01-01 00:00:00.000000000 +0000
1208++++ new/include/Qt3D/QGLBezierSceneHandler 2013-07-31 10:15:41.000000000 +0000
1209+@@ -0,0 +1 @@
1210++#include "qglbezierscenehandler.h"
1211+diff -urN old/include/Qt3D/qglbezierscenehandler.h new/include/Qt3D/qglbezierscenehandler.h
1212+--- old/include/Qt3D/qglbezierscenehandler.h 1970-01-01 00:00:00.000000000 +0000
1213++++ new/include/Qt3D/qglbezierscenehandler.h 2013-07-31 10:15:41.000000000 +0000
1214+@@ -0,0 +1 @@
1215++#include "../../src/threed/scene_bezier/qglbezierscenehandler.h"
1216+diff -urN old/include/Qt3D/QGLBuilder new/include/Qt3D/QGLBuilder
1217+--- old/include/Qt3D/QGLBuilder 1970-01-01 00:00:00.000000000 +0000
1218++++ new/include/Qt3D/QGLBuilder 2013-07-31 10:15:41.000000000 +0000
1219+@@ -0,0 +1 @@
1220++#include "qglbuilder.h"
1221+diff -urN old/include/Qt3D/qglbuilder.h new/include/Qt3D/qglbuilder.h
1222+--- old/include/Qt3D/qglbuilder.h 1970-01-01 00:00:00.000000000 +0000
1223++++ new/include/Qt3D/qglbuilder.h 2013-07-31 10:15:41.000000000 +0000
1224+@@ -0,0 +1 @@
1225++#include "../../src/threed/geometry/qglbuilder.h"
1226+diff -urN old/include/Qt3D/QGLCamera new/include/Qt3D/QGLCamera
1227+--- old/include/Qt3D/QGLCamera 1970-01-01 00:00:00.000000000 +0000
1228++++ new/include/Qt3D/QGLCamera 2013-07-31 10:15:41.000000000 +0000
1229+@@ -0,0 +1 @@
1230++#include "qglcamera.h"
1231+diff -urN old/include/Qt3D/QGLCameraAnimation new/include/Qt3D/QGLCameraAnimation
1232+--- old/include/Qt3D/QGLCameraAnimation 1970-01-01 00:00:00.000000000 +0000
1233++++ new/include/Qt3D/QGLCameraAnimation 2013-07-31 10:15:41.000000000 +0000
1234+@@ -0,0 +1 @@
1235++#include "qglcameraanimation.h"
1236+diff -urN old/include/Qt3D/qglcameraanimation.h new/include/Qt3D/qglcameraanimation.h
1237+--- old/include/Qt3D/qglcameraanimation.h 1970-01-01 00:00:00.000000000 +0000
1238++++ new/include/Qt3D/qglcameraanimation.h 2013-07-31 10:15:41.000000000 +0000
1239+@@ -0,0 +1 @@
1240++#include "../../src/threed/viewing/qglcameraanimation.h"
1241+diff -urN old/include/Qt3D/qglcamera.h new/include/Qt3D/qglcamera.h
1242+--- old/include/Qt3D/qglcamera.h 1970-01-01 00:00:00.000000000 +0000
1243++++ new/include/Qt3D/qglcamera.h 2013-07-31 10:15:41.000000000 +0000
1244+@@ -0,0 +1 @@
1245++#include "../../src/threed/viewing/qglcamera.h"
1246+diff -urN old/include/Qt3D/QGLColladaFxEffect new/include/Qt3D/QGLColladaFxEffect
1247+--- old/include/Qt3D/QGLColladaFxEffect 1970-01-01 00:00:00.000000000 +0000
1248++++ new/include/Qt3D/QGLColladaFxEffect 2013-07-31 10:15:41.000000000 +0000
1249+@@ -0,0 +1 @@
1250++#include "qglcolladafxeffect.h"
1251+diff -urN old/include/Qt3D/QGLColladaFxEffectFactory new/include/Qt3D/QGLColladaFxEffectFactory
1252+--- old/include/Qt3D/QGLColladaFxEffectFactory 1970-01-01 00:00:00.000000000 +0000
1253++++ new/include/Qt3D/QGLColladaFxEffectFactory 2013-07-31 10:15:41.000000000 +0000
1254+@@ -0,0 +1 @@
1255++#include "qglcolladafxeffectfactory.h"
1256+diff -urN old/include/Qt3D/qglcolladafxeffectfactory.h new/include/Qt3D/qglcolladafxeffectfactory.h
1257+--- old/include/Qt3D/qglcolladafxeffectfactory.h 1970-01-01 00:00:00.000000000 +0000
1258++++ new/include/Qt3D/qglcolladafxeffectfactory.h 2013-07-31 10:15:41.000000000 +0000
1259+@@ -0,0 +1 @@
1260++#include "../../src/threed/effects/qglcolladafxeffectfactory.h"
1261+diff -urN old/include/Qt3D/qglcolladafxeffect.h new/include/Qt3D/qglcolladafxeffect.h
1262+--- old/include/Qt3D/qglcolladafxeffect.h 1970-01-01 00:00:00.000000000 +0000
1263++++ new/include/Qt3D/qglcolladafxeffect.h 2013-07-31 10:15:41.000000000 +0000
1264+@@ -0,0 +1 @@
1265++#include "../../src/threed/effects/qglcolladafxeffect.h"
1266+diff -urN old/include/Qt3D/QGLColladaFxEffectLoader new/include/Qt3D/QGLColladaFxEffectLoader
1267+--- old/include/Qt3D/QGLColladaFxEffectLoader 1970-01-01 00:00:00.000000000 +0000
1268++++ new/include/Qt3D/QGLColladaFxEffectLoader 2013-07-31 10:15:41.000000000 +0000
1269+@@ -0,0 +1 @@
1270++#include "qglcolladafxeffectloader.h"
1271+diff -urN old/include/Qt3D/qglcolladafxeffectloader.h new/include/Qt3D/qglcolladafxeffectloader.h
1272+--- old/include/Qt3D/qglcolladafxeffectloader.h 1970-01-01 00:00:00.000000000 +0000
1273++++ new/include/Qt3D/qglcolladafxeffectloader.h 2013-07-31 10:15:41.000000000 +0000
1274+@@ -0,0 +1 @@
1275++#include "../../src/threed/effects/qglcolladafxeffectloader.h"
1276+diff -urN old/include/Qt3D/QGLColladaImageParam new/include/Qt3D/QGLColladaImageParam
1277+--- old/include/Qt3D/QGLColladaImageParam 1970-01-01 00:00:00.000000000 +0000
1278++++ new/include/Qt3D/QGLColladaImageParam 2013-07-31 10:15:41.000000000 +0000
1279+@@ -0,0 +1 @@
1280++#include "qglcolladafxeffectfactory.h"
1281+diff -urN old/include/Qt3D/QGLColladaParam new/include/Qt3D/QGLColladaParam
1282+--- old/include/Qt3D/QGLColladaParam 1970-01-01 00:00:00.000000000 +0000
1283++++ new/include/Qt3D/QGLColladaParam 2013-07-31 10:15:41.000000000 +0000
1284+@@ -0,0 +1 @@
1285++#include "qglcolladafxeffectfactory.h"
1286+diff -urN old/include/Qt3D/QGLColladaSampler2DParam new/include/Qt3D/QGLColladaSampler2DParam
1287+--- old/include/Qt3D/QGLColladaSampler2DParam 1970-01-01 00:00:00.000000000 +0000
1288++++ new/include/Qt3D/QGLColladaSampler2DParam 2013-07-31 10:15:41.000000000 +0000
1289+@@ -0,0 +1 @@
1290++#include "qglcolladafxeffectfactory.h"
1291+diff -urN old/include/Qt3D/QGLColladaSurfaceParam new/include/Qt3D/QGLColladaSurfaceParam
1292+--- old/include/Qt3D/QGLColladaSurfaceParam 1970-01-01 00:00:00.000000000 +0000
1293++++ new/include/Qt3D/QGLColladaSurfaceParam 2013-07-31 10:15:41.000000000 +0000
1294+@@ -0,0 +1 @@
1295++#include "qglcolladafxeffectfactory.h"
1296+diff -urN old/include/Qt3D/QGLColladaTextureParam new/include/Qt3D/QGLColladaTextureParam
1297+--- old/include/Qt3D/QGLColladaTextureParam 1970-01-01 00:00:00.000000000 +0000
1298++++ new/include/Qt3D/QGLColladaTextureParam 2013-07-31 10:15:41.000000000 +0000
1299+@@ -0,0 +1 @@
1300++#include "qglcolladafxeffectfactory.h"
1301+diff -urN old/include/Qt3D/QGLColorMaterial new/include/Qt3D/QGLColorMaterial
1302+--- old/include/Qt3D/QGLColorMaterial 1970-01-01 00:00:00.000000000 +0000
1303++++ new/include/Qt3D/QGLColorMaterial 2013-07-31 10:15:41.000000000 +0000
1304+@@ -0,0 +1 @@
1305++#include "qglcolormaterial.h"
1306+diff -urN old/include/Qt3D/qglcolormaterial.h new/include/Qt3D/qglcolormaterial.h
1307+--- old/include/Qt3D/qglcolormaterial.h 1970-01-01 00:00:00.000000000 +0000
1308++++ new/include/Qt3D/qglcolormaterial.h 2013-07-31 10:15:41.000000000 +0000
1309+@@ -0,0 +1 @@
1310++#include "../../src/threed/materials/qglcolormaterial.h"
1311+diff -urN old/include/Qt3D/QGLCube new/include/Qt3D/QGLCube
1312+--- old/include/Qt3D/QGLCube 1970-01-01 00:00:00.000000000 +0000
1313++++ new/include/Qt3D/QGLCube 2013-07-31 10:15:41.000000000 +0000
1314+@@ -0,0 +1 @@
1315++#include "qglcube.h"
1316+diff -urN old/include/Qt3D/qglcube.h new/include/Qt3D/qglcube.h
1317+--- old/include/Qt3D/qglcube.h 1970-01-01 00:00:00.000000000 +0000
1318++++ new/include/Qt3D/qglcube.h 2013-07-31 10:15:41.000000000 +0000
1319+@@ -0,0 +1 @@
1320++#include "../../src/threed/geometry/qglcube.h"
1321+diff -urN old/include/Qt3D/QGLCylinder new/include/Qt3D/QGLCylinder
1322+--- old/include/Qt3D/QGLCylinder 1970-01-01 00:00:00.000000000 +0000
1323++++ new/include/Qt3D/QGLCylinder 2013-07-31 10:15:41.000000000 +0000
1324+@@ -0,0 +1 @@
1325++#include "qglcylinder.h"
1326+diff -urN old/include/Qt3D/qglcylinder.h new/include/Qt3D/qglcylinder.h
1327+--- old/include/Qt3D/qglcylinder.h 1970-01-01 00:00:00.000000000 +0000
1328++++ new/include/Qt3D/qglcylinder.h 2013-07-31 10:15:41.000000000 +0000
1329+@@ -0,0 +1 @@
1330++#include "../../src/threed/geometry/qglcylinder.h"
1331+diff -urN old/include/Qt3D/QGLDome new/include/Qt3D/QGLDome
1332+--- old/include/Qt3D/QGLDome 1970-01-01 00:00:00.000000000 +0000
1333++++ new/include/Qt3D/QGLDome 2013-07-31 10:15:41.000000000 +0000
1334+@@ -0,0 +1 @@
1335++#include "qgldome.h"
1336+diff -urN old/include/Qt3D/qgldome.h new/include/Qt3D/qgldome.h
1337+--- old/include/Qt3D/qgldome.h 1970-01-01 00:00:00.000000000 +0000
1338++++ new/include/Qt3D/qgldome.h 2013-07-31 10:15:41.000000000 +0000
1339+@@ -0,0 +1 @@
1340++#include "../../src/threed/geometry/qgldome.h"
1341+diff -urN old/include/Qt3D/QGLFramebufferObjectSurface new/include/Qt3D/QGLFramebufferObjectSurface
1342+--- old/include/Qt3D/QGLFramebufferObjectSurface 1970-01-01 00:00:00.000000000 +0000
1343++++ new/include/Qt3D/QGLFramebufferObjectSurface 2013-07-31 10:15:41.000000000 +0000
1344+@@ -0,0 +1 @@
1345++#include "qglframebufferobjectsurface.h"
1346+diff -urN old/include/Qt3D/qglframebufferobjectsurface.h new/include/Qt3D/qglframebufferobjectsurface.h
1347+--- old/include/Qt3D/qglframebufferobjectsurface.h 1970-01-01 00:00:00.000000000 +0000
1348++++ new/include/Qt3D/qglframebufferobjectsurface.h 2013-07-31 10:15:41.000000000 +0000
1349+@@ -0,0 +1 @@
1350++#include "../../src/threed/surfaces/qglframebufferobjectsurface.h"
1351+diff -urN old/include/Qt3D/QGLIndexBuffer new/include/Qt3D/QGLIndexBuffer
1352+--- old/include/Qt3D/QGLIndexBuffer 1970-01-01 00:00:00.000000000 +0000
1353++++ new/include/Qt3D/QGLIndexBuffer 2013-07-31 10:15:41.000000000 +0000
1354+@@ -0,0 +1 @@
1355++#include "qglindexbuffer.h"
1356+diff -urN old/include/Qt3D/qglindexbuffer.h new/include/Qt3D/qglindexbuffer.h
1357+--- old/include/Qt3D/qglindexbuffer.h 1970-01-01 00:00:00.000000000 +0000
1358++++ new/include/Qt3D/qglindexbuffer.h 2013-07-31 10:15:41.000000000 +0000
1359+@@ -0,0 +1 @@
1360++#include "../../src/threed/arrays/qglindexbuffer.h"
1361+diff -urN old/include/Qt3D/QGLLightModel new/include/Qt3D/QGLLightModel
1362+--- old/include/Qt3D/QGLLightModel 1970-01-01 00:00:00.000000000 +0000
1363++++ new/include/Qt3D/QGLLightModel 2013-07-31 10:15:41.000000000 +0000
1364+@@ -0,0 +1 @@
1365++#include "qgllightmodel.h"
1366+diff -urN old/include/Qt3D/qgllightmodel.h new/include/Qt3D/qgllightmodel.h
1367+--- old/include/Qt3D/qgllightmodel.h 1970-01-01 00:00:00.000000000 +0000
1368++++ new/include/Qt3D/qgllightmodel.h 2013-07-31 10:15:41.000000000 +0000
1369+@@ -0,0 +1 @@
1370++#include "../../src/threed/painting/qgllightmodel.h"
1371+diff -urN old/include/Qt3D/QGLLightParameters new/include/Qt3D/QGLLightParameters
1372+--- old/include/Qt3D/QGLLightParameters 1970-01-01 00:00:00.000000000 +0000
1373++++ new/include/Qt3D/QGLLightParameters 2013-07-31 10:15:41.000000000 +0000
1374+@@ -0,0 +1 @@
1375++#include "qgllightparameters.h"
1376+diff -urN old/include/Qt3D/qgllightparameters.h new/include/Qt3D/qgllightparameters.h
1377+--- old/include/Qt3D/qgllightparameters.h 1970-01-01 00:00:00.000000000 +0000
1378++++ new/include/Qt3D/qgllightparameters.h 2013-07-31 10:15:41.000000000 +0000
1379+@@ -0,0 +1 @@
1380++#include "../../src/threed/painting/qgllightparameters.h"
1381+diff -urN old/include/Qt3D/QGLMaterial new/include/Qt3D/QGLMaterial
1382+--- old/include/Qt3D/QGLMaterial 1970-01-01 00:00:00.000000000 +0000
1383++++ new/include/Qt3D/QGLMaterial 2013-07-31 10:15:41.000000000 +0000
1384+@@ -0,0 +1 @@
1385++#include "qglmaterial.h"
1386+diff -urN old/include/Qt3D/QGLMaterialCollection new/include/Qt3D/QGLMaterialCollection
1387+--- old/include/Qt3D/QGLMaterialCollection 1970-01-01 00:00:00.000000000 +0000
1388++++ new/include/Qt3D/QGLMaterialCollection 2013-07-31 10:15:41.000000000 +0000
1389+@@ -0,0 +1 @@
1390++#include "qglmaterialcollection.h"
1391+diff -urN old/include/Qt3D/qglmaterialcollection.h new/include/Qt3D/qglmaterialcollection.h
1392+--- old/include/Qt3D/qglmaterialcollection.h 1970-01-01 00:00:00.000000000 +0000
1393++++ new/include/Qt3D/qglmaterialcollection.h 2013-07-31 10:15:41.000000000 +0000
1394+@@ -0,0 +1 @@
1395++#include "../../src/threed/geometry/qglmaterialcollection.h"
1396+diff -urN old/include/Qt3D/qglmaterial.h new/include/Qt3D/qglmaterial.h
1397+--- old/include/Qt3D/qglmaterial.h 1970-01-01 00:00:00.000000000 +0000
1398++++ new/include/Qt3D/qglmaterial.h 2013-07-31 10:15:41.000000000 +0000
1399+@@ -0,0 +1 @@
1400++#include "../../src/threed/materials/qglmaterial.h"
1401+diff -urN old/include/Qt3D/QGLMockView new/include/Qt3D/QGLMockView
1402+--- old/include/Qt3D/QGLMockView 1970-01-01 00:00:00.000000000 +0000
1403++++ new/include/Qt3D/QGLMockView 2013-07-31 10:15:41.000000000 +0000
1404+@@ -0,0 +1 @@
1405++#include "qglmockview.h"
1406+diff -urN old/include/Qt3D/qglmockview.h new/include/Qt3D/qglmockview.h
1407+--- old/include/Qt3D/qglmockview.h 1970-01-01 00:00:00.000000000 +0000
1408++++ new/include/Qt3D/qglmockview.h 2013-07-31 10:15:41.000000000 +0000
1409+@@ -0,0 +1 @@
1410++#include "../../src/threed/viewing/qglmockview.h"
1411+diff -urN old/include/Qt3D/qglnamespace.h new/include/Qt3D/qglnamespace.h
1412+--- old/include/Qt3D/qglnamespace.h 1970-01-01 00:00:00.000000000 +0000
1413++++ new/include/Qt3D/qglnamespace.h 2013-07-31 10:15:41.000000000 +0000
1414+@@ -0,0 +1 @@
1415++#include "../../src/threed/global/qglnamespace.h"
1416+diff -urN old/include/Qt3D/QGLPainter new/include/Qt3D/QGLPainter
1417+--- old/include/Qt3D/QGLPainter 1970-01-01 00:00:00.000000000 +0000
1418++++ new/include/Qt3D/QGLPainter 2013-07-31 10:15:41.000000000 +0000
1419+@@ -0,0 +1 @@
1420++#include "qglpainter.h"
1421+diff -urN old/include/Qt3D/qglpainter.h new/include/Qt3D/qglpainter.h
1422+--- old/include/Qt3D/qglpainter.h 1970-01-01 00:00:00.000000000 +0000
1423++++ new/include/Qt3D/qglpainter.h 2013-07-31 10:15:41.000000000 +0000
1424+@@ -0,0 +1 @@
1425++#include "../../src/threed/painting/qglpainter.h"
1426+diff -urN old/include/Qt3D/QGLPickNode new/include/Qt3D/QGLPickNode
1427+--- old/include/Qt3D/QGLPickNode 1970-01-01 00:00:00.000000000 +0000
1428++++ new/include/Qt3D/QGLPickNode 2013-07-31 10:15:41.000000000 +0000
1429+@@ -0,0 +1 @@
1430++#include "qglpicknode.h"
1431+diff -urN old/include/Qt3D/qglpicknode.h new/include/Qt3D/qglpicknode.h
1432+--- old/include/Qt3D/qglpicknode.h 1970-01-01 00:00:00.000000000 +0000
1433++++ new/include/Qt3D/qglpicknode.h 2013-07-31 10:15:41.000000000 +0000
1434+@@ -0,0 +1 @@
1435++#include "../../src/threed/scene/qglpicknode.h"
1436+diff -urN old/include/Qt3D/QGLPixelBufferSurface new/include/Qt3D/QGLPixelBufferSurface
1437+--- old/include/Qt3D/QGLPixelBufferSurface 1970-01-01 00:00:00.000000000 +0000
1438++++ new/include/Qt3D/QGLPixelBufferSurface 2013-07-31 10:15:41.000000000 +0000
1439+@@ -0,0 +1 @@
1440++#include "qglpixelbuffersurface.h"
1441+diff -urN old/include/Qt3D/qglpixelbuffersurface.h new/include/Qt3D/qglpixelbuffersurface.h
1442+--- old/include/Qt3D/qglpixelbuffersurface.h 1970-01-01 00:00:00.000000000 +0000
1443++++ new/include/Qt3D/qglpixelbuffersurface.h 2013-07-31 10:15:41.000000000 +0000
1444+@@ -0,0 +1 @@
1445++#include "../../src/threed/surfaces/qglpixelbuffersurface.h"
1446+diff -urN old/include/Qt3D/QGLRenderOrder new/include/Qt3D/QGLRenderOrder
1447+--- old/include/Qt3D/QGLRenderOrder 1970-01-01 00:00:00.000000000 +0000
1448++++ new/include/Qt3D/QGLRenderOrder 2013-07-31 10:15:41.000000000 +0000
1449+@@ -0,0 +1 @@
1450++#include "qglrenderorder.h"
1451+diff -urN old/include/Qt3D/QGLRenderOrderComparator new/include/Qt3D/QGLRenderOrderComparator
1452+--- old/include/Qt3D/QGLRenderOrderComparator 1970-01-01 00:00:00.000000000 +0000
1453++++ new/include/Qt3D/QGLRenderOrderComparator 2013-07-31 10:15:41.000000000 +0000
1454+@@ -0,0 +1 @@
1455++#include "qglrenderordercomparator.h"
1456+diff -urN old/include/Qt3D/qglrenderordercomparator.h new/include/Qt3D/qglrenderordercomparator.h
1457+--- old/include/Qt3D/qglrenderordercomparator.h 1970-01-01 00:00:00.000000000 +0000
1458++++ new/include/Qt3D/qglrenderordercomparator.h 2013-07-31 10:15:41.000000000 +0000
1459+@@ -0,0 +1 @@
1460++#include "../../src/threed/scene/qglrenderordercomparator.h"
1461+diff -urN old/include/Qt3D/qglrenderorder.h new/include/Qt3D/qglrenderorder.h
1462+--- old/include/Qt3D/qglrenderorder.h 1970-01-01 00:00:00.000000000 +0000
1463++++ new/include/Qt3D/qglrenderorder.h 2013-07-31 10:15:41.000000000 +0000
1464+@@ -0,0 +1 @@
1465++#include "../../src/threed/scene/qglrenderorder.h"
1466+diff -urN old/include/Qt3D/QGLRenderSequencer new/include/Qt3D/QGLRenderSequencer
1467+--- old/include/Qt3D/QGLRenderSequencer 1970-01-01 00:00:00.000000000 +0000
1468++++ new/include/Qt3D/QGLRenderSequencer 2013-07-31 10:15:41.000000000 +0000
1469+@@ -0,0 +1 @@
1470++#include "qglrendersequencer.h"
1471+diff -urN old/include/Qt3D/qglrendersequencer.h new/include/Qt3D/qglrendersequencer.h
1472+--- old/include/Qt3D/qglrendersequencer.h 1970-01-01 00:00:00.000000000 +0000
1473++++ new/include/Qt3D/qglrendersequencer.h 2013-07-31 10:15:41.000000000 +0000
1474+@@ -0,0 +1 @@
1475++#include "../../src/threed/scene/qglrendersequencer.h"
1476+diff -urN old/include/Qt3D/QGLRenderState new/include/Qt3D/QGLRenderState
1477+--- old/include/Qt3D/QGLRenderState 1970-01-01 00:00:00.000000000 +0000
1478++++ new/include/Qt3D/QGLRenderState 2013-07-31 10:15:41.000000000 +0000
1479+@@ -0,0 +1 @@
1480++#include "qglrenderstate.h"
1481+diff -urN old/include/Qt3D/qglrenderstate.h new/include/Qt3D/qglrenderstate.h
1482+--- old/include/Qt3D/qglrenderstate.h 1970-01-01 00:00:00.000000000 +0000
1483++++ new/include/Qt3D/qglrenderstate.h 2013-07-31 10:15:41.000000000 +0000
1484+@@ -0,0 +1 @@
1485++#include "../../src/threed/scene/qglrenderstate.h"
1486+diff -urN old/include/Qt3D/QGLSceneAnimation new/include/Qt3D/QGLSceneAnimation
1487+--- old/include/Qt3D/QGLSceneAnimation 1970-01-01 00:00:00.000000000 +0000
1488++++ new/include/Qt3D/QGLSceneAnimation 2013-07-31 10:15:41.000000000 +0000
1489+@@ -0,0 +1 @@
1490++#include "qglsceneanimation.h"
1491+diff -urN old/include/Qt3D/qglsceneanimation.h new/include/Qt3D/qglsceneanimation.h
1492+--- old/include/Qt3D/qglsceneanimation.h 1970-01-01 00:00:00.000000000 +0000
1493++++ new/include/Qt3D/qglsceneanimation.h 2013-07-31 10:15:41.000000000 +0000
1494+@@ -0,0 +1 @@
1495++#include "../../src/threed/scene/qglsceneanimation.h"
1496+diff -urN old/include/Qt3D/QGLSceneFormatFactoryInterface new/include/Qt3D/QGLSceneFormatFactoryInterface
1497+--- old/include/Qt3D/QGLSceneFormatFactoryInterface 1970-01-01 00:00:00.000000000 +0000
1498++++ new/include/Qt3D/QGLSceneFormatFactoryInterface 2013-07-31 10:15:41.000000000 +0000
1499+@@ -0,0 +1 @@
1500++#include "qglsceneformatplugin.h"
1501+diff -urN old/include/Qt3D/QGLSceneFormatHandler new/include/Qt3D/QGLSceneFormatHandler
1502+--- old/include/Qt3D/QGLSceneFormatHandler 1970-01-01 00:00:00.000000000 +0000
1503++++ new/include/Qt3D/QGLSceneFormatHandler 2013-07-31 10:15:41.000000000 +0000
1504+@@ -0,0 +1 @@
1505++#include "qglsceneformatplugin.h"
1506+diff -urN old/include/Qt3D/qglsceneformatplugin.h new/include/Qt3D/qglsceneformatplugin.h
1507+--- old/include/Qt3D/qglsceneformatplugin.h 1970-01-01 00:00:00.000000000 +0000
1508++++ new/include/Qt3D/qglsceneformatplugin.h 2013-07-31 10:15:41.000000000 +0000
1509+@@ -0,0 +1 @@
1510++#include "../../src/threed/scene/qglsceneformatplugin.h"
1511+diff -urN old/include/Qt3D/QGLSceneNode new/include/Qt3D/QGLSceneNode
1512+--- old/include/Qt3D/QGLSceneNode 1970-01-01 00:00:00.000000000 +0000
1513++++ new/include/Qt3D/QGLSceneNode 2013-07-31 10:15:41.000000000 +0000
1514+@@ -0,0 +1 @@
1515++#include "qglscenenode.h"
1516+diff -urN old/include/Qt3D/qglscenenode.h new/include/Qt3D/qglscenenode.h
1517+--- old/include/Qt3D/qglscenenode.h 1970-01-01 00:00:00.000000000 +0000
1518++++ new/include/Qt3D/qglscenenode.h 2013-07-31 10:15:41.000000000 +0000
1519+@@ -0,0 +1 @@
1520++#include "../../src/threed/scene/qglscenenode.h"
1521+diff -urN old/include/Qt3D/QGLShaderProgramEffect new/include/Qt3D/QGLShaderProgramEffect
1522+--- old/include/Qt3D/QGLShaderProgramEffect 1970-01-01 00:00:00.000000000 +0000
1523++++ new/include/Qt3D/QGLShaderProgramEffect 2013-07-31 10:15:41.000000000 +0000
1524+@@ -0,0 +1 @@
1525++#include "qglshaderprogrameffect.h"
1526+diff -urN old/include/Qt3D/qglshaderprogrameffect.h new/include/Qt3D/qglshaderprogrameffect.h
1527+--- old/include/Qt3D/qglshaderprogrameffect.h 1970-01-01 00:00:00.000000000 +0000
1528++++ new/include/Qt3D/qglshaderprogrameffect.h 2013-07-31 10:15:41.000000000 +0000
1529+@@ -0,0 +1 @@
1530++#include "../../src/threed/effects/qglshaderprogrameffect.h"
1531+diff -urN old/include/Qt3D/QGLSphere new/include/Qt3D/QGLSphere
1532+--- old/include/Qt3D/QGLSphere 1970-01-01 00:00:00.000000000 +0000
1533++++ new/include/Qt3D/QGLSphere 2013-07-31 10:15:41.000000000 +0000
1534+@@ -0,0 +1 @@
1535++#include "qglsphere.h"
1536+diff -urN old/include/Qt3D/qglsphere.h new/include/Qt3D/qglsphere.h
1537+--- old/include/Qt3D/qglsphere.h 1970-01-01 00:00:00.000000000 +0000
1538++++ new/include/Qt3D/qglsphere.h 2013-07-31 10:15:41.000000000 +0000
1539+@@ -0,0 +1 @@
1540++#include "../../src/threed/geometry/qglsphere.h"
1541+diff -urN old/include/Qt3D/QGLSubsurface new/include/Qt3D/QGLSubsurface
1542+--- old/include/Qt3D/QGLSubsurface 1970-01-01 00:00:00.000000000 +0000
1543++++ new/include/Qt3D/QGLSubsurface 2013-07-31 10:15:41.000000000 +0000
1544+@@ -0,0 +1 @@
1545++#include "qglsubsurface.h"
1546+diff -urN old/include/Qt3D/qglsubsurface.h new/include/Qt3D/qglsubsurface.h
1547+--- old/include/Qt3D/qglsubsurface.h 1970-01-01 00:00:00.000000000 +0000
1548++++ new/include/Qt3D/qglsubsurface.h 2013-07-31 10:15:41.000000000 +0000
1549+@@ -0,0 +1 @@
1550++#include "../../src/threed/surfaces/qglsubsurface.h"
1551+diff -urN old/include/Qt3D/QGLTeapot new/include/Qt3D/QGLTeapot
1552+--- old/include/Qt3D/QGLTeapot 1970-01-01 00:00:00.000000000 +0000
1553++++ new/include/Qt3D/QGLTeapot 2013-07-31 10:15:41.000000000 +0000
1554+@@ -0,0 +1 @@
1555++#include "qglteapot.h"
1556+diff -urN old/include/Qt3D/qglteapot.h new/include/Qt3D/qglteapot.h
1557+--- old/include/Qt3D/qglteapot.h 1970-01-01 00:00:00.000000000 +0000
1558++++ new/include/Qt3D/qglteapot.h 2013-07-31 10:15:41.000000000 +0000
1559+@@ -0,0 +1 @@
1560++#include "../../src/threed/geometry/qglteapot.h"
1561+diff -urN old/include/Qt3D/QGLTexture2D new/include/Qt3D/QGLTexture2D
1562+--- old/include/Qt3D/QGLTexture2D 1970-01-01 00:00:00.000000000 +0000
1563++++ new/include/Qt3D/QGLTexture2D 2013-07-31 10:15:41.000000000 +0000
1564+@@ -0,0 +1 @@
1565++#include "qgltexture2d.h"
1566+diff -urN old/include/Qt3D/qgltexture2d.h new/include/Qt3D/qgltexture2d.h
1567+--- old/include/Qt3D/qgltexture2d.h 1970-01-01 00:00:00.000000000 +0000
1568++++ new/include/Qt3D/qgltexture2d.h 2013-07-31 10:15:41.000000000 +0000
1569+@@ -0,0 +1 @@
1570++#include "../../src/threed/textures/qgltexture2d.h"
1571+diff -urN old/include/Qt3D/QGLTextureCube new/include/Qt3D/QGLTextureCube
1572+--- old/include/Qt3D/QGLTextureCube 1970-01-01 00:00:00.000000000 +0000
1573++++ new/include/Qt3D/QGLTextureCube 2013-07-31 10:15:41.000000000 +0000
1574+@@ -0,0 +1 @@
1575++#include "qgltexturecube.h"
1576+diff -urN old/include/Qt3D/qgltexturecube.h new/include/Qt3D/qgltexturecube.h
1577+--- old/include/Qt3D/qgltexturecube.h 1970-01-01 00:00:00.000000000 +0000
1578++++ new/include/Qt3D/qgltexturecube.h 2013-07-31 10:15:41.000000000 +0000
1579+@@ -0,0 +1 @@
1580++#include "../../src/threed/textures/qgltexturecube.h"
1581+diff -urN old/include/Qt3D/QGLTwoSidedMaterial new/include/Qt3D/QGLTwoSidedMaterial
1582+--- old/include/Qt3D/QGLTwoSidedMaterial 1970-01-01 00:00:00.000000000 +0000
1583++++ new/include/Qt3D/QGLTwoSidedMaterial 2013-07-31 10:15:41.000000000 +0000
1584+@@ -0,0 +1 @@
1585++#include "qgltwosidedmaterial.h"
1586+diff -urN old/include/Qt3D/qgltwosidedmaterial.h new/include/Qt3D/qgltwosidedmaterial.h
1587+--- old/include/Qt3D/qgltwosidedmaterial.h 1970-01-01 00:00:00.000000000 +0000
1588++++ new/include/Qt3D/qgltwosidedmaterial.h 2013-07-31 10:15:41.000000000 +0000
1589+@@ -0,0 +1 @@
1590++#include "../../src/threed/materials/qgltwosidedmaterial.h"
1591+diff -urN old/include/Qt3D/QGLVertexBundle new/include/Qt3D/QGLVertexBundle
1592+--- old/include/Qt3D/QGLVertexBundle 1970-01-01 00:00:00.000000000 +0000
1593++++ new/include/Qt3D/QGLVertexBundle 2013-07-31 10:15:41.000000000 +0000
1594+@@ -0,0 +1 @@
1595++#include "qglvertexbundle.h"
1596+diff -urN old/include/Qt3D/qglvertexbundle.h new/include/Qt3D/qglvertexbundle.h
1597+--- old/include/Qt3D/qglvertexbundle.h 1970-01-01 00:00:00.000000000 +0000
1598++++ new/include/Qt3D/qglvertexbundle.h 2013-07-31 10:15:41.000000000 +0000
1599+@@ -0,0 +1 @@
1600++#include "../../src/threed/arrays/qglvertexbundle.h"
1601+diff -urN old/include/Qt3D/QGLView new/include/Qt3D/QGLView
1602+--- old/include/Qt3D/QGLView 1970-01-01 00:00:00.000000000 +0000
1603++++ new/include/Qt3D/QGLView 2013-07-31 10:15:41.000000000 +0000
1604+@@ -0,0 +1 @@
1605++#include "qglview.h"
1606+diff -urN old/include/Qt3D/qglview.h new/include/Qt3D/qglview.h
1607+--- old/include/Qt3D/qglview.h 1970-01-01 00:00:00.000000000 +0000
1608++++ new/include/Qt3D/qglview.h 2013-07-31 10:15:41.000000000 +0000
1609+@@ -0,0 +1 @@
1610++#include "../../src/threed/viewing/qglview.h"
1611+diff -urN old/include/Qt3D/QGLWindowSurface new/include/Qt3D/QGLWindowSurface
1612+--- old/include/Qt3D/QGLWindowSurface 1970-01-01 00:00:00.000000000 +0000
1613++++ new/include/Qt3D/QGLWindowSurface 2013-07-31 10:15:41.000000000 +0000
1614+@@ -0,0 +1 @@
1615++#include "qglwindowsurface.h"
1616+diff -urN old/include/Qt3D/qglwindowsurface.h new/include/Qt3D/qglwindowsurface.h
1617+--- old/include/Qt3D/qglwindowsurface.h 1970-01-01 00:00:00.000000000 +0000
1618++++ new/include/Qt3D/qglwindowsurface.h 2013-07-31 10:15:41.000000000 +0000
1619+@@ -0,0 +1 @@
1620++#include "../../src/threed/surfaces/qglwindowsurface.h"
1621+diff -urN old/include/Qt3D/QGraphicsBillboardTransform new/include/Qt3D/QGraphicsBillboardTransform
1622+--- old/include/Qt3D/QGraphicsBillboardTransform 1970-01-01 00:00:00.000000000 +0000
1623++++ new/include/Qt3D/QGraphicsBillboardTransform 2013-07-31 10:15:41.000000000 +0000
1624+@@ -0,0 +1 @@
1625++#include "qgraphicsbillboardtransform.h"
1626+diff -urN old/include/Qt3D/qgraphicsbillboardtransform.h new/include/Qt3D/qgraphicsbillboardtransform.h
1627+--- old/include/Qt3D/qgraphicsbillboardtransform.h 1970-01-01 00:00:00.000000000 +0000
1628++++ new/include/Qt3D/qgraphicsbillboardtransform.h 2013-07-31 10:15:41.000000000 +0000
1629+@@ -0,0 +1 @@
1630++#include "../../src/threed/graphicsview/qgraphicsbillboardtransform.h"
1631+diff -urN old/include/Qt3D/QGraphicsRotation3D new/include/Qt3D/QGraphicsRotation3D
1632+--- old/include/Qt3D/QGraphicsRotation3D 1970-01-01 00:00:00.000000000 +0000
1633++++ new/include/Qt3D/QGraphicsRotation3D 2013-07-31 10:15:41.000000000 +0000
1634+@@ -0,0 +1 @@
1635++#include "qgraphicsrotation3d.h"
1636+diff -urN old/include/Qt3D/qgraphicsrotation3d.h new/include/Qt3D/qgraphicsrotation3d.h
1637+--- old/include/Qt3D/qgraphicsrotation3d.h 1970-01-01 00:00:00.000000000 +0000
1638++++ new/include/Qt3D/qgraphicsrotation3d.h 2013-07-31 10:15:41.000000000 +0000
1639+@@ -0,0 +1 @@
1640++#include "../../src/threed/graphicsview/qgraphicsrotation3d.h"
1641+diff -urN old/include/Qt3D/QGraphicsScale3D new/include/Qt3D/QGraphicsScale3D
1642+--- old/include/Qt3D/QGraphicsScale3D 1970-01-01 00:00:00.000000000 +0000
1643++++ new/include/Qt3D/QGraphicsScale3D 2013-07-31 10:15:41.000000000 +0000
1644+@@ -0,0 +1 @@
1645++#include "qgraphicsscale3d.h"
1646+diff -urN old/include/Qt3D/qgraphicsscale3d.h new/include/Qt3D/qgraphicsscale3d.h
1647+--- old/include/Qt3D/qgraphicsscale3d.h 1970-01-01 00:00:00.000000000 +0000
1648++++ new/include/Qt3D/qgraphicsscale3d.h 2013-07-31 10:15:41.000000000 +0000
1649+@@ -0,0 +1 @@
1650++#include "../../src/threed/graphicsview/qgraphicsscale3d.h"
1651+diff -urN old/include/Qt3D/qgraphicstransform3d.h new/include/Qt3D/qgraphicstransform3d.h
1652+--- old/include/Qt3D/qgraphicstransform3d.h 1970-01-01 00:00:00.000000000 +0000
1653++++ new/include/Qt3D/qgraphicstransform3d.h 2013-07-31 10:15:41.000000000 +0000
1654+@@ -0,0 +1 @@
1655++#include "../../src/threed/graphicsview/qgraphicstransform3d.h"
1656+diff -urN old/include/Qt3D/QGraphicsTranslation3D new/include/Qt3D/QGraphicsTranslation3D
1657+--- old/include/Qt3D/QGraphicsTranslation3D 1970-01-01 00:00:00.000000000 +0000
1658++++ new/include/Qt3D/QGraphicsTranslation3D 2013-07-31 10:15:41.000000000 +0000
1659+@@ -0,0 +1 @@
1660++#include "qgraphicstranslation3d.h"
1661+diff -urN old/include/Qt3D/qgraphicstranslation3d.h new/include/Qt3D/qgraphicstranslation3d.h
1662+--- old/include/Qt3D/qgraphicstranslation3d.h 1970-01-01 00:00:00.000000000 +0000
1663++++ new/include/Qt3D/qgraphicstranslation3d.h 2013-07-31 10:15:41.000000000 +0000
1664+@@ -0,0 +1 @@
1665++#include "../../src/threed/graphicsview/qgraphicstranslation3d.h"
1666+diff -urN old/include/Qt3D/QLogicalVertex new/include/Qt3D/QLogicalVertex
1667+--- old/include/Qt3D/QLogicalVertex 1970-01-01 00:00:00.000000000 +0000
1668++++ new/include/Qt3D/QLogicalVertex 2013-07-31 10:15:41.000000000 +0000
1669+@@ -0,0 +1 @@
1670++#include "qlogicalvertex.h"
1671+diff -urN old/include/Qt3D/qlogicalvertex.h new/include/Qt3D/qlogicalvertex.h
1672+--- old/include/Qt3D/qlogicalvertex.h 1970-01-01 00:00:00.000000000 +0000
1673++++ new/include/Qt3D/qlogicalvertex.h 2013-07-31 10:15:41.000000000 +0000
1674+@@ -0,0 +1 @@
1675++#include "../../src/threed/geometry/qlogicalvertex.h"
1676+diff -urN old/include/Qt3D/QMatrix4x4Stack new/include/Qt3D/QMatrix4x4Stack
1677+--- old/include/Qt3D/QMatrix4x4Stack 1970-01-01 00:00:00.000000000 +0000
1678++++ new/include/Qt3D/QMatrix4x4Stack 2013-07-31 10:15:41.000000000 +0000
1679+@@ -0,0 +1 @@
1680++#include "qmatrix4x4stack.h"
1681+diff -urN old/include/Qt3D/qmatrix4x4stack.h new/include/Qt3D/qmatrix4x4stack.h
1682+--- old/include/Qt3D/qmatrix4x4stack.h 1970-01-01 00:00:00.000000000 +0000
1683++++ new/include/Qt3D/qmatrix4x4stack.h 2013-07-31 10:15:41.000000000 +0000
1684+@@ -0,0 +1 @@
1685++#include "../../src/threed/painting/qmatrix4x4stack.h"
1686+diff -urN old/include/Qt3D/QPlane3D new/include/Qt3D/QPlane3D
1687+--- old/include/Qt3D/QPlane3D 1970-01-01 00:00:00.000000000 +0000
1688++++ new/include/Qt3D/QPlane3D 2013-07-31 10:15:41.000000000 +0000
1689+@@ -0,0 +1 @@
1690++#include "qplane3d.h"
1691+diff -urN old/include/Qt3D/qplane3d.h new/include/Qt3D/qplane3d.h
1692+--- old/include/Qt3D/qplane3d.h 1970-01-01 00:00:00.000000000 +0000
1693++++ new/include/Qt3D/qplane3d.h 2013-07-31 10:15:41.000000000 +0000
1694+@@ -0,0 +1 @@
1695++#include "../../src/threed/math3d/qplane3d.h"
1696+diff -urN old/include/Qt3D/QQuickQGraphicsTransform3D new/include/Qt3D/QQuickQGraphicsTransform3D
1697+--- old/include/Qt3D/QQuickQGraphicsTransform3D 1970-01-01 00:00:00.000000000 +0000
1698++++ new/include/Qt3D/QQuickQGraphicsTransform3D 2013-07-31 10:15:41.000000000 +0000
1699+@@ -0,0 +1 @@
1700++#include "qgraphicstransform3d.h"
1701+diff -urN old/include/Qt3D/QRay3D new/include/Qt3D/QRay3D
1702+--- old/include/Qt3D/QRay3D 1970-01-01 00:00:00.000000000 +0000
1703++++ new/include/Qt3D/QRay3D 2013-07-31 10:15:41.000000000 +0000
1704+@@ -0,0 +1 @@
1705++#include "qray3d.h"
1706+diff -urN old/include/Qt3D/qray3d.h new/include/Qt3D/qray3d.h
1707+--- old/include/Qt3D/qray3d.h 1970-01-01 00:00:00.000000000 +0000
1708++++ new/include/Qt3D/qray3d.h 2013-07-31 10:15:41.000000000 +0000
1709+@@ -0,0 +1 @@
1710++#include "../../src/threed/math3d/qray3d.h"
1711+diff -urN old/include/Qt3D/QSimpleAreaAllocator new/include/Qt3D/QSimpleAreaAllocator
1712+--- old/include/Qt3D/QSimpleAreaAllocator 1970-01-01 00:00:00.000000000 +0000
1713++++ new/include/Qt3D/QSimpleAreaAllocator 2013-07-31 10:15:41.000000000 +0000
1714+@@ -0,0 +1 @@
1715++#include "qareaallocator.h"
1716+diff -urN old/include/Qt3D/QSphere3D new/include/Qt3D/QSphere3D
1717+--- old/include/Qt3D/QSphere3D 1970-01-01 00:00:00.000000000 +0000
1718++++ new/include/Qt3D/QSphere3D 2013-07-31 10:15:41.000000000 +0000
1719+@@ -0,0 +1 @@
1720++#include "qsphere3d.h"
1721+diff -urN old/include/Qt3D/qsphere3d.h new/include/Qt3D/qsphere3d.h
1722+--- old/include/Qt3D/qsphere3d.h 1970-01-01 00:00:00.000000000 +0000
1723++++ new/include/Qt3D/qsphere3d.h 2013-07-31 10:15:41.000000000 +0000
1724+@@ -0,0 +1 @@
1725++#include "../../src/threed/math3d/qsphere3d.h"
1726+diff -urN old/include/Qt3D/Qt3D new/include/Qt3D/Qt3D
1727+--- old/include/Qt3D/Qt3D 1970-01-01 00:00:00.000000000 +0000
1728++++ new/include/Qt3D/Qt3D 2013-12-17 16:35:20.787962383 +0000
1729+@@ -0,0 +1,75 @@
1730++#ifndef QT_QT3D_MODULE_H
1731++#define QT_QT3D_MODULE_H
1732++#include <Qt3D/Qt3DDepends>
1733++#include "qarray.h"
1734++#include "qcolor4ub.h"
1735++#include "qcustomdataarray.h"
1736++#include "qglattributedescription.h"
1737++#include "qglattributeset.h"
1738++#include "qglattributevalue.h"
1739++#include "qglindexbuffer.h"
1740++#include "qglvertexbundle.h"
1741++#include "qvector2darray.h"
1742++#include "qvector3darray.h"
1743++#include "qvector4darray.h"
1744++#include "qglcolladafxeffect.h"
1745++#include "qglcolladafxeffectfactory.h"
1746++#include "qglcolladafxeffectloader.h"
1747++#include "qglshaderprogrameffect.h"
1748++#include "qgeometrydata.h"
1749++#include "qglbezierpatches.h"
1750++#include "qglbuilder.h"
1751++#include "qglcube.h"
1752++#include "qglcylinder.h"
1753++#include "qgldome.h"
1754++#include "qglmaterialcollection.h"
1755++#include "qglsphere.h"
1756++#include "qglteapot.h"
1757++#include "qlogicalvertex.h"
1758++#include "qglnamespace.h"
1759++#include "qt3dglobal.h"
1760++#include "qgraphicsbillboardtransform.h"
1761++#include "qgraphicsrotation3d.h"
1762++#include "qgraphicsscale3d.h"
1763++#include "qgraphicstransform3d.h"
1764++#include "qgraphicstranslation3d.h"
1765++#include "qglabstractmaterial.h"
1766++#include "qglcolormaterial.h"
1767++#include "qglmaterial.h"
1768++#include "qgltwosidedmaterial.h"
1769++#include "qbox3d.h"
1770++#include "qplane3d.h"
1771++#include "qray3d.h"
1772++#include "qsphere3d.h"
1773++#include "qtriangle3d.h"
1774++#include "qdownloadmanager.h"
1775++#include "qglabstracteffect.h"
1776++#include "qgllightmodel.h"
1777++#include "qgllightparameters.h"
1778++#include "qglpainter.h"
1779++#include "qmatrix4x4stack.h"
1780++#include "qglabstractscene.h"
1781++#include "qglpicknode.h"
1782++#include "qglrenderorder.h"
1783++#include "qglrenderordercomparator.h"
1784++#include "qglrendersequencer.h"
1785++#include "qglrenderstate.h"
1786++#include "qglsceneanimation.h"
1787++#include "qglsceneformatplugin.h"
1788++#include "qglscenenode.h"
1789++#include "qglbezierscene.h"
1790++#include "qglbezierscenehandler.h"
1791++#include "qglabstractsurface.h"
1792++#include "qglframebufferobjectsurface.h"
1793++#include "qglpixelbuffersurface.h"
1794++#include "qglsubsurface.h"
1795++#include "qglwindowsurface.h"
1796++#include "qareaallocator.h"
1797++#include "qgltexture2d.h"
1798++#include "qgltexturecube.h"
1799++#include "qglcamera.h"
1800++#include "qglcameraanimation.h"
1801++#include "qglmockview.h"
1802++#include "qglview.h"
1803++#include "qt3dversion.h"
1804++#endif
1805+diff -urN old/include/Qt3D/qt3dglobal.h new/include/Qt3D/qt3dglobal.h
1806+--- old/include/Qt3D/qt3dglobal.h 1970-01-01 00:00:00.000000000 +0000
1807++++ new/include/Qt3D/qt3dglobal.h 2013-07-31 10:15:41.000000000 +0000
1808+@@ -0,0 +1 @@
1809++#include "../../src/threed/global/qt3dglobal.h"
1810+diff -urN old/include/Qt3D/Qt3DVersion new/include/Qt3D/Qt3DVersion
1811+--- old/include/Qt3D/Qt3DVersion 1970-01-01 00:00:00.000000000 +0000
1812++++ new/include/Qt3D/Qt3DVersion 2013-12-17 16:35:20.787962383 +0000
1813+@@ -0,0 +1 @@
1814++#include "qt3dversion.h"
1815+diff -urN old/include/Qt3D/qt3dversion.h new/include/Qt3D/qt3dversion.h
1816+--- old/include/Qt3D/qt3dversion.h 1970-01-01 00:00:00.000000000 +0000
1817++++ new/include/Qt3D/qt3dversion.h 2013-12-17 16:35:20.787962383 +0000
1818+@@ -0,0 +1,9 @@
1819++/* This file was generated by syncqt. */
1820++#ifndef QT_QT3D_VERSION_H
1821++#define QT_QT3D_VERSION_H
1822++
1823++#define QT3D_VERSION_STR "5.2.0"
1824++
1825++#define QT3D_VERSION 0x050200
1826++
1827++#endif // QT_QT3D_VERSION_H
1828+diff -urN old/include/Qt3D/QtArrayData new/include/Qt3D/QtArrayData
1829+--- old/include/Qt3D/QtArrayData 1970-01-01 00:00:00.000000000 +0000
1830++++ new/include/Qt3D/QtArrayData 2013-07-31 10:15:41.000000000 +0000
1831+@@ -0,0 +1 @@
1832++#include "qarray.h"
1833+diff -urN old/include/Qt3D/QTriangle3D new/include/Qt3D/QTriangle3D
1834+--- old/include/Qt3D/QTriangle3D 1970-01-01 00:00:00.000000000 +0000
1835++++ new/include/Qt3D/QTriangle3D 2013-07-31 10:15:41.000000000 +0000
1836+@@ -0,0 +1 @@
1837++#include "qtriangle3d.h"
1838+diff -urN old/include/Qt3D/qtriangle3d.h new/include/Qt3D/qtriangle3d.h
1839+--- old/include/Qt3D/qtriangle3d.h 1970-01-01 00:00:00.000000000 +0000
1840++++ new/include/Qt3D/qtriangle3d.h 2013-07-31 10:15:41.000000000 +0000
1841+@@ -0,0 +1 @@
1842++#include "../../src/threed/math3d/qtriangle3d.h"
1843+diff -urN old/include/Qt3D/QUniformAreaAllocator new/include/Qt3D/QUniformAreaAllocator
1844+--- old/include/Qt3D/QUniformAreaAllocator 1970-01-01 00:00:00.000000000 +0000
1845++++ new/include/Qt3D/QUniformAreaAllocator 2013-07-31 10:15:41.000000000 +0000
1846+@@ -0,0 +1 @@
1847++#include "qareaallocator.h"
1848+diff -urN old/include/Qt3D/QVector2DArray new/include/Qt3D/QVector2DArray
1849+--- old/include/Qt3D/QVector2DArray 1970-01-01 00:00:00.000000000 +0000
1850++++ new/include/Qt3D/QVector2DArray 2013-07-31 10:15:41.000000000 +0000
1851+@@ -0,0 +1 @@
1852++#include "qvector2darray.h"
1853+diff -urN old/include/Qt3D/qvector2darray.h new/include/Qt3D/qvector2darray.h
1854+--- old/include/Qt3D/qvector2darray.h 1970-01-01 00:00:00.000000000 +0000
1855++++ new/include/Qt3D/qvector2darray.h 2013-07-31 10:15:41.000000000 +0000
1856+@@ -0,0 +1 @@
1857++#include "../../src/threed/arrays/qvector2darray.h"
1858+diff -urN old/include/Qt3D/QVector3DArray new/include/Qt3D/QVector3DArray
1859+--- old/include/Qt3D/QVector3DArray 1970-01-01 00:00:00.000000000 +0000
1860++++ new/include/Qt3D/QVector3DArray 2013-07-31 10:15:41.000000000 +0000
1861+@@ -0,0 +1 @@
1862++#include "qvector3darray.h"
1863+diff -urN old/include/Qt3D/qvector3darray.h new/include/Qt3D/qvector3darray.h
1864+--- old/include/Qt3D/qvector3darray.h 1970-01-01 00:00:00.000000000 +0000
1865++++ new/include/Qt3D/qvector3darray.h 2013-07-31 10:15:41.000000000 +0000
1866+@@ -0,0 +1 @@
1867++#include "../../src/threed/arrays/qvector3darray.h"
1868+diff -urN old/include/Qt3D/QVector4DArray new/include/Qt3D/QVector4DArray
1869+--- old/include/Qt3D/QVector4DArray 1970-01-01 00:00:00.000000000 +0000
1870++++ new/include/Qt3D/QVector4DArray 2013-07-31 10:15:41.000000000 +0000
1871+@@ -0,0 +1 @@
1872++#include "qvector4darray.h"
1873+diff -urN old/include/Qt3D/qvector4darray.h new/include/Qt3D/qvector4darray.h
1874+--- old/include/Qt3D/qvector4darray.h 1970-01-01 00:00:00.000000000 +0000
1875++++ new/include/Qt3D/qvector4darray.h 2013-07-31 10:15:41.000000000 +0000
1876+@@ -0,0 +1 @@
1877++#include "../../src/threed/arrays/qvector4darray.h"
1878+diff -urN old/include/Qt3DQuick/capsulemesh.h new/include/Qt3DQuick/capsulemesh.h
1879+--- old/include/Qt3DQuick/capsulemesh.h 1970-01-01 00:00:00.000000000 +0000
1880++++ new/include/Qt3DQuick/capsulemesh.h 2013-07-31 10:15:41.000000000 +0000
1881+@@ -0,0 +1 @@
1882++#include "../../src/quick3d/capsulemesh.h"
1883+diff -urN old/include/Qt3DQuick/cylindermesh.h new/include/Qt3DQuick/cylindermesh.h
1884+--- old/include/Qt3DQuick/cylindermesh.h 1970-01-01 00:00:00.000000000 +0000
1885++++ new/include/Qt3DQuick/cylindermesh.h 2013-07-31 10:15:41.000000000 +0000
1886+@@ -0,0 +1 @@
1887++#include "../../src/quick3d/cylindermesh.h"
1888+diff -urN old/include/Qt3DQuick/headers.pri new/include/Qt3DQuick/headers.pri
1889+--- old/include/Qt3DQuick/headers.pri 1970-01-01 00:00:00.000000000 +0000
1890++++ new/include/Qt3DQuick/headers.pri 2013-12-17 16:35:20.675962380 +0000
1891+@@ -0,0 +1,4 @@
1892++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
1893++SYNCQT.HEADER_CLASSES = ../../include/Qt3DQuick/QQuickAnimation3D ../../include/Qt3DQuick/QQuickEffect ../../include/Qt3DQuick/QQuickItem3D ../../include/Qt3DQuick/QQuickMesh ../../include/Qt3DQuick/QQuickViewport ../../include/Qt3DQuick/Qt3DQuickVersion
1894++SYNCQT.PRIVATE_HEADER_FILES =
1895++SYNCQT.QPA_HEADER_FILES =
1896+diff -urN old/include/Qt3DQuick/line.h new/include/Qt3DQuick/line.h
1897+--- old/include/Qt3DQuick/line.h 1970-01-01 00:00:00.000000000 +0000
1898++++ new/include/Qt3DQuick/line.h 2013-07-31 10:15:41.000000000 +0000
1899+@@ -0,0 +1 @@
1900++#include "../../src/quick3d/line.h"
1901+diff -urN old/include/Qt3DQuick/point.h new/include/Qt3DQuick/point.h
1902+--- old/include/Qt3DQuick/point.h 1970-01-01 00:00:00.000000000 +0000
1903++++ new/include/Qt3DQuick/point.h 2013-07-31 10:15:41.000000000 +0000
1904+@@ -0,0 +1 @@
1905++#include "../../src/quick3d/point.h"
1906+diff -urN old/include/Qt3DQuick/qmlres.h new/include/Qt3DQuick/qmlres.h
1907+--- old/include/Qt3DQuick/qmlres.h 1970-01-01 00:00:00.000000000 +0000
1908++++ new/include/Qt3DQuick/qmlres.h 2013-07-31 10:15:41.000000000 +0000
1909+@@ -0,0 +1 @@
1910++#include "../../src/quick3d/qmlres.h"
1911+diff -urN old/include/Qt3DQuick/QQuickAnimation3D new/include/Qt3DQuick/QQuickAnimation3D
1912+--- old/include/Qt3DQuick/QQuickAnimation3D 1970-01-01 00:00:00.000000000 +0000
1913++++ new/include/Qt3DQuick/QQuickAnimation3D 2013-07-31 10:15:41.000000000 +0000
1914+@@ -0,0 +1 @@
1915++#include "qquickanimation3d.h"
1916+diff -urN old/include/Qt3DQuick/qquickanimation3d.h new/include/Qt3DQuick/qquickanimation3d.h
1917+--- old/include/Qt3DQuick/qquickanimation3d.h 1970-01-01 00:00:00.000000000 +0000
1918++++ new/include/Qt3DQuick/qquickanimation3d.h 2013-07-31 10:15:41.000000000 +0000
1919+@@ -0,0 +1 @@
1920++#include "../../src/quick3d/qquickanimation3d.h"
1921+diff -urN old/include/Qt3DQuick/QQuickEffect new/include/Qt3DQuick/QQuickEffect
1922+--- old/include/Qt3DQuick/QQuickEffect 1970-01-01 00:00:00.000000000 +0000
1923++++ new/include/Qt3DQuick/QQuickEffect 2013-07-31 10:15:41.000000000 +0000
1924+@@ -0,0 +1 @@
1925++#include "qquickeffect.h"
1926+diff -urN old/include/Qt3DQuick/qquickeffect.h new/include/Qt3DQuick/qquickeffect.h
1927+--- old/include/Qt3DQuick/qquickeffect.h 1970-01-01 00:00:00.000000000 +0000
1928++++ new/include/Qt3DQuick/qquickeffect.h 2013-07-31 10:15:41.000000000 +0000
1929+@@ -0,0 +1 @@
1930++#include "../../src/quick3d/qquickeffect.h"
1931+diff -urN old/include/Qt3DQuick/QQuickItem3D new/include/Qt3DQuick/QQuickItem3D
1932+--- old/include/Qt3DQuick/QQuickItem3D 1970-01-01 00:00:00.000000000 +0000
1933++++ new/include/Qt3DQuick/QQuickItem3D 2013-07-31 10:15:41.000000000 +0000
1934+@@ -0,0 +1 @@
1935++#include "qquickitem3d.h"
1936+diff -urN old/include/Qt3DQuick/qquickitem3d.h new/include/Qt3DQuick/qquickitem3d.h
1937+--- old/include/Qt3DQuick/qquickitem3d.h 1970-01-01 00:00:00.000000000 +0000
1938++++ new/include/Qt3DQuick/qquickitem3d.h 2013-07-31 10:15:41.000000000 +0000
1939+@@ -0,0 +1 @@
1940++#include "../../src/quick3d/qquickitem3d.h"
1941+diff -urN old/include/Qt3DQuick/QQuickMesh new/include/Qt3DQuick/QQuickMesh
1942+--- old/include/Qt3DQuick/QQuickMesh 1970-01-01 00:00:00.000000000 +0000
1943++++ new/include/Qt3DQuick/QQuickMesh 2013-07-31 10:15:41.000000000 +0000
1944+@@ -0,0 +1 @@
1945++#include "qquickmesh.h"
1946+diff -urN old/include/Qt3DQuick/qquickmesh.h new/include/Qt3DQuick/qquickmesh.h
1947+--- old/include/Qt3DQuick/qquickmesh.h 1970-01-01 00:00:00.000000000 +0000
1948++++ new/include/Qt3DQuick/qquickmesh.h 2013-07-31 10:15:41.000000000 +0000
1949+@@ -0,0 +1 @@
1950++#include "../../src/quick3d/qquickmesh.h"
1951+diff -urN old/include/Qt3DQuick/QQuickViewport new/include/Qt3DQuick/QQuickViewport
1952+--- old/include/Qt3DQuick/QQuickViewport 1970-01-01 00:00:00.000000000 +0000
1953++++ new/include/Qt3DQuick/QQuickViewport 2013-07-31 10:15:41.000000000 +0000
1954+@@ -0,0 +1 @@
1955++#include "qquickviewport.h"
1956+diff -urN old/include/Qt3DQuick/qquickviewport.h new/include/Qt3DQuick/qquickviewport.h
1957+--- old/include/Qt3DQuick/qquickviewport.h 1970-01-01 00:00:00.000000000 +0000
1958++++ new/include/Qt3DQuick/qquickviewport.h 2013-07-31 10:15:41.000000000 +0000
1959+@@ -0,0 +1 @@
1960++#include "../../src/quick3d/qquickviewport.h"
1961+diff -urN old/include/Qt3DQuick/Qt3DQuick new/include/Qt3DQuick/Qt3DQuick
1962+--- old/include/Qt3DQuick/Qt3DQuick 1970-01-01 00:00:00.000000000 +0000
1963++++ new/include/Qt3DQuick/Qt3DQuick 2013-12-17 16:35:20.675962380 +0000
1964+@@ -0,0 +1,17 @@
1965++#ifndef QT_QT3DQUICK_MODULE_H
1966++#define QT_QT3DQUICK_MODULE_H
1967++#include <Qt3DQuick/Qt3DQuickDepends>
1968++#include "capsulemesh.h"
1969++#include "cylindermesh.h"
1970++#include "line.h"
1971++#include "point.h"
1972++#include "qmlres.h"
1973++#include "qquickanimation3d.h"
1974++#include "qquickeffect.h"
1975++#include "qquickitem3d.h"
1976++#include "qquickmesh.h"
1977++#include "qquickviewport.h"
1978++#include "qt3dquickglobal.h"
1979++#include "spheremesh.h"
1980++#include "qt3dquickversion.h"
1981++#endif
1982+diff -urN old/include/Qt3DQuick/qt3dquickglobal.h new/include/Qt3DQuick/qt3dquickglobal.h
1983+--- old/include/Qt3DQuick/qt3dquickglobal.h 1970-01-01 00:00:00.000000000 +0000
1984++++ new/include/Qt3DQuick/qt3dquickglobal.h 2013-07-31 10:15:41.000000000 +0000
1985+@@ -0,0 +1 @@
1986++#include "../../src/quick3d/qt3dquickglobal.h"
1987+diff -urN old/include/Qt3DQuick/Qt3DQuickVersion new/include/Qt3DQuick/Qt3DQuickVersion
1988+--- old/include/Qt3DQuick/Qt3DQuickVersion 1970-01-01 00:00:00.000000000 +0000
1989++++ new/include/Qt3DQuick/Qt3DQuickVersion 2013-12-17 16:35:20.675962380 +0000
1990+@@ -0,0 +1 @@
1991++#include "qt3dquickversion.h"
1992+diff -urN old/include/Qt3DQuick/qt3dquickversion.h new/include/Qt3DQuick/qt3dquickversion.h
1993+--- old/include/Qt3DQuick/qt3dquickversion.h 1970-01-01 00:00:00.000000000 +0000
1994++++ new/include/Qt3DQuick/qt3dquickversion.h 2013-12-17 16:35:20.675962380 +0000
1995+@@ -0,0 +1,9 @@
1996++/* This file was generated by syncqt. */
1997++#ifndef QT_QT3DQUICK_VERSION_H
1998++#define QT_QT3DQUICK_VERSION_H
1999++
2000++#define QT3DQUICK_VERSION_STR "5.2.0"
2001++
2002++#define QT3DQUICK_VERSION 0x050200
2003++
2004++#endif // QT_QT3DQUICK_VERSION_H
2005+diff -urN old/include/Qt3DQuick/spheremesh.h new/include/Qt3DQuick/spheremesh.h
2006+--- old/include/Qt3DQuick/spheremesh.h 1970-01-01 00:00:00.000000000 +0000
2007++++ new/include/Qt3DQuick/spheremesh.h 2013-07-31 10:15:41.000000000 +0000
2008+@@ -0,0 +1 @@
2009++#include "../../src/quick3d/spheremesh.h"
2010
2011=== added file 'debian/patches/workaround_zlib_linking_issue.patch'
2012--- debian/patches/workaround_zlib_linking_issue.patch 1970-01-01 00:00:00 +0000
2013+++ debian/patches/workaround_zlib_linking_issue.patch 2013-12-20 21:54:23 +0000
2014@@ -0,0 +1,23 @@
2015+Description: Workaround build issue by using --no-as-needed
2016+ The patch workarounds a FTBFS described in a bug report.
2017+ .
2018+ Still needed with the latest Qt3d snapshot
2019+Author: Timo Jyrinki <timo.jyrinki@canonical.com>
2020+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1207340
2021+Forwarded: no
2022+Last-Updated: 2013-08-01
2023+
2024+diff --git a/src/threed/threed.pro b/src/threed/threed.pro
2025+index 793c160..682db14 100644
2026+--- a/src/threed/threed.pro
2027++++ b/src/threed/threed.pro
2028+@@ -23,4 +23,8 @@ include(threed.pri)
2029+ PUBLIC_HEADERS = $$HEADERS
2030+ HEADERS += $$PRIVATE_HEADERS
2031+
2032++# Workaround zlib issue
2033++LIBS += -Wl,--no-as-needed
2034++LIBS += -lz
2035++
2036+ !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL
2037+
2038
2039=== added file 'debian/qt3d5-dev.install'
2040--- debian/qt3d5-dev.install 1970-01-01 00:00:00 +0000
2041+++ debian/qt3d5-dev.install 2013-12-20 21:54:23 +0000
2042@@ -0,0 +1,181 @@
2043+usr/include/qt5/Qt3D/QAreaAllocator
2044+usr/include/qt5/Qt3D/QArray
2045+usr/include/qt5/Qt3D/QArrayAlignedChar
2046+usr/include/qt5/Qt3D/QArrayAlignedPrealloc
2047+usr/include/qt5/Qt3D/QBox3D
2048+usr/include/qt5/Qt3D/QColor4ub
2049+usr/include/qt5/Qt3D/QCustomDataArray
2050+usr/include/qt5/Qt3D/QDownloadManager
2051+usr/include/qt5/Qt3D/QGLAbstractEffect
2052+usr/include/qt5/Qt3D/QGLAbstractMaterial
2053+usr/include/qt5/Qt3D/QGLAbstractScene
2054+usr/include/qt5/Qt3D/QGLAbstractSurface
2055+usr/include/qt5/Qt3D/QGLAttributeDescription
2056+usr/include/qt5/Qt3D/QGLAttributeSet
2057+usr/include/qt5/Qt3D/QGLAttributeValue
2058+usr/include/qt5/Qt3D/QGLBezierPatches
2059+usr/include/qt5/Qt3D/QGLBezierScene
2060+usr/include/qt5/Qt3D/QGLBezierSceneHandler
2061+usr/include/qt5/Qt3D/QGLBuilder
2062+usr/include/qt5/Qt3D/QGLCamera
2063+usr/include/qt5/Qt3D/QGLCameraAnimation
2064+usr/include/qt5/Qt3D/QGLColladaFxEffect
2065+usr/include/qt5/Qt3D/QGLColladaFxEffectFactory
2066+usr/include/qt5/Qt3D/QGLColladaFxEffectLoader
2067+usr/include/qt5/Qt3D/QGLColladaImageParam
2068+usr/include/qt5/Qt3D/QGLColladaParam
2069+usr/include/qt5/Qt3D/QGLColladaSampler2DParam
2070+usr/include/qt5/Qt3D/QGLColladaSurfaceParam
2071+usr/include/qt5/Qt3D/QGLColladaTextureParam
2072+usr/include/qt5/Qt3D/QGLColorMaterial
2073+usr/include/qt5/Qt3D/QGLCube
2074+usr/include/qt5/Qt3D/QGLCylinder
2075+usr/include/qt5/Qt3D/QGLDome
2076+usr/include/qt5/Qt3D/QGLFramebufferObjectSurface
2077+usr/include/qt5/Qt3D/QGLIndexBuffer
2078+usr/include/qt5/Qt3D/QGLLightModel
2079+usr/include/qt5/Qt3D/QGLLightParameters
2080+usr/include/qt5/Qt3D/QGLMaterial
2081+usr/include/qt5/Qt3D/QGLMaterialCollection
2082+usr/include/qt5/Qt3D/QGLMockView
2083+usr/include/qt5/Qt3D/QGLPainter
2084+usr/include/qt5/Qt3D/QGLPickNode
2085+usr/include/qt5/Qt3D/QGLPixelBufferSurface
2086+usr/include/qt5/Qt3D/QGLRenderOrder
2087+usr/include/qt5/Qt3D/QGLRenderOrderComparator
2088+usr/include/qt5/Qt3D/QGLRenderSequencer
2089+usr/include/qt5/Qt3D/QGLRenderState
2090+usr/include/qt5/Qt3D/QGLSceneAnimation
2091+usr/include/qt5/Qt3D/QGLSceneFormatFactoryInterface
2092+usr/include/qt5/Qt3D/QGLSceneFormatHandler
2093+usr/include/qt5/Qt3D/QGLSceneNode
2094+usr/include/qt5/Qt3D/QGLShaderProgramEffect
2095+usr/include/qt5/Qt3D/QGLSphere
2096+usr/include/qt5/Qt3D/QGLSubsurface
2097+usr/include/qt5/Qt3D/QGLTeapot
2098+usr/include/qt5/Qt3D/QGLTexture2D
2099+usr/include/qt5/Qt3D/QGLTextureCube
2100+usr/include/qt5/Qt3D/QGLTwoSidedMaterial
2101+usr/include/qt5/Qt3D/QGLVertexBundle
2102+usr/include/qt5/Qt3D/QGLView
2103+usr/include/qt5/Qt3D/QGLWindowSurface
2104+usr/include/qt5/Qt3D/QGeneralAreaAllocator
2105+usr/include/qt5/Qt3D/QGeometryData
2106+usr/include/qt5/Qt3D/QGraphicsBillboardTransform
2107+usr/include/qt5/Qt3D/QGraphicsRotation3D
2108+usr/include/qt5/Qt3D/QGraphicsScale3D
2109+usr/include/qt5/Qt3D/QGraphicsTranslation3D
2110+usr/include/qt5/Qt3D/QLogicalVertex
2111+usr/include/qt5/Qt3D/QMatrix4x4Stack
2112+usr/include/qt5/Qt3D/QPlane3D
2113+usr/include/qt5/Qt3D/QQuickQGraphicsTransform3D
2114+usr/include/qt5/Qt3D/QRay3D
2115+usr/include/qt5/Qt3D/QSimpleAreaAllocator
2116+usr/include/qt5/Qt3D/QSphere3D
2117+usr/include/qt5/Qt3D/QTriangle3D
2118+usr/include/qt5/Qt3D/QUniformAreaAllocator
2119+usr/include/qt5/Qt3D/QVector2DArray
2120+usr/include/qt5/Qt3D/QVector3DArray
2121+usr/include/qt5/Qt3D/QVector4DArray
2122+usr/include/qt5/Qt3D/Qt3D
2123+usr/include/qt5/Qt3D/Qt3DVersion
2124+usr/include/qt5/Qt3D/QtArrayData
2125+usr/include/qt5/Qt3D/qareaallocator.h
2126+usr/include/qt5/Qt3D/qarray.h
2127+usr/include/qt5/Qt3D/qbox3d.h
2128+usr/include/qt5/Qt3D/qcolor4ub.h
2129+usr/include/qt5/Qt3D/qcustomdataarray.h
2130+usr/include/qt5/Qt3D/qdownloadmanager.h
2131+usr/include/qt5/Qt3D/qgeometrydata.h
2132+usr/include/qt5/Qt3D/qglabstracteffect.h
2133+usr/include/qt5/Qt3D/qglabstractmaterial.h
2134+usr/include/qt5/Qt3D/qglabstractscene.h
2135+usr/include/qt5/Qt3D/qglabstractsurface.h
2136+usr/include/qt5/Qt3D/qglattributedescription.h
2137+usr/include/qt5/Qt3D/qglattributeset.h
2138+usr/include/qt5/Qt3D/qglattributevalue.h
2139+usr/include/qt5/Qt3D/qglbezierpatches.h
2140+usr/include/qt5/Qt3D/qglbezierscene.h
2141+usr/include/qt5/Qt3D/qglbezierscenehandler.h
2142+usr/include/qt5/Qt3D/qglbuilder.h
2143+usr/include/qt5/Qt3D/qglcamera.h
2144+usr/include/qt5/Qt3D/qglcameraanimation.h
2145+usr/include/qt5/Qt3D/qglcolladafxeffect.h
2146+usr/include/qt5/Qt3D/qglcolladafxeffectfactory.h
2147+usr/include/qt5/Qt3D/qglcolladafxeffectloader.h
2148+usr/include/qt5/Qt3D/qglcolormaterial.h
2149+usr/include/qt5/Qt3D/qglcube.h
2150+usr/include/qt5/Qt3D/qglcylinder.h
2151+usr/include/qt5/Qt3D/qgldome.h
2152+usr/include/qt5/Qt3D/qglframebufferobjectsurface.h
2153+usr/include/qt5/Qt3D/qglindexbuffer.h
2154+usr/include/qt5/Qt3D/qgllightmodel.h
2155+usr/include/qt5/Qt3D/qgllightparameters.h
2156+usr/include/qt5/Qt3D/qglmaterial.h
2157+usr/include/qt5/Qt3D/qglmaterialcollection.h
2158+usr/include/qt5/Qt3D/qglmockview.h
2159+usr/include/qt5/Qt3D/qglnamespace.h
2160+usr/include/qt5/Qt3D/qglpainter.h
2161+usr/include/qt5/Qt3D/qglpicknode.h
2162+usr/include/qt5/Qt3D/qglpixelbuffersurface.h
2163+usr/include/qt5/Qt3D/qglrenderorder.h
2164+usr/include/qt5/Qt3D/qglrenderordercomparator.h
2165+usr/include/qt5/Qt3D/qglrendersequencer.h
2166+usr/include/qt5/Qt3D/qglrenderstate.h
2167+usr/include/qt5/Qt3D/qglsceneanimation.h
2168+usr/include/qt5/Qt3D/qglsceneformatplugin.h
2169+usr/include/qt5/Qt3D/qglscenenode.h
2170+usr/include/qt5/Qt3D/qglshaderprogrameffect.h
2171+usr/include/qt5/Qt3D/qglsphere.h
2172+usr/include/qt5/Qt3D/qglsubsurface.h
2173+usr/include/qt5/Qt3D/qglteapot.h
2174+usr/include/qt5/Qt3D/qgltexture2d.h
2175+usr/include/qt5/Qt3D/qgltexturecube.h
2176+usr/include/qt5/Qt3D/qgltwosidedmaterial.h
2177+usr/include/qt5/Qt3D/qglvertexbundle.h
2178+usr/include/qt5/Qt3D/qglview.h
2179+usr/include/qt5/Qt3D/qglwindowsurface.h
2180+usr/include/qt5/Qt3D/qgraphicsbillboardtransform.h
2181+usr/include/qt5/Qt3D/qgraphicsrotation3d.h
2182+usr/include/qt5/Qt3D/qgraphicsscale3d.h
2183+usr/include/qt5/Qt3D/qgraphicstransform3d.h
2184+usr/include/qt5/Qt3D/qgraphicstranslation3d.h
2185+usr/include/qt5/Qt3D/qlogicalvertex.h
2186+usr/include/qt5/Qt3D/qmatrix4x4stack.h
2187+usr/include/qt5/Qt3D/qplane3d.h
2188+usr/include/qt5/Qt3D/qray3d.h
2189+usr/include/qt5/Qt3D/qsphere3d.h
2190+usr/include/qt5/Qt3D/qt3dglobal.h
2191+usr/include/qt5/Qt3D/qt3dversion.h
2192+usr/include/qt5/Qt3D/qtriangle3d.h
2193+usr/include/qt5/Qt3D/qvector2darray.h
2194+usr/include/qt5/Qt3D/qvector3darray.h
2195+usr/include/qt5/Qt3D/qvector4darray.h
2196+usr/include/qt5/Qt3DQuick/QQuickAnimation3D
2197+usr/include/qt5/Qt3DQuick/QQuickEffect
2198+usr/include/qt5/Qt3DQuick/QQuickItem3D
2199+usr/include/qt5/Qt3DQuick/QQuickMesh
2200+usr/include/qt5/Qt3DQuick/QQuickViewport
2201+usr/include/qt5/Qt3DQuick/Qt3DQuick
2202+usr/include/qt5/Qt3DQuick/Qt3DQuickVersion
2203+usr/include/qt5/Qt3DQuick/capsulemesh.h
2204+usr/include/qt5/Qt3DQuick/cylindermesh.h
2205+usr/include/qt5/Qt3DQuick/line.h
2206+usr/include/qt5/Qt3DQuick/point.h
2207+usr/include/qt5/Qt3DQuick/qmlres.h
2208+usr/include/qt5/Qt3DQuick/qquickanimation3d.h
2209+usr/include/qt5/Qt3DQuick/qquickeffect.h
2210+usr/include/qt5/Qt3DQuick/qquickitem3d.h
2211+usr/include/qt5/Qt3DQuick/qquickmesh.h
2212+usr/include/qt5/Qt3DQuick/qquickviewport.h
2213+usr/include/qt5/Qt3DQuick/qt3dquickglobal.h
2214+usr/include/qt5/Qt3DQuick/qt3dquickversion.h
2215+usr/include/qt5/Qt3DQuick/spheremesh.h
2216+usr/lib/*/*.prl
2217+usr/lib/*/*.so
2218+usr/lib/*/cmake/*
2219+usr/lib/*/pkgconfig/*
2220+usr/lib/*/qt5/bin/qglinfo
2221+usr/share/qt5/mkspecs/modules/*
2222+usr/include/qt5/Qt3D/Qt3DDepends
2223+usr/include/qt5/Qt3DQuick/Qt3DQuickDepends
2224
2225=== added file 'debian/qt3d5-examples.install'
2226--- debian/qt3d5-examples.install 1970-01-01 00:00:00 +0000
2227+++ debian/qt3d5-examples.install 2013-12-20 21:54:23 +0000
2228@@ -0,0 +1,1 @@
2229+usr/lib/*/qt5/examples/*
2230
2231=== added file 'debian/qt3d5-examples.lintian-overrides'
2232--- debian/qt3d5-examples.lintian-overrides 1970-01-01 00:00:00 +0000
2233+++ debian/qt3d5-examples.lintian-overrides 2013-12-20 21:54:23 +0000
2234@@ -0,0 +1,1 @@
2235+qt3d5-examples: image-file-in-usr-lib
2236
2237=== added file 'debian/qt3d5-private-dev.install'
2238--- debian/qt3d5-private-dev.install 1970-01-01 00:00:00 +0000
2239+++ debian/qt3d5-private-dev.install 2013-12-20 21:54:23 +0000
2240@@ -0,0 +1,1 @@
2241+usr/include/qt5/Qt3D/*/Qt3D/private/*
2242
2243=== added file 'debian/qtdeclarative5-qt3d-plugin.install'
2244--- debian/qtdeclarative5-qt3d-plugin.install 1970-01-01 00:00:00 +0000
2245+++ debian/qtdeclarative5-qt3d-plugin.install 2013-12-20 21:54:23 +0000
2246@@ -0,0 +1,14 @@
2247+usr/lib/*/qt5/qml/Qt3D/Shapes/Capsule.qml
2248+usr/lib/*/qt5/qml/Qt3D/Shapes/Cube.qml
2249+usr/lib/*/qt5/qml/Qt3D/Shapes/Cylinder.qml
2250+usr/lib/*/qt5/qml/Qt3D/Shapes/Quad.qml
2251+usr/lib/*/qt5/qml/Qt3D/Shapes/Sphere.qml
2252+usr/lib/*/qt5/qml/Qt3D/Shapes/Teapot.qml
2253+usr/lib/*/qt5/qml/Qt3D/Shapes/cube.obj
2254+usr/lib/*/qt5/qml/Qt3D/Shapes/plugins.qmltypes
2255+usr/lib/*/qt5/qml/Qt3D/Shapes/qmldir
2256+usr/lib/*/qt5/qml/Qt3D/Shapes/quad.obj
2257+usr/lib/*/qt5/qml/Qt3D/Shapes/teapot.bez
2258+usr/lib/*/qt5/qml/Qt3D/libqthreedqmlplugin.so
2259+usr/lib/*/qt5/qml/Qt3D/plugins.qmltypes
2260+usr/lib/*/qt5/qml/Qt3D/qmldir
2261
2262=== added file 'debian/rules'
2263--- debian/rules 1970-01-01 00:00:00 +0000
2264+++ debian/rules 2013-12-20 21:54:23 +0000
2265@@ -0,0 +1,33 @@
2266+#!/usr/bin/make -f
2267+
2268+# Uncomment this to turn on verbose mode.
2269+#export DH_VERBOSE=1
2270+
2271+export QT_SELECT=qt5
2272+
2273+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
2274+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
2275+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
2276+
2277+%:
2278+ dh $@ --fail-missing --parallel --with pkgkde_symbolshelper --dbg-package=qt3d5-dbg
2279+
2280+override_dh_auto_configure:
2281+ qmake
2282+
2283+override_dh_auto_install:
2284+ dh_auto_install
2285+ # Fix wrong path in pkgconfig files
2286+ find $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig -type f -name '*.pc' \
2287+ -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
2288+
2289+ # Remove libtool-like files
2290+ rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
2291+
2292+override_dh_auto_test:
2293+ export LD_LIBRARY_PATH=$(CURDIR)/lib
2294+ cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
2295+
2296+override_dh_builddeb:
2297+ dh_builddeb -- -Zxz
2298+
2299
2300=== added directory 'debian/source'
2301=== added file 'debian/source/format'
2302--- debian/source/format 1970-01-01 00:00:00 +0000
2303+++ debian/source/format 2013-12-20 21:54:23 +0000
2304@@ -0,0 +1,1 @@
2305+3.0 (quilt)

Subscribers

People subscribed via source and target branches