WIP: build works again at least on Qt4.

2018-05-30 01:22:33 +02:00 · 2018-05-30 01:22:33 +02:00 · 3b144259fd
parent c30d52c801
commit 3b144259fd
17 changed files with 76 additions and 37 deletions
--- a/scripts/mkqtdecl_common/produce.rb
+++ b/scripts/mkqtdecl_common/produce.rb
@ -3019,8 +3019,8 @@ END
      extfile.puts("*/")
      extfile.puts("")

-      extfile.puts("#if !defined(HDR_gsiQtExternals)")
-      extfile.puts("#define HDR_gsiQtExternals")
+      extfile.puts("#if !defined(HDR_gsi#{modn}Externals)")
+      extfile.puts("#define HDR_gsi#{modn}Externals")
      extfile.puts("")

      extfile.puts("#include \"gsiClassBase.h\"")
--- a/src/gsiqt/qt4/QtCore/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtCore/gsiQtExternals.h
@ -27,8 +27,8 @@
  This file has been created automatically
 */

-#if !defined(HDR_gsiQtExternals)
-#define HDR_gsiQtExternals
+#if !defined(HDR_gsiQtCoreExternals)
+#define HDR_gsiQtCoreExternals

 #include "gsiClassBase.h"
 #include "gsiQtCoreCommon.h"
--- a/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtDesigner/gsiQtExternals.h
@ -27,8 +27,8 @@
  This file has been created automatically
 */

-#if !defined(HDR_gsiQtExternals)
-#define HDR_gsiQtExternals
+#if !defined(HDR_gsiQtDesignerExternals)
+#define HDR_gsiQtDesignerExternals

 #include "gsiClassBase.h"
 #include "gsiQtDesignerCommon.h"
--- a/src/gsiqt/qt4/QtGui/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtGui/gsiQtExternals.h
@ -27,8 +27,8 @@
  This file has been created automatically
 */

-#if !defined(HDR_gsiQtExternals)
-#define HDR_gsiQtExternals
+#if !defined(HDR_gsiQtGuiExternals)
+#define HDR_gsiQtGuiExternals

 #include "gsiClassBase.h"
 #include "gsiQtGuiCommon.h"
--- a/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtNetwork/gsiQtExternals.h
@ -27,8 +27,8 @@
  This file has been created automatically
 */

-#if !defined(HDR_gsiQtExternals)
-#define HDR_gsiQtExternals
+#if !defined(HDR_gsiQtNetworkExternals)
+#define HDR_gsiQtNetworkExternals

 #include "gsiClassBase.h"
 #include "gsiQtNetworkCommon.h"
--- a/src/gsiqt/qt4/QtSql/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtSql/gsiQtExternals.h
@ -27,8 +27,8 @@
  This file has been created automatically
 */

-#if !defined(HDR_gsiQtExternals)
-#define HDR_gsiQtExternals
+#if !defined(HDR_gsiQtSqlExternals)
+#define HDR_gsiQtSqlExternals

 #include "gsiClassBase.h"
 #include "gsiQtSqlCommon.h"
--- a/src/gsiqt/qt4/QtXml/gsiQtExternals.h
+++ b/src/gsiqt/qt4/QtXml/gsiQtExternals.h
@ -27,8 +27,8 @@
  This file has been created automatically
 */

-#if !defined(HDR_gsiQtExternals)
-#define HDR_gsiQtExternals
+#if !defined(HDR_gsiQtXmlExternals)
+#define HDR_gsiQtXmlExternals

 #include "gsiClassBase.h"
 #include "gsiQtXmlCommon.h"
--- a/src/gsiqt/qtbasic/gsiQtAllExternals.h
+++ b/src/gsiqt/qtbasic/gsiQtAllExternals.h
@ -0,0 +1,42 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
+#if !defined(HDR_gsiQtAllExternals_h)
+# define HDR_gsiQtAllExternals_h
+
+# if defined(HAVE_QT5)
+
+...
+
+# else
+
+#   include "../qt4/QtCore/gsiQtExternals.h"
+#   include "../qt4/QtGui/gsiQtExternals.h"
+#   include "../qt4/QtXml/gsiQtExternals.h"
+#   include "../qt4/QtSql/gsiQtExternals.h"
+#   include "../qt4/QtNetwork/gsiQtExternals.h"
+#   include "../qt4/QtDesigner/gsiQtExternals.h"
+
+# endif
+
+#endif
--- a/src/gsiqt/qtbasic/qtbasic.pro
+++ b/src/gsiqt/qtbasic/qtbasic.pro
@ -20,4 +20,5 @@ SOURCES += \

 HEADERS += \
  gsiQt.h \
