cneben#248 Working ... with a hardcoded import path !

WIP. Incredibly faster with qmlc... Signed-off-by: cneben <[email protected]>
BioDataAnalysis · Sep 8, 2024 · 111215d · 111215d
1 parent a03fb68
commit 111215d
Show file tree

Hide file tree

Showing 40 changed files with 359 additions and 710 deletions.
diff --git a/samples/groups/CMakeLists.txt b/samples/groups/CMakeLists.txt
@@ -32,6 +32,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} "../../src")
 #add_subdirectory(../../src QuickQanava_src)
 # endif()
 
+set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/qml ${CMAKE_BINARY_DIR}/imports CACHE STRING "" FORCE)
+
 # add_executable(sample_groups ${source_files} groups.qrc)
 # target_include_directories(sample_groups PUBLIC QuickQanava Qt${QT_VERSION_MAJOR}::QuickControls2)
 target_link_libraries(sample_groups_exe PRIVATE

diff --git a/samples/groups/SampleGroups.qml b/samples/groups/SampleGroups.qml
diff --git a/samples/groups/groups.cpp b/samples/groups/groups.cpp
@@ -42,6 +42,7 @@
 
 using namespace qan;
 
+#include <QQmlExtensionPlugin>
 Q_IMPORT_QML_PLUGIN(QuickQanavaPlugin)
 
 //-----------------------------------------------------------------------------
@@ -50,16 +51,20 @@ int	main( int argc, char** argv )
     QGuiApplication app(argc, argv);
     QQuickStyle::setStyle("Material");
     QQmlApplicationEngine engine;
+    engine.addImportPath("./QuickQanava");
+    engine.addImportPath("/home/b/projects/deliastrat.io/Holograph/third-party/QuickQanava/build/Desktop_Qt_6_7_2-Debug/src");
+    engine.addImportPath("/home/b/projects/deliastrat.io/Holograph/third-party/QuickQanava/build/Desktop_Qt_6_7_2-Debug/src/QuickQanava");
+
     QuickQanava::initialize(&engine);
     //engine.load(QUrl("qrc:/groups.qml"));
 
     // FIXME #248 appears in recent QML sample, WTF ?
-    QObject::connect(
+    /*QObject::connect(
         &engine,
         &QQmlApplicationEngine::objectCreationFailed,
         &app,
         []() { QCoreApplication::exit(-1); },
-        Qt::QueuedConnection);
+        Qt::QueuedConnection);*/
     engine.loadFromModule("sample_groups", "SampleGroups");
 
     return app.exec();

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -157,10 +157,11 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:QT_
 #     ${qan_resources}
 #     )
 
-#qt_add_library(QuickQanava STATIC)
-qt_add_qml_module(QuickQanava STATIC
+# qt_add_library(QuickQanava STATIC)
+qt_add_qml_module(QuickQanava
+    STATIC
     URI QuickQanava
-    VERSION 2.5
+    # VERSION 2.5
     SOURCES
         ${qan_source_files} ${qan_header_files} ${quickcontainers_source_files} ${quickcontainers_header_files}
     QML_FILES
@@ -169,30 +170,31 @@ qt_add_qml_module(QuickQanava STATIC
     OUTPUT_DIRECTORY QuickQanava
     #RESOURCE QuickQanava_static.qrc
 )
+set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/QuickQanava)
 
-target_include_directories(QuickQanava
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<INSTALL_INTERFACE:include>
-    )
+# target_include_directories(QuickQanava
+#     PUBLIC
+#         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+#         $<INSTALL_INTERFACE:include>
+#     )
 
-target_compile_features(QuickQanava
-    PUBLIC
-        cxx_std_17
-    )
+# target_compile_features(QuickQanava
+#     PUBLIC
+#         cxx_std_17
+#     )
 
-install(FILES
-    ${qan_header_files}
-    DESTINATION include/quickqanava
-    )
+# install(FILES
+#     ${qan_header_files}
+#     DESTINATION include/quickqanava
+#     )
 
-install(TARGETS QuickQanava
-    EXPORT Targets
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    RUNTIME DESTINATION bin
-    INCLUDES DESTINATION include/quickqanava
-    )
+# install(TARGETS QuickQanava
+#     EXPORT Targets
+#     LIBRARY DESTINATION lib
+#     ARCHIVE DESTINATION lib
+#     RUNTIME DESTINATION bin
+#     INCLUDES DESTINATION include/quickqanava
+#     )
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 target_link_libraries(QuickQanava PUBLIC Qt6::Core

diff --git a/src/CanvasNodeTemplate.qml b/src/CanvasNodeTemplate.qml
@@ -37,9 +37,7 @@ import QtQuick.Layouts
 import QtQuick.Controls.Material
 import QtQuick.Effects
 
-import QuickQanava          2.0 as Qan
-import "qrc:/QuickQanava" as Qan
-
+import QuickQanava as Qan
 
 /*! \brief Default component template for building a custom qan::Node Item with an arbitrary geometry drawn into a JS Canvas2D.
  *

diff --git a/src/Edge.qml b/src/Edge.qml
@@ -35,7 +35,6 @@
 import QtQuick
 
 import QuickQanava as Qan
-//import "qrc:/QuickQanava" as Qan
 
 Qan.EdgeItem {
     id: edgeItem

diff --git a/src/EdgeDstArrowPath.qml b/src/EdgeDstArrowPath.qml
@@ -35,7 +35,7 @@
 import QtQuick
 import QtQuick.Shapes
 
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 ShapePath {
     property var edgeTemplate: undefined

diff --git a/src/EdgeDstCirclePath.qml b/src/EdgeDstCirclePath.qml
@@ -35,7 +35,7 @@
 import QtQuick
 import QtQuick.Shapes
 
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 ShapePath {
     property var edgeTemplate: undefined

diff --git a/src/EdgeDstRectPath.qml b/src/EdgeDstRectPath.qml
@@ -35,7 +35,7 @@
 import QtQuick
 import QtQuick.Shapes
 
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 ShapePath {
     property var edgeTemplate: undefined

diff --git a/src/EdgeSrcArrowPath.qml b/src/EdgeSrcArrowPath.qml
@@ -35,7 +35,7 @@
 import QtQuick
 import QtQuick.Shapes
 
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 ShapePath {
     property var edgeTemplate: undefined

diff --git a/src/EdgeSrcCirclePath.qml b/src/EdgeSrcCirclePath.qml
@@ -35,7 +35,7 @@
 import QtQuick
 import QtQuick.Shapes
 
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 ShapePath {
     property var edgeTemplate: undefined

diff --git a/src/EdgeSrcRectPath.qml b/src/EdgeSrcRectPath.qml
@@ -35,7 +35,7 @@
 import QtQuick
 import QtQuick.Shapes
 
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 ShapePath {
     property var edgeTemplate: undefined

diff --git a/src/GraphPreview.qml b/src/GraphPreview.qml
@@ -28,8 +28,6 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Effects
 
-import QuickQanava as Qan
-
 /*! \brief Visual graph preview.
  *
  */

diff --git a/src/GraphView.qml b/src/GraphView.qml
@@ -36,8 +36,6 @@ import QtQuick
 import QtQuick.Controls
 
 import QuickQanava as Qan
-import '.' as Qan
-//import "qrc:/QuickQanava" as Qan
 
 /*! \brief Visual view for a Qan.Graph component.
  *
@@ -146,7 +144,7 @@ Qan.AbstractGraphView {
     onHeightChanged: updateScrollbars()
     onNavigated: { updateScrollbars() }
 
-    LineGrid {
+    Qan.LineGrid {
         id: lineGrid
     }
     grid: lineGrid

diff --git a/src/Group.qml b/src/Group.qml
@@ -36,7 +36,6 @@ import QtQuick
 import QtQuick.Layouts
 
 import QuickQanava as Qan
-//import "qrc:/QuickQanava"   as Qan
 
 //! \brief Default delegate for `qan::GroupItem`.
 Qan.GroupItem {

diff --git a/src/HeatMapPreview.qml b/src/HeatMapPreview.qml
@@ -28,8 +28,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Effects
 
-import QuickQanava 2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 /*! \brief Visual graph preview.
  *

diff --git a/src/HorizontalDock.qml b/src/HorizontalDock.qml
@@ -33,7 +33,7 @@
 import QtQuick
 import QtQuick.Layouts
 
-import QuickQanava 2.0 as Qan
+import QuickQanava as Qan
 
 RowLayout {
     id: root

diff --git a/src/LineGrid.qml b/src/LineGrid.qml
@@ -33,7 +33,7 @@
 //-----------------------------------------------------------------------------
 
 import QtQuick
-import QuickQanava      2.0 as Qan
+import QuickQanava as Qan
 
 Qan.AbstractLineGrid {
     id: lineGrid

diff --git a/src/Node.qml b/src/Node.qml
@@ -34,8 +34,7 @@
 
 import QtQuick
 
-import QuickQanava          2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 Qan.NodeItem {
     id: nodeItem

diff --git a/src/Port.qml b/src/Port.qml
@@ -34,7 +34,7 @@
 import QtQuick
 import QtQuick.Controls
 
-import QuickQanava 2.0 as Qan
+import QuickQanava as Qan
 
 Qan.PortItem {
     id: portItem

diff --git a/src/RectGlowEffect.qml b/src/RectGlowEffect.qml
@@ -35,8 +35,7 @@
 import QtQuick
 import QtQuick.Effects
 
-import QuickQanava          2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background glow effect with transparent mask for node content.
  */

diff --git a/src/RectGradientBackground.qml b/src/RectGradientBackground.qml
@@ -34,8 +34,7 @@
 
 import QtQuick
 
-import QuickQanava 2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background component with gradient fill, no effect and backOpacity style support
  *

diff --git a/src/RectGradientGlowBackground.qml b/src/RectGradientGlowBackground.qml
@@ -34,7 +34,7 @@
 
 import QtQuick
 
-import QuickQanava          2.0 as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background component with gradient fill, glow effect and backOpacity style support
  *

diff --git a/src/RectGradientShadowBackground.qml b/src/RectGradientShadowBackground.qml
@@ -34,7 +34,7 @@
 
 import QtQuick
 
-import QuickQanava          2.0 as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background component with gradient fill, shadow effect and backOpacity style support
  *

diff --git a/src/RectGroupTemplate.qml b/src/RectGroupTemplate.qml
@@ -36,7 +36,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-import QuickQanava 2.0 as Qan
+import QuickQanava as Qan
 
 Item {
     id: template

diff --git a/src/RectNodeTemplate.qml b/src/RectNodeTemplate.qml
@@ -36,7 +36,7 @@ import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
 
-import QuickQanava 2.0 as Qan
+import QuickQanava as Qan
 
 /*! \brief Default template component for building a custom rectangular qan::Node item.
  *

diff --git a/src/RectShadowEffect.qml b/src/RectShadowEffect.qml
@@ -35,8 +35,7 @@
 import QtQuick
 import QtQuick.Effects
 
-import QuickQanava    2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background component with solid fill, shadow effect and backOpacity style support
  *

diff --git a/src/RectSolidBackground.qml b/src/RectSolidBackground.qml
@@ -34,8 +34,6 @@
 
 import QtQuick
 
-import QuickQanava  2.0 as Qan
-
 /*! \brief Node or group background component with plain solid color backOpacity style support
  *
  */

diff --git a/src/RectSolidGlowBackground.qml b/src/RectSolidGlowBackground.qml
@@ -34,7 +34,7 @@
 
 import QtQuick
 
-import QuickQanava 2.0 as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background component with solid fill, glow effect and backOpacity style support
  *

diff --git a/src/RectSolidShadowBackground.qml b/src/RectSolidShadowBackground.qml
@@ -34,7 +34,7 @@
 
 import QtQuick
 
-import QuickQanava          2.0 as Qan
+import QuickQanava as Qan
 
 /*! \brief Node or group background component with solid fill, shadow effect and backOpacity style support
  *

diff --git a/src/TableBorder.qml b/src/TableBorder.qml
@@ -34,8 +34,7 @@
 
 import QtQuick
 
-import QuickQanava        2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 Qan.AbstractTableBorder {
     id: tableBorder

diff --git a/src/TableCell.qml b/src/TableCell.qml
@@ -34,8 +34,7 @@
 
 import QtQuick
 
-import QuickQanava        2.0 as Qan
-import "qrc:/QuickQanava" as Qan
+import QuickQanava as Qan
 
 Qan.AbstractTableCell {
 

diff --git a/src/TableGroup.qml b/src/TableGroup.qml
@@ -34,7 +34,7 @@
 
 import QtQuick
 
-import QuickQanava          2.0 as Qan
+import QuickQanava as Qan
 import "qrc:/QuickQanava"   as Qan
 
 //! \brief Default delegate for `qan::TableGroupItem`.
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,8 +34,6 @@ @@
     import QtQuick
-    import QuickQanava  2.0 as Qan
     /*! \brief Node or group background component with plain solid color backOpacity style support
      *
      */
@@ Expand Down @@