Build with qt 6.4.1

This commit is contained in:
Hamed Masafi 2023-07-13 11:52:30 +03:30
parent 0de2161935
commit 16d485b1ed
8 changed files with 8 additions and 7 deletions

View File

@ -1 +1 @@
set(QT_REPO_MODULE_VERSION "6.4.2") set(QT_REPO_MODULE_VERSION "6.5.1")

View File

@ -42,7 +42,10 @@ qt_internal_add_module(Nut
phrases/phrasedata.cpp phrases/phrasedata.h phrases/phrasedata.cpp phrases/phrasedata.h
phrases/phrasedatalist.cpp phrases/phrasedatalist.h phrases/phrasedatalist.cpp phrases/phrasedatalist.h
phrases/phraselist.cpp phrases/phraselist.h phrases/phraselist.cpp phrases/phraselist.h
phrases/numericphrase.cpp phrases/numericphrase.h
types/dbgeography.cpp types/dbgeography.h types/dbgeography.cpp types/dbgeography.h
NutGlobal
DEFINES DEFINES
NUT_BUILD_LIB NUT_BUILD_LIB
NUT_SHARED NUT_SHARED

1
src/nut/NutGlobal Normal file
View File

@ -0,0 +1 @@
#include "config/nut_global.h"

View File

@ -22,7 +22,7 @@
#define FOREIGNCONTAINER_H #define FOREIGNCONTAINER_H
#include <QtGlobal> #include <QtGlobal>
#include <QtNut/NutGlobal> #include <QtNut/nut_global.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -22,7 +22,7 @@
#define SQLSERIALIZER_H #define SQLSERIALIZER_H
#include <QVariant> #include <QVariant>
#include <QtNut/NutGlobal> #include <QtNut/nut_global.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -38,7 +38,4 @@
#include <QtNut/fieldphrase_qstring.h> #include <QtNut/fieldphrase_qstring.h>
#include <QtNut/fieldphrase_bool.h> #include <QtNut/fieldphrase_bool.h>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
#endif // PHRASE_H #endif // PHRASE_H

View File

@ -23,7 +23,6 @@
#include <QtNut/nut_global.h> #include <QtNut/nut_global.h>
#include <QtNut/assignmentphraselist.h> #include <QtNut/assignmentphraselist.h>
#include <QtNut/NutGlobal>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -3,5 +3,6 @@
); );
%classnames = ( %classnames = (
"nut_global.h" => "NutGlobal" "nut_global.h" => "NutGlobal"
"numericphrase.h" => "NumericFieldPhrase"
); );
$publicclassregexp = ".+"; $publicclassregexp = ".+";