WIP: build works again at least on Qt4.

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") +

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"

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
 }