fix build on eoan

This commit is contained in:
Marc Wäckerlin
2019-10-08 00:17:54 +02:00
parent 2133615a4c
commit 6d81df1678
16 changed files with 1283 additions and 387 deletions
+3 -1
View File
@@ -48,7 +48,8 @@ inline QString demangle(const char* mangled) {
return QString(mangled);
}
#endif
/* redefinition of class std::optional<_Tp> */
/*
namespace std {
template<typename T> class optional {
private:
@@ -87,6 +88,7 @@ namespace std {
}
};
}
*/
class Script;
class Command;
+4 -1
View File
@@ -11,6 +11,8 @@
#include <editor.hxx>
#include <commands.hxx>
#include <scriptfile.hxx>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#include <QMainWindow>
#include <QSettings>
#include <QWebFrame>
@@ -22,9 +24,10 @@
#include <QShortcut>
#include <QCompleter>
#include <ui_testgui.hxx>
#include <stdexcept>
#include <QNetworkReply>
#include <QEvent>
#pragma GCC diagnostic pop
#include <stdexcept>
#include <mrw/stdext.hxx>
class TestGUI: public QMainWindow, protected Ui::TestGUI {