From 44daf5b1e38f0553119fe4bf23a9c811824eb42a Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 3 May 2018 10:44:44 +0200 Subject: [PATCH] QmlDesigner: move ZoomAction to compentcore it is used by other plugins now Change-Id: I778faf73be003e3341471ecff84333d0d7dac56e Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/componentcore/componentcore.pri | 2 ++ .../components/{formeditor => componentcore}/zoomaction.cpp | 0 .../components/{formeditor => componentcore}/zoomaction.h | 0 src/plugins/qmldesigner/components/formeditor/formeditor.pri | 2 -- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/plugins/qmldesigner/components/{formeditor => componentcore}/zoomaction.cpp (100%) rename src/plugins/qmldesigner/components/{formeditor => componentcore}/zoomaction.h (100%) diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore.pri b/src/plugins/qmldesigner/components/componentcore/componentcore.pri index 45f781e7926..14337508ec9 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore.pri +++ b/src/plugins/qmldesigner/components/componentcore/componentcore.pri @@ -16,6 +16,7 @@ SOURCES += designeractionmanager.cpp SOURCES += modelnodeoperations.cpp SOURCES += crumblebar.cpp SOURCES += qmldesignericonprovider.cpp +SOURCES += zoomaction.cpp HEADERS += modelnodecontextmenu.h HEADERS += addimagesdialog.h @@ -35,6 +36,7 @@ HEADERS += modelnodeoperations.h HEADERS += actioninterface.h HEADERS += crumblebar.h HEADERS += qmldesignericonprovider.h +HEADERS += zoomaction.h FORMS += \ $$PWD/addsignalhandlerdialog.ui diff --git a/src/plugins/qmldesigner/components/formeditor/zoomaction.cpp b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp similarity index 100% rename from src/plugins/qmldesigner/components/formeditor/zoomaction.cpp rename to src/plugins/qmldesigner/components/componentcore/zoomaction.cpp diff --git a/src/plugins/qmldesigner/components/formeditor/zoomaction.h b/src/plugins/qmldesigner/components/componentcore/zoomaction.h similarity index 100% rename from src/plugins/qmldesigner/components/formeditor/zoomaction.h rename to src/plugins/qmldesigner/components/componentcore/zoomaction.h diff --git a/src/plugins/qmldesigner/components/formeditor/formeditor.pri b/src/plugins/qmldesigner/components/formeditor/formeditor.pri index 22abc035dab..aef4f587c65 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditor.pri +++ b/src/plugins/qmldesigner/components/formeditor/formeditor.pri @@ -26,7 +26,6 @@ SOURCES += formeditoritem.cpp \ resizehandleitem.cpp \ dragtool.cpp \ toolbox.cpp \ - zoomaction.cpp \ formeditorgraphicsview.cpp \ numberseriesaction.cpp \ lineeditaction.cpp \ @@ -66,7 +65,6 @@ HEADERS += formeditorscene.h \ resizehandleitem.h \ dragtool.h \ toolbox.h \ - zoomaction.h \ formeditorgraphicsview.h \ numberseriesaction.h \ lineeditaction.h \