From 9a77f5f429c88518793673e924bb81768796215c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 21 Jan 2016 12:46:01 +0100 Subject: [PATCH] Prepare for merging into qtcreator Remove the licensechecker dependency, move everything into src/plugins/qmlprofilerextension, and adapt the build system. Change-Id: I58bf34ecd838514d02b5c50189cd8a5eb99793b0 Reviewed-by: Eike Ziller --- qmlprofiler.pro | 6 ------ qtcreatorlibrary.pri | 7 ------- qtcreatorplugin.pri | 8 -------- .../plugins/qmlprofilerextension}/FlameGraphText.qml | 0 .../plugins/qmlprofilerextension}/FlameGraphView.qml | 0 .../qmlprofilerextension}/QmlProfilerExtension.json.in | 0 .../plugins/qmlprofilerextension}/debugmessagesmodel.cpp | 0 .../plugins/qmlprofilerextension}/debugmessagesmodel.h | 0 .../plugins/qmlprofilerextension}/flamegraph.cpp | 0 .../plugins/qmlprofilerextension}/flamegraph.h | 0 .../plugins/qmlprofilerextension}/flamegraph.qrc | 0 .../plugins/qmlprofilerextension}/flamegraphmodel.cpp | 0 .../plugins/qmlprofilerextension}/flamegraphmodel.h | 0 .../plugins/qmlprofilerextension}/flamegraphview.cpp | 0 .../plugins/qmlprofilerextension}/flamegraphview.h | 0 .../plugins/qmlprofilerextension}/inputeventsmodel.cpp | 0 .../plugins/qmlprofilerextension}/inputeventsmodel.h | 0 .../plugins/qmlprofilerextension}/memoryusagemodel.cpp | 0 .../plugins/qmlprofilerextension}/memoryusagemodel.h | 0 .../plugins/qmlprofilerextension}/pixmapcachemodel.cpp | 0 .../plugins/qmlprofilerextension}/pixmapcachemodel.h | 0 .../plugins/qmlprofilerextension/qmlprofilerextension.pro | 3 --- .../plugins/qmlprofilerextension/qmlprofilerextension.qbs | 2 +- .../qmlprofilerextension_dependencies.pri | 0 .../qmlprofilerextension}/qmlprofilerextension_global.h | 0 .../qmlprofilerextension}/qmlprofilerextensionconstants.h | 0 .../qmlprofilerextension}/qmlprofilerextensionplugin.cpp | 0 .../qmlprofilerextension}/qmlprofilerextensionplugin.h | 0 .../qmlprofilerextension}/scenegraphtimelinemodel.cpp | 0 .../qmlprofilerextension}/scenegraphtimelinemodel.h | 0 30 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 qmlprofiler.pro delete mode 100644 qtcreatorlibrary.pri delete mode 100644 qtcreatorplugin.pri rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/FlameGraphText.qml (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/FlameGraphView.qml (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/QmlProfilerExtension.json.in (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/debugmessagesmodel.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/debugmessagesmodel.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraph.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraph.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraph.qrc (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraphmodel.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraphmodel.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraphview.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/flamegraphview.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/inputeventsmodel.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/inputeventsmodel.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/memoryusagemodel.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/memoryusagemodel.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/pixmapcachemodel.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/pixmapcachemodel.h (100%) rename plugins/qmlprofiler/qmlprofiler.pro => src/plugins/qmlprofilerextension/qmlprofilerextension.pro (94%) rename plugins/qmlprofiler/qmlprofiler.qbs => src/plugins/qmlprofilerextension/qmlprofilerextension.qbs (97%) rename plugins/qmlprofiler/qmlprofiler_dependencies.pri => src/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/qmlprofilerextension_global.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/qmlprofilerextensionconstants.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/qmlprofilerextensionplugin.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/qmlprofilerextensionplugin.h (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/scenegraphtimelinemodel.cpp (100%) rename {plugins/qmlprofiler => src/plugins/qmlprofilerextension}/scenegraphtimelinemodel.h (100%) diff --git a/qmlprofiler.pro b/qmlprofiler.pro deleted file mode 100644 index 4cff3f101a0..00000000000 --- 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 aa11abf7005..00000000000 --- 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 190dbed1c3b..00000000000 --- 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 similarity index 100% rename from plugins/qmlprofiler/FlameGraphText.qml rename to src/plugins/qmlprofilerextension/FlameGraphText.qml diff --git a/plugins/qmlprofiler/FlameGraphView.qml b/src/plugins/qmlprofilerextension/FlameGraphView.qml similarity index 100% rename from plugins/qmlprofiler/FlameGraphView.qml rename to src/plugins/qmlprofilerextension/FlameGraphView.qml diff --git a/plugins/qmlprofiler/QmlProfilerExtension.json.in b/src/plugins/qmlprofilerextension/QmlProfilerExtension.json.in similarity index 100% rename from plugins/qmlprofiler/QmlProfilerExtension.json.in rename to src/plugins/qmlprofilerextension/QmlProfilerExtension.json.in diff --git a/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofilerextension/debugmessagesmodel.cpp similarity index 100% rename from plugins/qmlprofiler/debugmessagesmodel.cpp rename to src/plugins/qmlprofilerextension/debugmessagesmodel.cpp diff --git a/plugins/qmlprofiler/debugmessagesmodel.h b/src/plugins/qmlprofilerextension/debugmessagesmodel.h similarity index 100% rename from plugins/qmlprofiler/debugmessagesmodel.h rename to src/plugins/qmlprofilerextension/debugmessagesmodel.h diff --git a/plugins/qmlprofiler/flamegraph.cpp b/src/plugins/qmlprofilerextension/flamegraph.cpp similarity index 100% rename from plugins/qmlprofiler/flamegraph.cpp rename to src/plugins/qmlprofilerextension/flamegraph.cpp diff --git a/plugins/qmlprofiler/flamegraph.h b/src/plugins/qmlprofilerextension/flamegraph.h similarity index 100% rename from plugins/qmlprofiler/flamegraph.h rename to src/plugins/qmlprofilerextension/flamegraph.h diff --git a/plugins/qmlprofiler/flamegraph.qrc b/src/plugins/qmlprofilerextension/flamegraph.qrc similarity index 100% rename from plugins/qmlprofiler/flamegraph.qrc rename to src/plugins/qmlprofilerextension/flamegraph.qrc diff --git a/plugins/qmlprofiler/flamegraphmodel.cpp b/src/plugins/qmlprofilerextension/flamegraphmodel.cpp similarity index 100% rename from plugins/qmlprofiler/flamegraphmodel.cpp rename to src/plugins/qmlprofilerextension/flamegraphmodel.cpp diff --git a/plugins/qmlprofiler/flamegraphmodel.h b/src/plugins/qmlprofilerextension/flamegraphmodel.h similarity index 100% rename from plugins/qmlprofiler/flamegraphmodel.h rename to src/plugins/qmlprofilerextension/flamegraphmodel.h diff --git a/plugins/qmlprofiler/flamegraphview.cpp b/src/plugins/qmlprofilerextension/flamegraphview.cpp similarity index 100% rename from plugins/qmlprofiler/flamegraphview.cpp rename to src/plugins/qmlprofilerextension/flamegraphview.cpp diff --git a/plugins/qmlprofiler/flamegraphview.h b/src/plugins/qmlprofilerextension/flamegraphview.h similarity index 100% rename from plugins/qmlprofiler/flamegraphview.h rename to src/plugins/qmlprofilerextension/flamegraphview.h diff --git a/plugins/qmlprofiler/inputeventsmodel.cpp b/src/plugins/qmlprofilerextension/inputeventsmodel.cpp similarity index 100% rename from plugins/qmlprofiler/inputeventsmodel.cpp rename to src/plugins/qmlprofilerextension/inputeventsmodel.cpp diff --git a/plugins/qmlprofiler/inputeventsmodel.h b/src/plugins/qmlprofilerextension/inputeventsmodel.h similarity index 100% rename from plugins/qmlprofiler/inputeventsmodel.h rename to src/plugins/qmlprofilerextension/inputeventsmodel.h diff --git a/plugins/qmlprofiler/memoryusagemodel.cpp b/src/plugins/qmlprofilerextension/memoryusagemodel.cpp similarity index 100% rename from plugins/qmlprofiler/memoryusagemodel.cpp rename to src/plugins/qmlprofilerextension/memoryusagemodel.cpp diff --git a/plugins/qmlprofiler/memoryusagemodel.h b/src/plugins/qmlprofilerextension/memoryusagemodel.h similarity index 100% rename from plugins/qmlprofiler/memoryusagemodel.h rename to src/plugins/qmlprofilerextension/memoryusagemodel.h diff --git a/plugins/qmlprofiler/pixmapcachemodel.cpp b/src/plugins/qmlprofilerextension/pixmapcachemodel.cpp similarity index 100% rename from plugins/qmlprofiler/pixmapcachemodel.cpp rename to src/plugins/qmlprofilerextension/pixmapcachemodel.cpp diff --git a/plugins/qmlprofiler/pixmapcachemodel.h b/src/plugins/qmlprofilerextension/pixmapcachemodel.h similarity index 100% rename from plugins/qmlprofiler/pixmapcachemodel.h rename to src/plugins/qmlprofilerextension/pixmapcachemodel.h diff --git a/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofilerextension/qmlprofilerextension.pro similarity index 94% rename from plugins/qmlprofiler/qmlprofiler.pro rename to src/plugins/qmlprofilerextension/qmlprofilerextension.pro index bf1e7f57ff8..bfe0d5996f0 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 similarity index 97% rename from plugins/qmlprofiler/qmlprofiler.qbs rename to src/plugins/qmlprofilerextension/qmlprofilerextension.qbs index 7196e648846..193cdc3bfbd 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 similarity index 100% rename from plugins/qmlprofiler/qmlprofiler_dependencies.pri rename to src/plugins/qmlprofilerextension/qmlprofilerextension_dependencies.pri diff --git a/plugins/qmlprofiler/qmlprofilerextension_global.h b/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h similarity index 100% rename from plugins/qmlprofiler/qmlprofilerextension_global.h rename to src/plugins/qmlprofilerextension/qmlprofilerextension_global.h diff --git a/plugins/qmlprofiler/qmlprofilerextensionconstants.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h similarity index 100% rename from plugins/qmlprofiler/qmlprofilerextensionconstants.h rename to src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.cpp b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp similarity index 100% rename from plugins/qmlprofiler/qmlprofilerextensionplugin.cpp rename to src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.cpp diff --git a/plugins/qmlprofiler/qmlprofilerextensionplugin.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h similarity index 100% rename from plugins/qmlprofiler/qmlprofilerextensionplugin.h rename to src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h diff --git a/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp similarity index 100% rename from plugins/qmlprofiler/scenegraphtimelinemodel.cpp rename to src/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp diff --git a/plugins/qmlprofiler/scenegraphtimelinemodel.h b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h similarity index 100% rename from plugins/qmlprofiler/scenegraphtimelinemodel.h rename to src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h