summaryrefslogtreecommitdiffstats
path: root/examples/animation/padnavigator-ng
diff options
context:
space:
mode:
Diffstat (limited to 'examples/animation/padnavigator-ng')
-rw-r--r--examples/animation/padnavigator-ng/padnavigator.pro12
-rw-r--r--examples/animation/padnavigator-ng/panel.h4
-rw-r--r--examples/animation/padnavigator-ng/roundrectitem.cpp4
3 files changed, 10 insertions, 10 deletions
diff --git a/examples/animation/padnavigator-ng/padnavigator.pro b/examples/animation/padnavigator-ng/padnavigator.pro
index 0d094c6..8e53a6d 100644
--- a/examples/animation/padnavigator-ng/padnavigator.pro
+++ b/examples/animation/padnavigator-ng/padnavigator.pro
@@ -1,24 +1,24 @@
-HEADERS += \
+HEADERS = \
panel.h \
roundrectitem.h \
splashitem.h
-SOURCES += \
+SOURCES = \
panel.cpp \
roundrectitem.cpp \
splashitem.cpp \
main.cpp
-RESOURCES += \
+RESOURCES = \
padnavigator.qrc
-FORMS += \
+FORMS = \
backside.ui
contains(QT_CONFIG, opengl):QT += opengl
# install
-target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
+target.path = $$[QT_INSTALL_EXAMPLES]/animation/padnavigator-ng
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
+sources.path = $$[QT_INSTALL_EXAMPLES]/animation/padnavigator-ng
INSTALLS += target sources
diff --git a/examples/animation/padnavigator-ng/panel.h b/examples/animation/padnavigator-ng/panel.h
index 8ad95d9..9aca29d 100644
--- a/examples/animation/padnavigator-ng/panel.h
+++ b/examples/animation/padnavigator-ng/panel.h
@@ -44,11 +44,11 @@
QT_BEGIN_NAMESPACE
class Ui_BackSide;
+class QAnimationGroup;
+class QPropertyAnimation;
QT_END_NAMESPACE;
class RoundRectItem;
-class QAnimationGroup;
-class QPropertyAnimation;
class Panel : public QGraphicsView
{
diff --git a/examples/animation/padnavigator-ng/roundrectitem.cpp b/examples/animation/padnavigator-ng/roundrectitem.cpp
index 7e7d423..2ff216c 100644
--- a/examples/animation/padnavigator-ng/roundrectitem.cpp
+++ b/examples/animation/padnavigator-ng/roundrectitem.cpp
@@ -45,9 +45,9 @@
RoundRectItem::RoundRectItem(const QRectF &rect, const QBrush &brush, QWidget *embeddedWidget)
: QGraphicsWidget(),
+ m_rect(rect),
brush(brush),
- proxyWidget(0),
- m_rect(rect)
+ proxyWidget(0)
{
if (embeddedWidget) {
proxyWidget = new QGraphicsProxyWidget(this);