Merged with qt6 from server

src/gsi/gsi/gsiSerialisation.h

@@ -1649,7 +1649,7 @@ private:
  *  @brief Specialization for QVariant
  */
 template <typename T>
-class GSI_PUBLIC VariantAdaptorImpl<QPointer<T> >
+class GSI_PUBLIC_TEMPLATE VariantAdaptorImpl<QPointer<T> >
   : public VariantAdaptor
 {
 public:
@@ -1813,7 +1813,7 @@ private:
  *  @brief Specialization for std::optional
  */
 template <typename T>
-class GSI_PUBLIC VariantAdaptorImpl<std::optional<T> >
+class GSI_PUBLIC_TEMPLATE VariantAdaptorImpl<std::optional<T> >
   : public VariantAdaptor
 {
 public:

src/gsiqt/qt6/QtCore/gsiDeclQAbstractEventDispatcher.cc

@@ -463,10 +463,6 @@ GSI_QTCORE_PUBLIC gsi::Class<QAbstractEventDispatcher> &qtdecl_QAbstractEventDis
 class QAbstractEventDispatcher_Adaptor : public QAbstractEventDispatcher, public qt_gsi::QtObjectBase
 {
 public:
-#if defined(_WIN32)
-  virtual bool registerEventNotifier(QWinEventNotifier *) { return false; }
-  virtual void unregisterEventNotifier(QWinEventNotifier *) { }
-#endif
 
   virtual ~QAbstractEventDispatcher_Adaptor();
 

src/gsiqt/qt6/QtCore5Compat/QtCore5Compat.pro

@@ -5,7 +5,7 @@ TARGET = klayout_QtCore5Compat
 
 include($$PWD/../../../lib.pri)
 
-DEFINES += MAKE_GSI_QTCORE_LIBRARY
+DEFINES += MAKE_GSI_QTCORE5COMPAT_LIBRARY
 
 # NOTE: db is required since some bridges to db are provided (i.e db::Polygon)
 INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$QTBASIC_INC

src/laybasic/laybasic/layFileDialog.cc

@@ -25,6 +25,9 @@
 #include <QApplication>
 #include <QDesktopServices>
 #include <QFileInfo>
+#if QT_VERSION>=0x050000
+#  include <QStandardPaths>
+#endif
 
 #include "layFileDialog.h"
 #include "tlInternational.h"

src/rba/rba/rbaConvert.h

@@ -25,10 +25,9 @@
 
 #ifdef HAVE_RUBY
 
-#include "rbaUtils.h"
-
 #include "gsiTypes.h"
 
+#include "rbaUtils.h"
 #include <ruby.h>
 
 namespace rba

src/rba/rba/rbaMarshal.h

@@ -25,9 +25,10 @@
 
 #ifdef HAVE_RUBY
 
+#include "gsiSerialisation.h"
+
 #include <ruby.h>
 
-#include "gsiSerialisation.h"
 #include "tlHeap.h"
 
 namespace rba

src/rba/rba/rbaUtils.h

@@ -25,9 +25,10 @@
 
 #ifdef HAVE_RUBY
 
-#include <ruby.h>
-
 #include "gsiInterpreter.h"
+#include "gsiSerialisation.h"
+
+#include <ruby.h>
 
 #include "tlScriptError.h"