diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-28 14:05:57 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-28 14:05:57 (GMT) |
| commit | c24da490a8a865ce4afb6f0d05cd795db4b292c1 (patch) | |
| tree | 911d437a827ef1c1031d47bf91767f4d7e5e756a | |
| parent | 83f4dc2ab88f64460cd8742a5d70ee6fb46e44a9 (diff) | |
| parent | 4a44a8b4be1ba827ccaee8bf19903c6adb9c0900 (diff) | |
| download | Qt-c24da490a8a865ce4afb6f0d05cd795db4b292c1.zip Qt-c24da490a8a865ce4afb6f0d05cd795db4b292c1.tar.gz Qt-c24da490a8a865ce4afb6f0d05cd795db4b292c1.tar.bz2 | |
Integrate merge-request #548 into branch 'master'
Brad Hards (2):
Remove duplicate qpdf_p.h include.
Fix build when compiling Qt using -no-opengl configuration.
Request-url: http://gitorious.org/qt/qt/merge_requests/548
Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| -rw-r--r-- | examples/animation/sub-attaq/mainwindow.cpp | 9 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/animation/sub-attaq/mainwindow.cpp index 9cf9eb5..5e8e259 100644 --- a/examples/animation/sub-attaq/mainwindow.cpp +++ b/examples/animation/sub-attaq/mainwindow.cpp @@ -44,9 +44,12 @@ #include "graphicsscene.h" //Qt -#include <QtGui/QtGui> -#ifndef QT_NO_OPENGL -#include <QtOpenGL/QtOpenGL> +#ifdef QT_NO_OPENGL + #include <QtGui/QMenuBar> + #include <QtGui/QLayout> + #include <QtGui/QApplication> +#else + #include <QtOpenGL/QtOpenGL> #endif MainWindow::MainWindow() : QMainWindow(0) diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 6f5ee1f..a93c391 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -54,8 +54,6 @@ #include <private/qpdf_p.h> #include <private/qharfbuzz_p.h> -#include <private/qpdf_p.h> - #include "qfontengine_ft_p.h" #include <ft2build.h> #include FT_FREETYPE_H |