From 16d485b1eddd494bcb60825def6e4357d5d26619 Mon Sep 17 00:00:00 2001
From: Hamed Masafi <hamed/masafi@gmail.com>
Date: Thu, 13 Jul 2023 11:52:30 +0330
Subject: [PATCH] Build with qt 6.4.1

---
 .cmake.conf                        | 2 +-
 src/nut/CMakeLists.txt             | 3 +++
 src/nut/NutGlobal                  | 1 +
 src/nut/core/foreigncontainer.h    | 2 +-
 src/nut/core/sqlserializer.h       | 2 +-
 src/nut/phrase.h                   | 3 ---
 src/nut/phrases/assignmentphrase.h | 1 -
 sync.profile                       | 1 +
 8 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 src/nut/NutGlobal

diff --git a/.cmake.conf b/.cmake.conf
index 5917b21..b929a60 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.4.2")
+set(QT_REPO_MODULE_VERSION "6.5.1")
diff --git a/src/nut/CMakeLists.txt b/src/nut/CMakeLists.txt
index 6eeb0c5..c94a761 100644
--- a/src/nut/CMakeLists.txt
+++ b/src/nut/CMakeLists.txt
@@ -42,7 +42,10 @@ qt_internal_add_module(Nut
         phrases/phrasedata.cpp phrases/phrasedata.h
         phrases/phrasedatalist.cpp phrases/phrasedatalist.h
         phrases/phraselist.cpp phrases/phraselist.h
+        phrases/numericphrase.cpp phrases/numericphrase.h
         types/dbgeography.cpp types/dbgeography.h
+
+        NutGlobal
     DEFINES
         NUT_BUILD_LIB
         NUT_SHARED
diff --git a/src/nut/NutGlobal b/src/nut/NutGlobal
new file mode 100644
index 0000000..0420fc5
--- /dev/null
+++ b/src/nut/NutGlobal
@@ -0,0 +1 @@
+#include "config/nut_global.h"
diff --git a/src/nut/core/foreigncontainer.h b/src/nut/core/foreigncontainer.h
index a91688f..b83a03f 100644
--- a/src/nut/core/foreigncontainer.h
+++ b/src/nut/core/foreigncontainer.h
@@ -22,7 +22,7 @@
 #define FOREIGNCONTAINER_H
 
 #include <QtGlobal>
-#include <QtNut/NutGlobal>
+#include <QtNut/nut_global.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nut/core/sqlserializer.h b/src/nut/core/sqlserializer.h
index ebc90e3..03c8eec 100644
--- a/src/nut/core/sqlserializer.h
+++ b/src/nut/core/sqlserializer.h
@@ -22,7 +22,7 @@
 #define SQLSERIALIZER_H
 
 #include <QVariant>
-#include <QtNut/NutGlobal>
+#include <QtNut/nut_global.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/nut/phrase.h b/src/nut/phrase.h
index 60c9a8a..1050f41 100644
--- a/src/nut/phrase.h
+++ b/src/nut/phrase.h
@@ -38,7 +38,4 @@
 #include <QtNut/fieldphrase_qstring.h>
 #include <QtNut/fieldphrase_bool.h>
 
-QT_BEGIN_NAMESPACE
-QT_END_NAMESPACE
-
 #endif // PHRASE_H
diff --git a/src/nut/phrases/assignmentphrase.h b/src/nut/phrases/assignmentphrase.h
index 813a8f2..4d48960 100644
--- a/src/nut/phrases/assignmentphrase.h
+++ b/src/nut/phrases/assignmentphrase.h
@@ -23,7 +23,6 @@
 
 #include <QtNut/nut_global.h>
 #include <QtNut/assignmentphraselist.h>
-#include <QtNut/NutGlobal>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/sync.profile b/sync.profile
index 0d98858..8ebbae4 100644
--- a/sync.profile
+++ b/sync.profile
@@ -3,5 +3,6 @@
 );
 %classnames = (
  "nut_global.h" => "NutGlobal"
+ "numericphrase.h" => "NumericFieldPhrase"
 );
 $publicclassregexp = ".+";