diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-08-24 17:50:09 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-08-24 17:50:09 -0300 |
| commit | 4d7f0a213fa4c15037e03d8386c92ff6b8edd3da (patch) | |
| tree | 36826b2fc14f4b1a4ef0419cea31e318e3c14d60 /libre/luxrays-parabola/QTBUG-22829.diff | |
| parent | 5df1490b1ae825f3b2422115ab13f557b1aa49e9 (diff) | |
| parent | cd387206bc82dcf12e11a4f19030edd6acf4b3f4 (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
Diffstat (limited to 'libre/luxrays-parabola/QTBUG-22829.diff')
| -rw-r--r-- | libre/luxrays-parabola/QTBUG-22829.diff | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libre/luxrays-parabola/QTBUG-22829.diff b/libre/luxrays-parabola/QTBUG-22829.diff new file mode 100644 index 000000000..5625856bf --- /dev/null +++ b/libre/luxrays-parabola/QTBUG-22829.diff @@ -0,0 +1,17 @@ +diff -rup luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h +--- luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h 2013-10-16 11:16:00.000000000 +0200 ++++ luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h 2013-10-30 20:29:36.768650444 +0100 +@@ -41,11 +41,13 @@ + #include "luxrays/core/utils.h" + #include "luxrays/utils/atomic.h" + ++#ifndef Q_MOC_RUN + #include "slg/slg.h" + #include "slg/rendersession.h" + #include "slg/renderconfig.h" + #include "slg/sdl/scene.h" + #include "slg/film/film.h" ++#endif + + #include "mainwindow.h" + |