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