aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-05-27 14:13:49 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-05-27 14:13:49 +1000
commit4e7e10c4036546bda7c46c28124e58a7329c696e (patch)
tree07f9cbe9e25c717284ab5385e66795ce139cdbd8 /examples
parent10832f974634a4162ea5d52526068fd76ed60f3e (diff)
Make textballon example follow convention
Currently, the qml examples autotest works on a set of conventions defined in its source code to determine which tests to run.
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h (renamed from examples/declarative/painteditem/textballoons/textballoonplugin/plugin.h)2
-rw-r--r--examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir (renamed from examples/declarative/painteditem/textballoons/textballoonplugin/qmldir)0
-rw-r--r--examples/declarative/painteditem/textballoons/textballoon.cpp (renamed from examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.cpp)0
-rw-r--r--examples/declarative/painteditem/textballoons/textballoon.h (renamed from examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.h)0
-rw-r--r--examples/declarative/painteditem/textballoons/textballoons.pro4
5 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/plugin.h b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
index ec519a5de8..a0cac07110 100644
--- a/examples/declarative/painteditem/textballoons/textballoonplugin/plugin.h
+++ b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h
@@ -41,7 +41,7 @@
#include <QDeclarativeExtensionPlugin>
-#include "textballoon.h"
+#include "../textballoon.h"
class TextBalloonPlugin : public QDeclarativeExtensionPlugin
{
diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/qmldir b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir
index e8a08ae9d3..e8a08ae9d3 100644
--- a/examples/declarative/painteditem/textballoons/textballoonplugin/qmldir
+++ b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir
diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.cpp b/examples/declarative/painteditem/textballoons/textballoon.cpp
index 0fc56c7a74..0fc56c7a74 100644
--- a/examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.cpp
+++ b/examples/declarative/painteditem/textballoons/textballoon.cpp
diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h
index 1b630f4011..1b630f4011 100644
--- a/examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.h
+++ b/examples/declarative/painteditem/textballoons/textballoon.h
diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/declarative/painteditem/textballoons/textballoons.pro
index 186581f9d5..7470950026 100644
--- a/examples/declarative/painteditem/textballoons/textballoons.pro
+++ b/examples/declarative/painteditem/textballoons/textballoons.pro
@@ -5,9 +5,9 @@ QT += declarative
TARGET = qmltextballoonplugin
HEADERS += textballoonplugin/plugin.h \
- textballoonplugin/textballoon.h
+ textballoon.h
-SOURCES += textballoonplugin/textballoon.cpp
+SOURCES += textballoon.cpp
DESTDIR = textballoonplugin