-  gsiQtBasicCommon.h
+  gsiQtBasicCommon.h \
+    gsiQtAllExternals.h
--- a/src/lay/lay/gsiDeclLayApplication.cc
+++ b/src/lay/lay/gsiDeclLayApplication.cc
@ -20,12 +20,11 @@

 */

-
 #include "layApplication.h"
 #include "layMainWindow.h"
 #include "laySignalHandler.h"
 #include "gsiDecl.h"
-#include "gsiQtExternals.h"
+#include "gsiQtAllExternals.h"
 #include "tlArch.h"

 namespace gsi
--- a/src/lay/lay/gsiDeclLayHelpDialog.cc
+++ b/src/lay/lay/gsiDeclLayHelpDialog.cc
@ -26,7 +26,7 @@
 #include "layMainWindow.h"
 #include "laybasicCommon.h"
 #include "gsiDecl.h"
-#include "gsiQtExternals.h"
+#include "gsiQtAllExternals.h"

 namespace tl
 {
@ -53,7 +53,7 @@ lay::HelpDialog *new_help_dialog_with_parent (QWidget *parent, bool modal)
  return new lay::HelpDialog (parent, modal);
 }

-Class<lay::HelpDialog> decl_HelpDialog (QT_EXTERNAL_BASE (QDialog) "HelpDialog",
+Class<lay::HelpDialog> decl_HelpDialog (QT_EXTERNAL_BASE (QDialog) "lay", "HelpDialog",
  method ("new", new_help_dialog, 
    "@brief Creates a new help dialog\n"
    "@args modal\n"
--- a/src/lay/lay/gsiDeclLayMainWindow.cc
+++ b/src/lay/lay/gsiDeclLayMainWindow.cc
@ -22,7 +22,7 @@


 #include "gsiDecl.h"
-#include "gsiQtExternals.h"
+#include "gsiQtAllExternals.h"
 #include "gsiSignals.h"
 #include "layMainWindow.h"

@ -38,7 +38,7 @@ void enable_edits (lay::MainWindow * /*main_window*/, bool enable)
  }
 }

-Class<lay::MainWindow> decl_MainWindow (QT_EXTERNAL_BASE (QMainWindow) "MainWindow", 
+Class<lay::MainWindow> decl_MainWindow (QT_EXTERNAL_BASE (QMainWindow) "lay", "MainWindow",

  //  QMainWindow interface
  gsi::method ("menu", &lay::MainWindow::menu,
--- a/src/lay/lay/lay.pro
+++ b/src/lay/lay/lay.pro
@ -188,11 +188,11 @@ win32 {
 INCLUDEPATH += $$DESTDIR/laybasic/laybasic
 DEPENDPATH += $$DESTDIR/laybasic/laybasic

-INCLUDEPATH += $$GSIQT_INC
-DEPENDPATH += $$GSIQT_INC
+INCLUDEPATH += $$QTBASIC_INC
+DEPENDPATH += $$QTBASIC_INC

 equals(HAVE_QTBINDINGS, "1") {
-  LIBS += -lklayout_gsiqt
+  LIBS += -lklayout_qtbasic -lklayout_QtGui
 }

 INCLUDEPATH += $$RBA_INC
--- a/src/laybasic/laybasic/gsiDeclLayDialogs.cc
+++ b/src/laybasic/laybasic/gsiDeclLayDialogs.cc
@ -20,10 +20,9 @@

 */

-
 #include "gsiDecl.h"
 #include "gsiDeclBasic.h"
-#include "gsiQtExternals.h"
+#include "gsiQtAllExternals.h"

 #include "layBrowserDialog.h"
 #include "layBrowserPanel.h"
@ -267,7 +266,7 @@ BrowserDialog_Stub *new_browser_dialog_static_and_parent (QWidget *parent, const
 }
 #endif

-Class<BrowserDialog_Stub> decl_BrowserDialog (QT_EXTERNAL_BASE (QDialog) "BrowserDialog",
+Class<BrowserDialog_Stub> decl_BrowserDialog (QT_EXTERNAL_BASE (QDialog) "lay", "BrowserDialog",
  gsi::constructor ("new", &new_browser_dialog_with_source,
    "@brief Creates a HTML browser window with a \\BrowserSource as the source of HTML code\n"
    "@args source\n"
@ -453,7 +452,7 @@ lay::BrowserPanel *new_browser_panel (QWidget *parent)
  return new lay::BrowserPanel (parent);
 }

-Class<lay::BrowserPanel> decl_BrowserPanel (QT_EXTERNAL_BASE (QWidget) "BrowserPanel",
+Class<lay::BrowserPanel> decl_BrowserPanel (QT_EXTERNAL_BASE (QWidget) "lay", "BrowserPanel",
  gsi::constructor ("new", &new_browser_panel_with_source,
    "@brief Creates a HTML browser widget with a \\BrowserSource as the source of HTML code\n"
    "@args parent, source\n"
@ -1165,7 +1164,7 @@ static int warning (const std::string &title, const std::string &text, int butto

 struct MessageBox { };

-Class<MessageBox> decl_MessageBox (QT_EXTERNAL_BASE (QMainWindow) "MessageBox",
+Class<MessageBox> decl_MessageBox (QT_EXTERNAL_BASE (QMainWindow) "lay", "MessageBox",
  gsi::method ("Ok|#b_ok",               &b_ok,              "@brief A constant describing the 'Ok' button") +
  gsi::method ("Cancel|#b_cancel",       &b_cancel,          "@brief A constant describing the 'Cancel' button") +
  gsi::method ("Yes|#b_yes",             &b_yes,             "@brief A constant describing the 'Yes' button") +
--- a/src/laybasic/laybasic/gsiDeclLayLayoutView.cc
+++ b/src/laybasic/laybasic/gsiDeclLayLayoutView.cc
@ -367,7 +367,7 @@ static lay::LayoutView *new_view ()
  return new lay::LayoutView (0, false, 0);
 }

-Class<lay::LayoutView> decl_LayoutView ("LayoutView",
+Class<lay::LayoutView> decl_LayoutView ("lay", "LayoutView",
  gsi::constructor ("new", &new_view,
    "@brief Creates a standalone view\n"
    "\n"
@ -1766,7 +1766,7 @@ static void cv_show_all_cells (lay::CellViewRef *cv)
  }
 }

-Class<lay::CellViewRef> decl_CellView ("CellView",
+Class<lay::CellViewRef> decl_CellView ("lay", "CellView",
  method ("==", static_cast<bool (lay::CellViewRef::*) (const lay::CellViewRef &) const> (&lay::CellViewRef::operator==),
    "@brief Equality: indicates whether the cellviews refer to the same one\n"
    "@args other\n"
--- a/src/laybasic/laybasic/laybasic.pro
+++ b/src/laybasic/laybasic/laybasic.pro
@ -277,10 +277,10 @@ INCLUDEPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
 DEPENDPATH += $$TL_INC $$GSI_INC $$DB_INC $$RDB_INC
 LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb

-INCLUDEPATH += $$GSIQT_INC
-DEPENDPATH += $$GSIQT_INC
+INCLUDEPATH += $$QTBASIC_INC
+DEPENDPATH += $$QTBASIC_INC

 equals(HAVE_QTBINDINGS, "1") {
-  LIBS += -lklayout_gsiqt
+  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
 }

--- a/src/with_all_libs.pri
+++ b/src/with_all_libs.pri
@ -10,9 +10,7 @@ INCLUDEPATH += $$DESTDIR/laybasic $$DESTDIR/lay $$DESTDIR/ext
 DEPENDPATH += $$DESTDIR/laybasic $$DESTDIR/lay $$DESTDIR/ext

 equals(HAVE_QTBINDINGS, "1") {
-  INCLUDEPATH += $$PWD/gsiqt
-  DEPENDPATH += $$PWD/gsiqt
-  LIBS += -lklayout_gsiqt
+  LIBS += -lklayout_qtbasic -lklayout_QtGui -lklayout_QtCore
 }

 equals(HAVE_RUBY, "1") {