Make QtQmlDebug independent of QtQml

This means QtQmlDebug needs its own qqmlprofilerdefintions.h. This is a
good thing because this way we notice if we change the definitions in an
incompatible way. The test uses QtQmlDebug after all. Also,
qqmldebugserviceinterfaces_p.h is not available anymore, which means the
service names have to be spelled out. This, also, is beneficial as it
prevents us from accidentally changing the names.

In the context of QmlDebug we don't need to namespace the profiler
definitions, either. This simplifies some code.

Task-number: QTBUG-60996
Change-Id: Ibb39e48c9b758687d68b8ce4431f45eb26939a09
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/qmlprofiler/qmlprofilerdata.h b/tools/qmlprofiler/qmlprofilerdata.h
index 2be0b73aee..16ebc37f28 100644
--- a/tools/qmlprofiler/qmlprofilerdata.h
+++ b/tools/qmlprofiler/qmlprofilerdata.h
@@ -29,7 +29,7 @@
 #ifndef QMLPROFILERDATA_H
 #define QMLPROFILERDATA_H
 
-#include <private/qqmlprofilerdefinitions_p.h>
+#include <private/qqmlprofilerclientdefinitions_p.h>
 #include <private/qqmlprofilereventlocation_p.h>
 #include <private/qqmlprofilereventreceiver_p.h>
 
@@ -55,8 +55,8 @@ public:
     void addEvent(const QQmlProfilerEvent &event) override;
 
     static QString getHashStringForQmlEvent(const QQmlProfilerEventLocation &location, int eventType);
-    static QString qmlRangeTypeAsString(QQmlProfilerDefinitions::RangeType type);
-    static QString qmlMessageAsString(QQmlProfilerDefinitions::Message type);
+    static QString qmlRangeTypeAsString(RangeType type);
+    static QString qmlMessageAsString(Message type);
 
     qint64 traceStartTime() const;
     qint64 traceEndTime() const;