fix qt 5.12 & 5.13 compatibility

fastly · Nov 1, 2023 · 045cae3 · 045cae3
1 parent aa2a75e
commit 045cae3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/configure b/configure
@@ -432,6 +432,12 @@ arg: logdir=[path],Directory for log files.  Default: /var/log
 #include <QDateTime>
 #include <QSettings>
 
+#if QT_VERSION >= 0x050e00
+#define ENDL Qt::endl
+#else
+#define ENDL endl
+#endif
+
 static QString getVersion()
 {
 	QSettings settings("Cargo.toml", QSettings::IniFormat);
@@ -494,9 +500,9 @@ public:
 		if(file.open(QIODevice::WriteOnly | QIODevice::Text))
 		{
 			QTextStream stream( &file );
-			stream << "#define VERSION \\"" << version << "\\"" << Qt::endl;
-			stream << "#define LIBDIR \\"" << libdir << "/pushpin\\"" << Qt::endl;
-			stream << "#define CONFIGDIR \\"" << configdir << "/pushpin\\"" << Qt::endl;
+			stream << "#define VERSION \\"" << version << "\\"" << ENDL;
+			stream << "#define LIBDIR \\"" << libdir << "/pushpin\\"" << ENDL;
+			stream << "#define CONFIGDIR \\"" << configdir << "/pushpin\\"" << ENDL;
 		}
 
 		conf->addDefine("HAVE_CONFIG");

diff --git a/qcm/conf.qcm b/qcm/conf.qcm
@@ -12,6 +12,12 @@ arg: logdir=[path],Directory for log files.  Default: /var/log
 #include <QDateTime>
 #include <QSettings>
 
+#if QT_VERSION >= 0x050e00
+#define ENDL Qt::endl
+#else
+#define ENDL endl
+#endif
+
 static QString getVersion()
 {
 	QSettings settings("Cargo.toml", QSettings::IniFormat);
@@ -74,9 +80,9 @@ public:
 		if(file.open(QIODevice::WriteOnly | QIODevice::Text))
 		{
 			QTextStream stream( &file );
-			stream << "#define VERSION \"" << version << "\"" << Qt::endl;
-			stream << "#define LIBDIR \"" << libdir << "/pushpin\"" << Qt::endl;
-			stream << "#define CONFIGDIR \"" << configdir << "/pushpin\"" << Qt::endl;
+			stream << "#define VERSION \"" << version << "\"" << ENDL;
+			stream << "#define LIBDIR \"" << libdir << "/pushpin\"" << ENDL;
+			stream << "#define CONFIGDIR \"" << configdir << "/pushpin\"" << ENDL;
 		}
 
 		conf->addDefine("HAVE_CONFIG");