Qvector header cleanup

crates/cxx-qt-lib/.gitattributes

@@ -7,3 +7,5 @@ src/core/qlist/qlist_*.rs linguist-generated=true
 src/core/qset/qset_*.rs linguist-generated=true
 src/core/qvariant/qvariant_*.rs linguist-generated=true
 src/core/qvector/qvector_*.rs linguist-generated=true
+include/core/qvector/qvector_*.h linguist-generated=true
+include/core/qvector/qvector_private.h linguist-generated=false

crates/cxx-qt-lib/build.rs

@@ -5,7 +5,6 @@
 
 use cxx_qt_build::CxxQtBuilder;
 use std::path::PathBuf;
-
 fn qt_gui_enabled() -> bool {
     std::env::var("CARGO_FEATURE_QT_GUI").is_ok()
 }
@@ -31,15 +30,19 @@ fn write_headers_in(subfolder: &str) {
         std::fs::read_dir(format!("include/{subfolder}")).expect("Failed to read include directory")
     {
         let entry = entry.expect("Failed to read header file!");
-        let header_name = entry.file_name();
+        let file_name = entry.file_name();
+        let path = entry.path();
         println!(
             "cargo::rerun-if-changed=include/{subfolder}/{header_name}",
-            header_name = header_name.to_string_lossy()
+            header_name = file_name.to_string_lossy()
         );
 
         // TODO: Do we want to add the headers into a subdirectory?
-        std::fs::copy(entry.path(), header_dir().join(header_name))
-            .expect("Failed to copy header file!");
+        if path.is_dir() {
+            write_headers_in(&format!("{}/{}", subfolder, file_name.to_str().expect("")));
+        } else {
+            std::fs::copy(path, header_dir().join(file_name)).expect("Failed to copy header file!");
+        }
     }
 }
 
@@ -379,6 +382,5 @@ fn main() {
         cc.file("src/qt_types.cpp");
         println!("cargo::rerun-if-changed=src/qt_types.cpp");
     });
-
     builder.build();
 }

crates/cxx-qt-lib/include/core/qvector/qvector.h

@@ -0,0 +1,46 @@
+// clang-format off
+// SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
+// clang-format on
+// SPDX-FileContributor: Andrew Hayzen <[email protected]>
+//
+// SPDX-License-Identifier: MIT OR Apache-2.0
+//
+//
+#pragma once
+
+// The definitions file is auto-generated by the build script
+#include <cxx-qt-lib/definitions.h>
+
+#include "qvector_QByteArray.h"
+#include "qvector_bool.h"
+#include "qvector_f32.h"
+#include "qvector_f64.h"
+#include "qvector_i16.h"
+#include "qvector_i32.h"
+#include "qvector_i64.h"
+#include "qvector_i8.h"
+#ifdef CXX_QT_GUI_FEATURE
+#include "qvector_QColor.h"
+#endif
+#include "qvector_QDate.h"
+#include "qvector_QDateTime.h"
+#include "qvector_QLine.h"
+#include "qvector_QLineF.h"
+#include "qvector_QMargins.h"
+#include "qvector_QMarginsF.h"
+#include "qvector_QPersistentModelIndex.h"
+#include "qvector_QPoint.h"
+#include "qvector_QPointF.h"
+#include "qvector_QRect.h"
+#include "qvector_QRectF.h"
+#include "qvector_QSize.h"
+#include "qvector_QSizeF.h"
+#include "qvector_QString.h"
+#include "qvector_QTime.h"
+#include "qvector_QUrl.h"
+#include "qvector_QUuid.h"
+#include "qvector_QVariant.h"
+#include "qvector_u16.h"
+#include "qvector_u32.h"
+#include "qvector_u64.h"
+#include "qvector_u8.h"