From 52e2e738719341184b469b45f46b34ee019ab912 Mon Sep 17 00:00:00 2001 From: Yuri Kozyrev Date: Mon, 4 Jul 2022 19:47:36 +0400 Subject: [PATCH] moved TextWithHeader to new module --- .../AlteratorDistInfo/DistInfo.qml | 1 + work/new_alterator/AlteratorDistInfo/main.cpp | 2 +- work/new_alterator/AlteratorDistInfo/qml.qrc | 1 - .../AlteratorLoader/Test/.gitignore | 73 +++++ .../AlteratorLoader/Test/Test.pro | 34 ++ .../AlteratorLoader/Test/myitem.cpp | 15 + .../AlteratorLoader/Test/myitem.h | 16 + .../new_alterator/AlteratorLoader/Test/qmldir | 2 + .../AlteratorLoader/Test/test_plugin.cpp | 12 + .../AlteratorLoader/Test/test_plugin.h | 15 + .../AlteratorLoader/alterator_loader.cpp | 2 +- .../.qtc_clangd/compile_commands.json | 310 ++++++++++++++++++ .../TextWithHeader.qml | 0 work/new_alterator/TextWithHeader/qmldir | 2 + 14 files changed, 482 insertions(+), 3 deletions(-) create mode 100644 work/new_alterator/AlteratorLoader/Test/.gitignore create mode 100644 work/new_alterator/AlteratorLoader/Test/Test.pro create mode 100644 work/new_alterator/AlteratorLoader/Test/myitem.cpp create mode 100644 work/new_alterator/AlteratorLoader/Test/myitem.h create mode 100644 work/new_alterator/AlteratorLoader/Test/qmldir create mode 100644 work/new_alterator/AlteratorLoader/Test/test_plugin.cpp create mode 100644 work/new_alterator/AlteratorLoader/Test/test_plugin.h create mode 100644 work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd/compile_commands.json rename work/new_alterator/{AlteratorDistInfo => TextWithHeader}/TextWithHeader.qml (100%) create mode 100644 work/new_alterator/TextWithHeader/qmldir diff --git a/work/new_alterator/AlteratorDistInfo/DistInfo.qml b/work/new_alterator/AlteratorDistInfo/DistInfo.qml index c54836e..04b1694 100644 --- a/work/new_alterator/AlteratorDistInfo/DistInfo.qml +++ b/work/new_alterator/AlteratorDistInfo/DistInfo.qml @@ -2,6 +2,7 @@ import QtQuick 2.15 import QtQuick.Window 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 +import TextWithHeader 1.0 ColumnLayout{ Rectangle{ diff --git a/work/new_alterator/AlteratorDistInfo/main.cpp b/work/new_alterator/AlteratorDistInfo/main.cpp index 02e6615..6705c15 100644 --- a/work/new_alterator/AlteratorDistInfo/main.cpp +++ b/work/new_alterator/AlteratorDistInfo/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) } QQmlApplicationEngine engine; - const QUrl url(QStringLiteral("/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorDistInfo/AlteratorDistInfo.qml")); + const QUrl url(QStringLiteral("/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorDistInfo/DistInfo.qml")); QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app, [url](QObject *obj, const QUrl &objUrl) { if (!obj && url == objUrl) diff --git a/work/new_alterator/AlteratorDistInfo/qml.qrc b/work/new_alterator/AlteratorDistInfo/qml.qrc index 4c42a1e..aea20f5 100644 --- a/work/new_alterator/AlteratorDistInfo/qml.qrc +++ b/work/new_alterator/AlteratorDistInfo/qml.qrc @@ -4,7 +4,6 @@ AlteratorToolBar.qml AlteratorWindow.qml DistInfo.qml - TextWithHeader.qml Test.qml diff --git a/work/new_alterator/AlteratorLoader/Test/.gitignore b/work/new_alterator/AlteratorLoader/Test/.gitignore new file mode 100644 index 0000000..fab7372 --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/.gitignore @@ -0,0 +1,73 @@ +# This file is used to ignore files which are generated +# ---------------------------------------------------------------------------- + +*~ +*.autosave +*.a +*.core +*.moc +*.o +*.obj +*.orig +*.rej +*.so +*.so.* +*_pch.h.cpp +*_resource.rc +*.qm +.#* +*.*# +core +!core/ +tags +.DS_Store +.directory +*.debug +Makefile* +*.prl +*.app +moc_*.cpp +ui_*.h +qrc_*.cpp +Thumbs.db +*.res +*.rc +/.qmake.cache +/.qmake.stash + +# qtcreator generated files +*.pro.user* + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.sdf +*.opensdf +*.vcxproj +*vcxproj.* + +# MinGW generated files +*.Debug +*.Release + +# Python byte code +*.pyc + +# Binaries +# -------- +*.dll +*.exe + diff --git a/work/new_alterator/AlteratorLoader/Test/Test.pro b/work/new_alterator/AlteratorLoader/Test/Test.pro new file mode 100644 index 0000000..43b5fd2 --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/Test.pro @@ -0,0 +1,34 @@ +TEMPLATE = lib +TARGET = Test +QT += qml quick +CONFIG += plugin c++11 + +TARGET = $$qtLibraryTarget($$TARGET) +uri = com.mycompany.qmlcomponents + +# Input +SOURCES += \ + test_plugin.cpp \ + myitem.cpp + +HEADERS += \ + test_plugin.h \ + myitem.h + +DISTFILES = qmldir + +!equals(_PRO_FILE_PWD_, $$OUT_PWD) { + copy_qmldir.target = $$OUT_PWD/qmldir + copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir + copy_qmldir.commands = $(COPY_FILE) "$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)" "$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)" + QMAKE_EXTRA_TARGETS += copy_qmldir + PRE_TARGETDEPS += $$copy_qmldir.target +} + +qmldir.files = qmldir +unix { + installPath = $$[QT_INSTALL_QML]/$$replace(uri, \., /) + qmldir.path = $$installPath + target.path = $$installPath + INSTALLS += target qmldir +} diff --git a/work/new_alterator/AlteratorLoader/Test/myitem.cpp b/work/new_alterator/AlteratorLoader/Test/myitem.cpp new file mode 100644 index 0000000..9ef50dc --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/myitem.cpp @@ -0,0 +1,15 @@ +#include "myitem.h" + +MyItem::MyItem(QQuickItem *parent) + : QQuickItem(parent) +{ + // By default, QQuickItem does not draw anything. If you subclass + // QQuickItem to create a visual item, you will need to uncomment the + // following line and re-implement updatePaintNode() + + // setFlag(ItemHasContents, true); +} + +MyItem::~MyItem() +{ +} diff --git a/work/new_alterator/AlteratorLoader/Test/myitem.h b/work/new_alterator/AlteratorLoader/Test/myitem.h new file mode 100644 index 0000000..fa3b807 --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/myitem.h @@ -0,0 +1,16 @@ +#ifndef MYITEM_H +#define MYITEM_H + +#include + +class MyItem : public QQuickItem +{ + Q_OBJECT + Q_DISABLE_COPY(MyItem) + +public: + explicit MyItem(QQuickItem *parent = nullptr); + ~MyItem() override; +}; + +#endif // MYITEM_H diff --git a/work/new_alterator/AlteratorLoader/Test/qmldir b/work/new_alterator/AlteratorLoader/Test/qmldir new file mode 100644 index 0000000..8ee6e9e --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/qmldir @@ -0,0 +1,2 @@ +module com.mycompany.qmlcomponents +plugin Test diff --git a/work/new_alterator/AlteratorLoader/Test/test_plugin.cpp b/work/new_alterator/AlteratorLoader/Test/test_plugin.cpp new file mode 100644 index 0000000..84aeb88 --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/test_plugin.cpp @@ -0,0 +1,12 @@ +#include "test_plugin.h" + +#include "myitem.h" + +#include + +void TestPlugin::registerTypes(const char *uri) +{ + // @uri com.mycompany.qmlcomponents + qmlRegisterType(uri, 1, 0, "MyItem"); +} + diff --git a/work/new_alterator/AlteratorLoader/Test/test_plugin.h b/work/new_alterator/AlteratorLoader/Test/test_plugin.h new file mode 100644 index 0000000..a174bf6 --- /dev/null +++ b/work/new_alterator/AlteratorLoader/Test/test_plugin.h @@ -0,0 +1,15 @@ +#ifndef TEST_PLUGIN_H +#define TEST_PLUGIN_H + +#include + +class TestPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) + +public: + void registerTypes(const char *uri) override; +}; + +#endif // TEST_PLUGIN_H diff --git a/work/new_alterator/AlteratorLoader/alterator_loader.cpp b/work/new_alterator/AlteratorLoader/alterator_loader.cpp index 813f438..1d50025 100644 --- a/work/new_alterator/AlteratorLoader/alterator_loader.cpp +++ b/work/new_alterator/AlteratorLoader/alterator_loader.cpp @@ -18,6 +18,7 @@ AlteratorLoader::AlteratorLoader(QObject *p) void AlteratorLoader::open(QString targetUrl){ QString windowId = QUuid::createUuid().toString(); QQmlApplicationEngine *engine = new QQmlApplicationEngine(windowUrl, parent); + engine->addImportPath("/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator"); QObject *window = engine->rootObjects().at(0); window->setProperty("url", targetUrl); window->setProperty("windowId", windowId); @@ -55,7 +56,6 @@ void AlteratorLoader::moveReq(QString senderId, QString targetUrl){ void AlteratorLoader::closed(QString senderId){ past.remove(senderId); future.remove(senderId); - widgets[senderId]->quit(); widgets[senderId]->deleteLater(); widgets.remove(senderId); if(widgets.isEmpty()) { diff --git a/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd/compile_commands.json b/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd/compile_commands.json new file mode 100644 index 0000000..20954be --- /dev/null +++ b/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd/compile_commands.json @@ -0,0 +1,310 @@ +[ +{ + "arguments": [ + "clang", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/.private/kozyrevid/QtCreator-VphRSC/clang-uiheader-CkfDhN", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++11", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-alt-linux", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_PLUGIN", + "-DQT_QUICK_LIB", + "-DQT_GUI_LIB", + "-DQT_QMLMODELS_LIB", + "-DQT_QML_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test", + "-I", + "/usr/include/qt5", + "-I", + "/usr/include/qt5/QtQuick", + "-I", + "/usr/include/qt5/QtGui", + "-I", + "/usr/include/qt5/QtQmlModels", + "-I", + "/usr/include/qt5/QtQml", + "-I", + "/usr/include/qt5/QtNetwork", + "-I", + "/usr/include/qt5/QtCore", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug", + "-I", + "/usr/lib64/qt5/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/10", + "-isystem", + "/usr/include/c++/10/x86_64-alt-linux", + "-isystem", + "/usr/include/c++/10/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/usr/lib/llvm-12.0/lib64/clang/12.0.1/include", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/test_plugin.cpp" + ], + "directory": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd", + "file": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/test_plugin.cpp" +}, +{ + "arguments": [ + "clang", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/.private/kozyrevid/QtCreator-VphRSC/clang-uiheader-CkfDhN", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++11", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-alt-linux", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_PLUGIN", + "-DQT_QUICK_LIB", + "-DQT_GUI_LIB", + "-DQT_QMLMODELS_LIB", + "-DQT_QML_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test", + "-I", + "/usr/include/qt5", + "-I", + "/usr/include/qt5/QtQuick", + "-I", + "/usr/include/qt5/QtGui", + "-I", + "/usr/include/qt5/QtQmlModels", + "-I", + "/usr/include/qt5/QtQml", + "-I", + "/usr/include/qt5/QtNetwork", + "-I", + "/usr/include/qt5/QtCore", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug", + "-I", + "/usr/lib64/qt5/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/10", + "-isystem", + "/usr/include/c++/10/x86_64-alt-linux", + "-isystem", + "/usr/include/c++/10/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/usr/lib/llvm-12.0/lib64/clang/12.0.1/include", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/myitem.cpp" + ], + "directory": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd", + "file": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/myitem.cpp" +}, +{ + "arguments": [ + "clang", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/.private/kozyrevid/QtCreator-VphRSC/clang-uiheader-CkfDhN", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++11", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-alt-linux", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_PLUGIN", + "-DQT_QUICK_LIB", + "-DQT_GUI_LIB", + "-DQT_QMLMODELS_LIB", + "-DQT_QML_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test", + "-I", + "/usr/include/qt5", + "-I", + "/usr/include/qt5/QtQuick", + "-I", + "/usr/include/qt5/QtGui", + "-I", + "/usr/include/qt5/QtQmlModels", + "-I", + "/usr/include/qt5/QtQml", + "-I", + "/usr/include/qt5/QtNetwork", + "-I", + "/usr/include/qt5/QtCore", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug", + "-I", + "/usr/lib64/qt5/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/10", + "-isystem", + "/usr/include/c++/10/x86_64-alt-linux", + "-isystem", + "/usr/include/c++/10/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/usr/lib/llvm-12.0/lib64/clang/12.0.1/include", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++-header", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/test_plugin.h" + ], + "directory": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd", + "file": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/test_plugin.h" +}, +{ + "arguments": [ + "clang", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders", + "-I", + "/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore", + "-I", + "/tmp/.private/kozyrevid/QtCreator-VphRSC/clang-uiheader-CkfDhN", + "-nostdinc", + "-nostdinc++", + "-pipe", + "-g", + "-std=gnu++11", + "-Wall", + "-Wextra", + "-D_REENTRANT", + "-fPIC", + "-fsyntax-only", + "-m64", + "--target=x86_64-alt-linux", + "-DQ_CREATOR_RUN", + "-DQT_QML_DEBUG", + "-DQT_PLUGIN", + "-DQT_QUICK_LIB", + "-DQT_GUI_LIB", + "-DQT_QMLMODELS_LIB", + "-DQT_QML_LIB", + "-DQT_NETWORK_LIB", + "-DQT_CORE_LIB", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test", + "-I", + "/usr/include/qt5", + "-I", + "/usr/include/qt5/QtQuick", + "-I", + "/usr/include/qt5/QtGui", + "-I", + "/usr/include/qt5/QtQmlModels", + "-I", + "/usr/include/qt5/QtQml", + "-I", + "/usr/include/qt5/QtNetwork", + "-I", + "/usr/include/qt5/QtCore", + "-I", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug", + "-I", + "/usr/lib64/qt5/mkspecs/linux-g++", + "-isystem", + "/usr/include/c++/10", + "-isystem", + "/usr/include/c++/10/x86_64-alt-linux", + "-isystem", + "/usr/include/c++/10/backward", + "-isystem", + "/usr/local/include", + "-isystem", + "/usr/lib/llvm-12.0/lib64/clang/12.0.1/include", + "-isystem", + "/usr/include", + "-fmessage-length=0", + "-fdiagnostics-show-note-include-stack", + "-fretain-comments-from-system-headers", + "-fmacro-backtrace-limit=0", + "-ferror-limit=1000", + "-x", + "c++-header", + "-Wno-unknown-pragmas", + "-Wno-unknown-warning-option", + "-Wno-documentation-unknown-command", + "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/myitem.h" + ], + "directory": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/build-Test-Desktop-Debug/.qtc_clangd", + "file": "/home/SMB.BASEALT.RU/kozyrevid/work/new_alterator/AlteratorLoader/Test/myitem.h" +} +] \ No newline at end of file diff --git a/work/new_alterator/AlteratorDistInfo/TextWithHeader.qml b/work/new_alterator/TextWithHeader/TextWithHeader.qml similarity index 100% rename from work/new_alterator/AlteratorDistInfo/TextWithHeader.qml rename to work/new_alterator/TextWithHeader/TextWithHeader.qml diff --git a/work/new_alterator/TextWithHeader/qmldir b/work/new_alterator/TextWithHeader/qmldir new file mode 100644 index 0000000..e0e212d --- /dev/null +++ b/work/new_alterator/TextWithHeader/qmldir @@ -0,0 +1,2 @@ +module TextWithHeader +TextWithHeader 1.0 TextWithHeader.qml