diff options
-rw-r--r-- | src/gui/effects/qgraphicseffect.cpp (renamed from src/gui/graphicsview/qgraphicseffect.cpp) | 0 | ||||
-rw-r--r-- | src/gui/effects/qgraphicseffect.h (renamed from src/gui/graphicsview/qgraphicseffect.h) | 0 | ||||
-rw-r--r-- | src/gui/effects/qgraphicseffect_p.h (renamed from src/gui/graphicsview/qgraphicseffect_p.h) | 0 | ||||
-rw-r--r-- | src/gui/graphicsview/graphicsview.pri | 5 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 3 | ||||
-rw-r--r-- | src/gui/graphicsview/qgraphicsscene.cpp | 2 | ||||
-rw-r--r-- | src/gui/gui.pro | 1 |
7 files changed, 5 insertions, 6 deletions
diff --git a/src/gui/graphicsview/qgraphicseffect.cpp b/src/gui/effects/qgraphicseffect.cpp index b04af7a..b04af7a 100644 --- a/src/gui/graphicsview/qgraphicseffect.cpp +++ b/src/gui/effects/qgraphicseffect.cpp diff --git a/src/gui/graphicsview/qgraphicseffect.h b/src/gui/effects/qgraphicseffect.h index d171b1b..d171b1b 100644 --- a/src/gui/graphicsview/qgraphicseffect.h +++ b/src/gui/effects/qgraphicseffect.h diff --git a/src/gui/graphicsview/qgraphicseffect_p.h b/src/gui/effects/qgraphicseffect_p.h index 6d546cc..6d546cc 100644 --- a/src/gui/graphicsview/qgraphicseffect_p.h +++ b/src/gui/effects/qgraphicseffect_p.h diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri index a3095e7..15b86b5 100644 --- a/src/gui/graphicsview/graphicsview.pri +++ b/src/gui/graphicsview/graphicsview.pri @@ -22,8 +22,6 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \ graphicsview/qgraphicsview_p.h \ graphicsview/qgraphicswidget.h \ graphicsview/qgraphicswidget_p.h \ - graphicsview/qgraphicseffect.h \ - graphicsview/qgraphicseffect_p.h \ graphicsview/qgridlayoutengine_p.h SOURCES += graphicsview/qgraphicsgridlayout.cpp \ @@ -44,5 +42,4 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicsview.cpp \ graphicsview/qgraphicswidget.cpp \ graphicsview/qgraphicswidget_p.cpp \ - graphicsview/qgridlayoutengine.cpp \ - graphicsview/qgraphicseffect.cpp + graphicsview/qgridlayoutengine.cpp diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index a5854b1..a7b48fc 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -57,10 +57,11 @@ #include "qset.h" #include "qpixmapcache.h" #include "qgraphicsview_p.h" -#include "qgraphicseffect_p.h" #include "qgraphicstransform.h" #include "qgraphicstransform_p.h" +#include <private/qgraphicseffect_p.h> + #include <QtCore/qpoint.h> #if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index db783ad..ff8445f 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -207,7 +207,6 @@ #ifndef QT_NO_GRAPHICSVIEW -#include "qgraphicseffect_p.h" #include "qgraphicsitem.h" #include "qgraphicsitem_p.h" #include "qgraphicslayout.h" @@ -250,6 +249,7 @@ #ifdef Q_WS_X11 #include <private/qt_x11_p.h> #endif +#include <private/qgraphicseffect_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/gui.pro b/src/gui/gui.pro index a49d680..90ac3ce 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -34,6 +34,7 @@ include(graphicsview/graphicsview.pri) include(util/util.pri) include(statemachine/statemachine.pri) include(math3d/math3d.pri) +include(effects/effects.pri) contains(QT_CONFIG, egl): include(egl/egl.pri) |