Prepare for merging into qtcreatorqp-master

Remove the licensechecker dependency, move everything into
src/plugins/qmlprofilerextension, and adapt the build system.

Change-Id: I58bf34ecd838514d02b5c50189cd8a5eb99793b0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

30 files changed, 1 insertions, 25 deletions

diff --git a/qmlprofiler.pro b/qmlprofiler.pro
deleted file mode 100644
index 4cff3f101a..0000000000
--- a/qmlprofiler.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-
-SUBDIRS += plugins/qmlprofiler
-
-QMAKE_EXTRA_TARGETS = docs install_docs # dummy targets for consistency
diff --git a/qtcreatorlibrary.pri b/qtcreatorlibrary.pri
deleted file mode 100644
index aa11abf700..0000000000
--- a/qtcreatorlibrary.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-IDE_SOURCE_TREE=$$(QTC_SOURCE)
-IDE_BUILD_TREE=$$(QTC_BUILD)
-
-isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable)
-
-include($$IDE_SOURCE_TREE/src/qtcreatorlibrary.pri)
diff --git a/qtcreatorplugin.pri b/qtcreatorplugin.pri
deleted file mode 100644
index 190dbed1c3..0000000000
--- a/qtcreatorplugin.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-isEmpty(IDE_SOURCE_TREE): IDE_SOURCE_TREE=$$(QTC_SOURCE)
-isEmpty(IDE_BUILD_TREE): IDE_BUILD_TREE=$$(QTC_BUILD)
-
-isEmpty(IDE_SOURCE_TREE):error(Set QTC_SOURCE environment variable)
-isEmpty(IDE_BUILD_TREE):error(Set QTC_BUILD environment variable)
-
-INCLUDEPATH+= $$PWD/plugins
-include($$IDE_SOURCE_TREE/src/qtcreatorplugin.pri)
diff --git a/plugins/qmlprofiler/FlameGraphText.qml b/src/plugins/qmlprofilerextension/FlameGraphText.qml
index a989b39355..a989b39355 100644
--- a/plugins/qmlprofiler/FlameGraphText.qml
+++ b/src/plugins/qmlprofilerextension/FlameGraphText.qml
diff --git a/plugins/qmlprofiler/FlameGraphView.qml b/src/plugins/qmlprofilerextension/FlameGraphView.qml
index 7cb4fb5f5f..7cb4fb5f5f 100644
--- a/plugins/qmlprofiler/FlameGraphView.qml
+++ b/src/plugins/qmlprofilerextension/FlameGraphView.qml
diff --git a/plugins/qmlprofiler/QmlProfilerExtension.json.in b/src/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
index 19639f4ecb..19639f4ecb 100644
--- a/plugins/qmlprofiler/QmlProfilerExtension.json.in
+++ b/src/plugins/qmlprofilerextension/QmlProfilerExtension.json.in
diff --git a/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofilerextension/debugmessagesmodel.cpp
index e0f3ec1c6d..e0f3ec1c6d 100644
--- a/plugins/qmlprofiler/debugmessagesmodel.cpp
+++ b/src/plugins/qmlprofilerextension/debugmessagesmodel.cpp
diff --git a/plugins/qmlprofiler/debugmessagesmodel.h b/src/plugins/qmlprofilerextension/debugmessagesmodel.h
index e5934e204d..e5934e204d 100644
--- a/plugins/qmlprofiler/debugmessagesmodel.h
+++ b/src/plugins/qmlprofilerextension/debugmessagesmodel.h
diff --git a/plugins/qmlprofiler/flamegraph.cpp b/src/plugins/qmlprofilerextension/flamegraph.cpp
index e2b8501bce..e2b8501bce 100644
--- a/plugins/qmlprofiler/flamegraph.cpp
+++ b/src/plugins/qmlprofilerextension/flamegraph.cpp
diff --git a/plugins/qmlprofiler/flamegraph.h b/src/plugins/qmlprofilerextension/flamegraph.h
index d4b444fc87..d4b444fc87 100644
--- a/plugins/qmlprofiler/flamegraph.h
+++ b/src/plugins/qmlprofilerextension/flamegraph.h
diff --git a/plugins/qmlprofiler/flamegraph.qrc b/src/plugins/qmlprofilerextension/flamegraph.qrc
index abf7393f4e..abf7393f4e 100644
--- a/plugins/qmlprofiler/flamegraph.qrc
+++ b/src/plugins/qmlprofilerextension/flamegraph.qrc
diff --git a/plugins/qmlprofiler/flamegraphmodel.cpp b/src/plugins/qmlprofilerextension/flamegraphmodel.cpp
index e181a66109..e181a66109 100644
--- a/plugins/qmlprofiler/flamegraphmodel.cpp
+++ b/src/plugins/qmlprofilerextension/flamegraphmodel.cpp
diff --git a/plugins/qmlprofiler/flamegraphmodel.h b/src/plugins/qmlprofilerextension/flamegraphmodel.h
index 06b5b042e1..06b5b042e1 100644
--- a/plugins/qmlprofiler/flamegraphmodel.h
+++ b/src/plugins/qmlprofilerextension/flamegraphmodel.h
diff --git a/plugins/qmlprofiler/flamegraphview.cpp b/src/plugins/qmlprofilerextension/flamegraphview.cpp
index 532f9718bb..532f9718bb 100644
--- a/plugins/qmlprofiler/flamegraphview.cpp
+++ b/src/plugins/qmlprofilerextension/flamegraphview.cpp
diff --git a/plugins/qmlprofiler/flamegraphview.h b/src/plugins/qmlprofilerextension/flamegraphview.h
index b98b673152..b98b673152 100644
--- a/plugins/qmlprofiler/flamegraphview.h
+++ b/src/plugins/qmlprofilerextension/flamegraphview.h
diff --git a/plugins/qmlprofiler/inputeventsmodel.cpp b/src/plugins/qmlprofilerextension/inputeventsmodel.cpp
index a31aef7482..a31aef7482 100644
--- a/plugins/qmlprofiler/inputeventsmodel.cpp
+++ b/src/plugins/qmlprofilerextension/inputeventsmodel.cpp
diff --git a/plugins/qmlprofiler/inputeventsmodel.h b/src/plugins/qmlprofilerextension/inputeventsmodel.h
index 72a58642dc..72a58642dc 100644
--- a/plugins/qmlprofiler/inputeventsmodel.h
+++ b/src/plugins/qmlprofilerextension/inputeventsmodel.h
diff --git a/plugins/qmlprofiler/memoryusagemodel.cpp b/src/plugins/qmlprofilerextension/memoryusagemodel.cpp
index 115522bbd2..115522bbd2 100644
--- a/plugins/qmlprofiler/memoryusagemodel.cpp
+++ b/src/plugins/qmlprofilerextension/memoryusagemodel.cpp
diff --git a/plugins/qmlprofiler/memoryusagemodel.h b/src/plugins/qmlprofilerextension/memoryusagemodel.h
index bf7b557afa..bf7b557afa 100644
--- a/plugins/qmlprofiler/memoryusagemodel.h
+++ b/src/plugins/qmlprofilerextension/memoryusagemodel.h
diff --git a/plugins/qmlprofiler/pixmapcachemodel.cpp b/src/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index b472fd8449..b472fd8449 100644
--- a/plugins/qmlprofiler/pixmapcachemodel.cpp
+++ b/src/plugins/qmlprofilerextension/pixmapcachemodel.cpp
diff --git a/plugins/qmlprofiler/pixmapcachemodel.h b/src/plugins/qmlprofilerextension/pixmapcachemodel.h
index 4d9fac2763..4d9fac2763 100644
--- a/plugins/qmlprofiler/pixmapcachemodel.h
+++ b/src/plugins/qmlprofilerextension/pixmapcachemodel.h
diff --git a/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofilerextension/qmlprofilerextension.pro
index bf1e7f57ff..bfe0d5996f 100644
--- a/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextension.pro
@@ -1,6 +1,3 @@
-TARGET = QmlProfilerExtension
-TEMPLATE = lib
-
 include(../../qtcreatorplugin.pri)
 
 QT += qml quick quickwidgets
