Build with qt 6.4.1

HamedMasafi · Jul 13, 2023 · 16d485b · 16d485b
1 parent 0de2161
commit 16d485b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+#include "config/nut_global.h"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -3,5 +3,6 @@
 );
 %classnames = (
  "nut_global.h" => "NutGlobal"
+ "numericphrase.h" => "NumericFieldPhrase"
 );
 $publicclassregexp = ".+";
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		set(QT_REPO_MODULE_VERSION "6.4.2")
		set(QT_REPO_MODULE_VERSION "6.5.1")