diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 21:24:37 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 21:24:37 +0200 |
| commit | aa566e72972fd3b56f1c004153eb53792bdbfb10 (patch) | |
| tree | 0b5ef4b9568584893c6ddb60fe3dd7fb0d0645a6 /src | |
| parent | 7ff96330ed28b957a80d294a43748c8051c0e483 (diff) | |
some build fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/qt_opengl.pri | 2 | ||||
| -rw-r--r-- | src/modules/qt_widgets.pri | 4 | ||||
| -rw-r--r-- | src/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | src/opengl/qgl.h | 2 | ||||
| -rw-r--r-- | src/opengl/qgraphicsshadereffect.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/modules/qt_opengl.pri b/src/modules/qt_opengl.pri index b767a3ce12..a1080cb5a5 100644 --- a/src/modules/qt_opengl.pri +++ b/src/modules/qt_opengl.pri @@ -11,6 +11,6 @@ QT.opengl.sources = $$QT_MODULE_BASE/src/opengl QT.opengl.libs = $$QT_MODULE_LIB_BASE QT.opengl.plugins = $$QT_MODULE_PLUGIN_BASE QT.opengl.imports = $$QT_MODULE_IMPORT_BASE -QT.opengl.depends = core gui +QT.opengl.depends = core gui widgets QT.opengl.CONFIG = opengl QT.opengl.DEFINES = QT_OPENGL_LIB diff --git a/src/modules/qt_widgets.pri b/src/modules/qt_widgets.pri index 78752e131e..c86bc12021 100644 --- a/src/modules/qt_widgets.pri +++ b/src/modules/qt_widgets.pri @@ -3,12 +3,12 @@ QT.widgets.MAJOR_VERSION = 4 QT.widgets.MINOR_VERSION = 8 QT.widgets.PATCH_VERSION = 0 -QT.widgets.name = QtGui +QT.widgets.name = QtWidgets QT.widgets.includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets QT.widgets.private_includes = $$QT_MODULE_INCLUDE_BASE/QtWidgets/$$QT.widgets.VERSION QT.widgets.sources = $$QT_MODULE_BASE/src/widgets QT.widgets.libs = $$QT_MODULE_LIB_BASE QT.widgets.plugins = $$QT_MODULE_PLUGIN_BASE QT.widgets.imports = $$QT_MODULE_IMPORT_BASE -QT.widgets.depends = core network +QT.widgets.depends = core network gui QT.widgets.DEFINES = QT_GUI_LIB diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 2aee4333ef..2612368fb3 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -1,6 +1,6 @@ TARGET = QtOpenGL QPRO_PWD = $$PWD -QT = core-private gui-private +QT = core-private gui-private widgets-private CONFIG += module MODULE_PRI = ../modules/qt_opengl.pri diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 730e52ba8f..30a8a32cfe 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -42,7 +42,7 @@ #ifndef QGL_H #define QGL_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qpaintengine.h> #include <QtOpenGL/qglcolormap.h> #include <QtCore/qmap.h> diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index 6983d9057e..859af2045f 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -46,8 +46,8 @@ #define QGL_HAVE_CUSTOM_SHADERS 1 #endif #include <QtGui/qpainter.h> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/private/qgraphicseffect_p.h> +#include <QtWidgets/qgraphicsitem.h> +#include <private/qgraphicseffect_p.h> QT_BEGIN_NAMESPACE |