diff --git a/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofilerextension/qmlprofilerextension.qbs
index 7196e64884..193cdc3bfb 100644
--- a/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextension.qbs
@@ -1,6 +1,6 @@
 import qbs
 
-QtcCommercialPlugin {
+QtcPlugin {
     name: "QmlProfilerExtension"
 
     Depends { name: "Core" }
diff --git a/plugins/qmlprofiler/qmlprofiler_dependencies.pri b/src/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
index 638fd4c0c0..638fd4c0c0 100644
--- a/plugins/qmlprofiler/qmlprofiler_dependencies.pri
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri
diff --git a/plugins/qmlprofiler/qmlprofilerextension_global.h b/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h
index a8faba9971..a8faba9971 100644
--- a/plugins/qmlprofiler/qmlprofilerextension_global.h
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h
diff --git a/plugins/qmlprofiler/qmlprofilerextensionconstants.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
index e7c730c9d5..e7c730c9d5 100644
--- a/plugins/qmlprofiler/qmlprofilerextensionconstants.h
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h
diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
index 05c7ac9b9e..05c7ac9b9e 100644
--- a/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp
diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
index 63571cde69..63571cde69 100644
--- a/plugins/qmlprofiler/qmlprofilerextensionplugin.h
+++ b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h
diff --git a/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
index cb61bbf07e..cb61bbf07e 100644
--- a/plugins/qmlprofiler/scenegraphtimelinemodel.cpp
+++ b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
diff --git a/plugins/qmlprofiler/scenegraphtimelinemodel.h b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
index 59782769dd..59782769dd 100644
--- a/plugins/qmlprofiler/scenegraphtimelinemodel.h
+++ b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h