Fix duplicate CMake target "terminator2plugin"

When both examples and tests were being built, CMake generated
ambiguous rules thanks to its flat namespace.

Renamed the terminator2 plugin in tests to qmlcrash.

Change-Id: I75b8c77e21e2f8f44138c99bfd87bc6ac0faa196
Reviewed-by: Bernd Weimer <bernd.weimer@qt.io>

6 files changed, 43 insertions, 43 deletions

diff --git a/tests/auto/qml/crash/apps/tld.test.crash/CMakeLists.txt b/tests/auto/qml/crash/apps/tld.test.crash/CMakeLists.txt
index 11830cac..b3353697 100644
--- a/tests/auto/qml/crash/apps/tld.test.crash/CMakeLists.txt
+++ b/tests/auto/qml/crash/apps/tld.test.crash/CMakeLists.txt
@@ -1,15 +1,15 @@
 
-qt_internal_add_cmake_library(terminator2plugin
+qt_internal_add_cmake_library(qmlcrashplugin
     MODULE
-    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Terminator"
+    OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/QmlCrash"
     SOURCES
-        ../../terminator2/qmlterminator2.cpp ../../terminator2/qmlterminator2.h
+        ../../qmlcrash/qmlcrash.cpp ../../qmlcrash/qmlcrash.h
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
         Qt::Qml
 )
 
-qt_internal_set_exceptions_flags(terminator2plugin TRUE)
+qt_internal_set_exceptions_flags(qmlcrashplugin TRUE)
 
-qt_autogen_tools_initial_setup(terminator2plugin)
+qt_autogen_tools_initial_setup(qmlcrashplugin)
diff --git a/tests/auto/qml/crash/apps/tld.test.crash/QmlCrash/qmldir b/tests/auto/qml/crash/apps/tld.test.crash/QmlCrash/qmldir
new file mode 100644
index 00000000..9e192942
--- /dev/null
+++ b/tests/auto/qml/crash/apps/tld.test.crash/QmlCrash/qmldir
@@ -0,0 +1,2 @@
+module QmlCrash
+plugin qmlcrashplugin
diff --git a/tests/auto/qml/crash/apps/tld.test.crash/Terminator/qmldir b/tests/auto/qml/crash/apps/tld.test.crash/Terminator/qmldir
deleted file mode 100644
index ac15a495..00000000
--- a/tests/auto/qml/crash/apps/tld.test.crash/Terminator/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module Terminator
-plugin terminator2plugin
diff --git a/tests/auto/qml/crash/apps/tld.test.crash/app.qml b/tests/auto/qml/crash/apps/tld.test.crash/app.qml
index a97c60f2..5b0492c8 100644
--- a/tests/auto/qml/crash/apps/tld.test.crash/app.qml
+++ b/tests/auto/qml/crash/apps/tld.test.crash/app.qml
@@ -31,12 +31,12 @@
 
 import QtQuick 2.3
 import QtApplicationManager.Application 2.0
-import Terminator 2.0
+import QmlCrash 2.0
 
 ApplicationManagerWindow {
     function accessIllegalMemory()
     {
-        Terminator.accessIllegalMemory();
+        QmlCrash.accessIllegalMemory();
     }
 
     Connections {
@@ -44,13 +44,13 @@ ApplicationManagerWindow {
         function onOpenDocument(documentUrl) {
             switch (documentUrl) {
             case "illegalMemory": accessIllegalMemory(); break;
-            case "illegalMemoryInThread": Terminator.accessIllegalMemoryInThread(); break;
-            case "stackOverflow": Terminator.forceStackOverflow(); break;
-            case "divideByZero": Terminator.divideByZero(); break;
-            case "unhandledException": Terminator.throwUnhandledException(); break;
-            case "abort": Terminator.abort(); break;
-            case "raise": Terminator.raise(7); break;
-            case "gracefully": Terminator.exitGracefully(); break;
+            case "illegalMemoryInThread": QmlCrash.accessIllegalMemoryInThread(); break;
+            case "stackOverflow": QmlCrash.forceStackOverflow(); break;
+            case "divideByZero": QmlCrash.divideByZero(); break;
+            case "unhandledException": QmlCrash.throwUnhandledException(); break;
+            case "abort": QmlCrash.abort(); break;
+            case "raise": QmlCrash.raise(7); break;
+            case "gracefully": QmlCrash.exitGracefully(); break;
             }
         }
     }
diff --git a/tests/auto/qml/crash/terminator2/qmlterminator2.cpp b/tests/auto/qml/crash/qmlcrash/qmlcrash.cpp
index 5a90dc49..bda7727f 100644
--- a/tests/auto/qml/crash/terminator2/qmlterminator2.cpp
+++ b/tests/auto/qml/crash/qmlcrash/qmlcrash.cpp
@@ -31,20 +31,20 @@
 #include <QQmlEngine>
 #include <QJSEngine>
 
-#include "qmlterminator2.h"
+#include "qmlcrash.h"
 
 #include <signal.h>
 
 
-static QObject *terminator_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+static QObject *qmlCrash_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
     Q_UNUSED(scriptEngine)
-    return new Terminator(engine);
+    return new QmlCrash(engine);
 }
 
-void TerminatorPlugin::registerTypes(const char *uri)
+void QmlCrashPlugin::registerTypes(const char *uri)
 {
-    qmlRegisterSingletonType<Terminator>(uri, 2, 0, "Terminator", terminator_provider);
+    qmlRegisterSingletonType<QmlCrash>(uri, 2, 0, "QmlCrash", qmlCrash_provider);
 }
 
 
@@ -53,18 +53,18 @@ static void abortWithVeryLongSymbolNameOnTheStack800CharactersLong_CallMeIshmael
     ::abort();
 }
 
-void Terminator::accessIllegalMemory() const
+void QmlCrash::accessIllegalMemory() const
 {
     *(int*)1 = 42;
 }
 
-void Terminator::accessIllegalMemoryInThread()
+void QmlCrash::accessIllegalMemoryInThread()
 {
-    TerminatorThread *t = new TerminatorThread(this);
+    QmlCrashThread *t = new QmlCrashThread(this);
     t->start();
 }
 
-void Terminator::forceStackOverflow() const
+void QmlCrash::forceStackOverflow() const
 {
     static constexpr int len = 100000;
     volatile char buf[len];
@@ -73,42 +73,42 @@ void Terminator::forceStackOverflow() const
         forceStackOverflow();
 }
 
-void Terminator::divideByZero() const
+void QmlCrash::divideByZero() const
 {
     int d = 0;
     volatile int x = 42 / d;
     Q_UNUSED(x)
 }
 
-void Terminator::abort() const
+void QmlCrash::abort() const
 {
     abortWithVeryLongSymbolNameOnTheStack800CharactersLong_CallMeIshmaelSomeYearsAgoNeverMindHowLongPreciselyHavingLittleOrNoMoneyInMyPurseAndNothingParticularToInterestMeOnShoreIThoughIWouldSailAboutALittlAndSeeTheWateryPartOfTheWorldItIsAWayIHaveOfDrivingOffTheSpleenAndRegulatingTheCirculationWhenenverIFindMyselfGrowingGrimAboutTheMouthWheneverItIsADampDrizzlyNovemberInMySoulWheneverIFindMyselfInvoluntarilyPausingBeforeCoffinWarehousesAndBringingUpTheRearOfEveryFuneralIMeetAndEspeciallyWheneverMyHyposGetSuchAnUpperHandOfMeThatItRequiresAStrongMoralPrincipleToPreventMeFromDeliberatelySteppingIntoTheStreetAndMethodicallyKnockingPeoplesHatsOffThenIAccountItHighTimeToGetToSeaAsSoonAsICanThisIsMySubstituteForPistolAndBallWithAPhilosophicalFlourishCatoThrowsHimselfUponHisSwordIQuietlyTakeToTheShip();
 }
 
-void Terminator::raise(int sig) const
+void QmlCrash::raise(int sig) const
 {
     ::raise(sig);
 }
 
-void Terminator::throwUnhandledException() const
+void QmlCrash::throwUnhandledException() const
 {
     throw 42;
 }
 
-void Terminator::exitGracefully() const
+void QmlCrash::exitGracefully() const
 {
     exit(5);
 }
 
 
-TerminatorThread::TerminatorThread(Terminator *parent)
-    : QThread(parent), m_terminator(parent)
-{
-}
+QmlCrashThread::QmlCrashThread(QmlCrash *parent)
+    : QThread(parent)
+    , m_qmlCrash(parent)
+{ }
 
-void TerminatorThread::run()
+void QmlCrashThread::run()
 {
-    m_terminator->accessIllegalMemory();
+    m_qmlCrash->accessIllegalMemory();
 }
 
-#include "moc_qmlterminator2.cpp"
+#include "moc_qmlcrash.cpp"
diff --git a/tests/auto/qml/crash/terminator2/qmlterminator2.h b/tests/auto/qml/crash/qmlcrash/qmlcrash.h
index 27bc8e28..37911a0b 100644
--- a/tests/auto/qml/crash/terminator2/qmlterminator2.h
+++ b/tests/auto/qml/crash/qmlcrash/qmlcrash.h
@@ -34,7 +34,7 @@
 #include <QThread>
 
 
-class TerminatorPlugin : public QQmlExtensionPlugin
+class QmlCrashPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
@@ -44,12 +44,12 @@ public:
 };
 
 
-class Terminator : public QObject
+class QmlCrash : public QObject
 {
     Q_OBJECT
 
 public:
-    Terminator(QObject *parent) : QObject(parent) {}
+    QmlCrash(QObject *parent) : QObject(parent) {}
 
     Q_INVOKABLE void accessIllegalMemory() const;
     Q_INVOKABLE void accessIllegalMemoryInThread();
@@ -62,14 +62,14 @@ public:
 };
 
 
-class TerminatorThread : public QThread
+class QmlCrashThread : public QThread
 {
     Q_OBJECT
 
 public:
-    explicit TerminatorThread(Terminator *parent);
+    explicit QmlCrashThread(QmlCrash *parent);
 
 private:
     void run() override;
-    Terminator *m_terminator;
+    QmlCrash *m_qmlCrash;
 };