From 4e7e10c4036546bda7c46c28124e58a7329c696e Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 27 May 2011 14:13:49 +1000 Subject: [PATCH] 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. --- .../{textballoonplugin => TextBalloonPlugin}/plugin.h | 2 +- .../{textballoonplugin => TextBalloonPlugin}/qmldir | 0 .../textballoons/{textballoonplugin => }/textballoon.cpp | 0 .../textballoons/{textballoonplugin => }/textballoon.h | 0 .../declarative/painteditem/textballoons/textballoons.pro | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename examples/declarative/painteditem/textballoons/{textballoonplugin => TextBalloonPlugin}/plugin.h (98%) rename examples/declarative/painteditem/textballoons/{textballoonplugin => TextBalloonPlugin}/qmldir (100%) rename examples/declarative/painteditem/textballoons/{textballoonplugin => }/textballoon.cpp (100%) rename examples/declarative/painteditem/textballoons/{textballoonplugin => }/textballoon.h (100%) diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/plugin.h b/examples/declarative/painteditem/textballoons/TextBalloonPlugin/plugin.h similarity index 98% rename from examples/declarative/painteditem/textballoons/textballoonplugin/plugin.h rename to 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 -#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 similarity index 100% rename from examples/declarative/painteditem/textballoons/textballoonplugin/qmldir rename to examples/declarative/painteditem/textballoons/TextBalloonPlugin/qmldir diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.cpp b/examples/declarative/painteditem/textballoons/textballoon.cpp similarity index 100% rename from examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.cpp rename to examples/declarative/painteditem/textballoons/textballoon.cpp diff --git a/examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h similarity index 100% rename from examples/declarative/painteditem/textballoons/textballoonplugin/textballoon.h rename to 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