diff --git a/README-1.md b/README-1.md
index f04dbb6..765426f 100644
--- a/README-1.md
+++ b/README-1.md
@@ -152,6 +152,13 @@ If `make` is stuck in an infinite loop of creating the `Makefile`, just
remove the line `include(windows.pri)` from your `*.pro` file, setting
eventually needed paths in your `~/.profile` instead.
+*SailfishOS*
+
+Run this before running `qmake`:
+```
+ $ export SAILFISH=sailfish
+```
+
### 1) Build Lisp lib
```
diff --git a/src/ecl_fun.cpp b/src/ecl_fun.cpp
index 858398e..435aed0 100644
--- a/src/ecl_fun.cpp
+++ b/src/ecl_fun.cpp
@@ -2757,6 +2757,9 @@ cl_object qload_ui(cl_object l_ui) {
/// Calls a custom QUiLoader::load() function, loading a UI file created by Qt Designer. Returns the top level widget of the UI.
Use qfind-child to retrieve the child widgets.
/// (qload-ui "my-fancy-gui.ui")
ecl_process_env()->nvalues = 1;
+#ifdef OS_SAILFISH
+ error_msg("QLOAD-UI not available on Sailfish", LIST1(l_ui));
+#else
QString ui(toQString(l_ui));
if(!ui.isEmpty()) {
if(!ui.endsWith(".ui")) {
@@ -2772,6 +2775,7 @@ cl_object qload_ui(cl_object l_ui) {
w->property("EQL.unique").toUInt());
return l_ret; }}}
error_msg("QLOAD-UI", LIST1(l_ui));
+#endif
return ECL_NIL; }
cl_object qfind_child(cl_object l_obj, cl_object l_name) {
diff --git a/src/ecl_fun.h b/src/ecl_fun.h
index 7f859a3..87b7afc 100644
--- a/src/ecl_fun.h
+++ b/src/ecl_fun.h
@@ -8,11 +8,14 @@
#include
#include "eql5/eql_global.h"
#include
-#include
#include
#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
#define QSLOT(x) "1"#x
diff --git a/src/eql_exe.pro b/src/eql_exe.pro
index 7c448a9..e3bdbab 100644
--- a/src/eql_exe.pro
+++ b/src/eql_exe.pro
@@ -1,4 +1,4 @@
-QT += widgets printsupport uitools
+QT += widgets
TEMPLATE = app
CONFIG += no_keywords release
INCLUDEPATH += /usr/local/include
diff --git a/src/eql_lib.pro b/src/eql_lib.pro
index ce7a2cd..287d1e0 100644
--- a/src/eql_lib.pro
+++ b/src/eql_lib.pro
@@ -1,6 +1,6 @@
QT += widgets printsupport uitools qml
TEMPLATE = lib
-CONFIG += dll no_keywords release
+CONFIG += dll no_keywords release $$(SAILFISH)
DEFINES += EQL_LIBRARY
INCLUDEPATH += /usr/local/include
LIBS += -lecl -L. -lini_eql5 -L/usr/local/lib
@@ -42,6 +42,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/_lobjects.h \
gen/_main_q_classes.h \
gen/_main_n_classes.h \
diff --git a/src/gen/_lobjects.cpp b/src/gen/_lobjects.cpp
index c72f6ba..cdd1482 100644
--- a/src/gen/_lobjects.cpp
+++ b/src/gen/_lobjects.cpp
@@ -85,7 +85,9 @@ NumList LAbstractItemDelegate::overrideIds = NumList() << 46 << 47 << 48 << 49 <
NumList LAbstractItemModel::overrideIds = NumList() << 55 << 56 << 57 << 58 << 59 << 60 << 61 << 62 << 63 << 64 << 65 << 66 << 67 << 68 << 69 << 70 << 71 << 72 << 73 << 74 << 75 << 76 << 77 << 78 << 79 << 80 << 81 << 82 << 83 << 84;
NumList LAbstractItemView::overrideIds = NumList() << 85 << 86 << 87 << 88 << 89 << 90 << 91 << 92 << 93 << 94 << 95 << 96 << 97 << 98 << 99 << 100 << 101 << 102 << 103 << 23 << 29 << 30 << 31 << 32 << 13 << 34 << 14 << 36 << 15 << 38 << 17 << 18 << 19 << 40 << 8 << 104 << 105;
NumList LAbstractListModel::overrideIds = NumList() << 60 << 62 << 65 << 80;
+#ifndef OS_SAILFISH
NumList LAbstractPrintDialog::overrideIds = NumList() << 108;
+#endif
NumList LAbstractProxyModel::overrideIds = NumList() << 110 << 111 << 112 << 113 << 114 << 55 << 56 << 57 << 59 << 60 << 61 << 62 << 63 << 64 << 69 << 70 << 115 << 78 << 79 << 80 << 81 << 82 << 116 << 83 << 84;
NumList LAbstractScrollArea::overrideIds = NumList() << 106 << 107 << 104 << 105 << 24 << 25 << 28 << 29 << 30 << 31 << 32 << 15 << 38 << 17 << 18 << 19 << 20 << 40 << 43;
NumList LAbstractSlider::overrideIds = NumList() << 117 << 12 << 15 << 8 << 43;
@@ -184,7 +186,9 @@ NumList LOpenGLShader::overrideIds = NumList();
NumList LOpenGLShaderProgram::overrideIds = NumList() << 303;
NumList LOpenGLWidget::overrideIds = NumList() << 304 << 305 << 306 << 20 << 40;
NumList LOpenGLWindow::overrideIds = NumList() << 304 << 305 << 307 << 308 << 306 << 20 << 40;
+#ifndef OS_SAILFISH
NumList LPageSetupDialog::overrideIds = NumList() << 185 << 108 << 109;
+#endif
NumList LPaintDeviceWindow::overrideIds = NumList() << 20;
NumList LPanGesture::overrideIds = NumList();
NumList LParallelAnimationGroup::overrideIds = NumList() << 1 << 2 << 3 << 4;
@@ -194,10 +198,12 @@ NumList LPinchGesture::overrideIds = NumList();
NumList LPlainTextDocumentLayout::overrideIds = NumList() << 149 << 150 << 151 << 152 << 153 << 154 << 155;
NumList LPlainTextEdit::overrideIds = NumList() << 315 << 316 << 317 << 318 << 23 << 12 << 28 << 29 << 30 << 31 << 32 << 13 << 34 << 14 << 36 << 15 << 16 << 38 << 17 << 18 << 19 << 20 << 40 << 107 << 41 << 43;
NumList LPluginLoader::overrideIds = NumList();
+#ifndef OS_SAILFISH
NumList LPrintDialog::overrideIds = NumList() << 185 << 108 << 109;
NumList LPrintPreviewDialog::overrideIds = NumList() << 185 << 109;
NumList LPrintPreviewWidget::overrideIds = NumList() << 109;
NumList LProcess::overrideIds = NumList() << 319 << 127 << 128 << 129 << 130 << 131 << 132 << 138 << 133 << 134 << 135 << 137;
+#endif
NumList LProgressBar::overrideIds = NumList() << 320 << 24 << 25 << 20;
NumList LProgressDialog::overrideIds = NumList() << 25 << 12 << 27 << 40 << 41;
NumList LPropertyAnimation::overrideIds = NumList() << 321 << 4;
@@ -387,8 +393,10 @@ NumList LPersistentModelIndex::overrideIds = NumList();
NumList LPicture::overrideIds = NumList() << 529;
NumList LPixmap::overrideIds = NumList();
NumList LPixmapCache::overrideIds = NumList();
+#ifndef OS_SAILFISH
NumList LPrinter::overrideIds = NumList() << 314;
NumList LPrinterInfo::overrideIds = NumList();
+#endif
NumList LProcessEnvironment::overrideIds = NumList();
NumList LQuaternion::overrideIds = NumList();
NumList LRadialGradient::overrideIds = NumList();
@@ -473,7 +481,9 @@ void LObjects::ini(EQL* e) {
Q[3] = new Q4;
Q[4] = new Q5;
Q[5] = new Q6;
+#ifndef OS_SAILFISH
Q[7] = new Q8;
+#endif
Q[8] = new Q9;
Q[9] = new Q10;
Q[10] = new Q11;
@@ -579,7 +589,9 @@ void LObjects::ini(EQL* e) {
Q[145] = new Q146;
Q[146] = new Q147;
Q[147] = new Q148;
+#ifndef OS_SAILFISH
Q[148] = new Q149;
+#endif
Q[149] = new Q150;
Q[150] = new Q151;
Q[151] = new Q152;
@@ -589,10 +601,12 @@ void LObjects::ini(EQL* e) {
Q[155] = new Q156;
Q[156] = new Q157;
Q[157] = new Q158;
+#ifndef OS_SAILFISH
Q[158] = new Q159;
Q[159] = new Q160;
Q[160] = new Q161;
Q[161] = new Q162;
+#endif
Q[162] = new Q163;
Q[163] = new Q164;
Q[164] = new Q165;
@@ -789,8 +803,10 @@ void LObjects::ini(EQL* e) {
N[147] = new N148;
N[148] = new N149;
N[149] = new N150;
+#ifndef OS_SAILFISH
N[150] = new N151;
N[151] = new N152;
+#endif
N[152] = new N153;
N[163] = new N164;
N[165] = new N166;
@@ -2679,7 +2695,9 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
case 4: m = &QAbstractItemModel::staticMetaObject; break;
case 5: m = &QAbstractItemView::staticMetaObject; break;
case 6: m = &QAbstractListModel::staticMetaObject; break;
+#ifndef OS_SAILFISH
case 8: m = &QAbstractPrintDialog::staticMetaObject; break;
+#endif
case 9: m = &QAbstractProxyModel::staticMetaObject; break;
case 10: m = &QAbstractScrollArea::staticMetaObject; break;
case 11: m = &QAbstractSlider::staticMetaObject; break;
@@ -2785,7 +2803,9 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
case 146: m = &QOpenGLShaderProgram::staticMetaObject; break;
case 147: m = &QOpenGLWidget::staticMetaObject; break;
case 148: m = &QOpenGLWindow::staticMetaObject; break;
+#ifndef OS_SAILFISH
case 149: m = &QPageSetupDialog::staticMetaObject; break;
+#endif
case 150: m = &QPaintDeviceWindow::staticMetaObject; break;
case 151: m = &QPanGesture::staticMetaObject; break;
case 152: m = &QParallelAnimationGroup::staticMetaObject; break;
@@ -2795,10 +2815,12 @@ const QMetaObject* LObjects::staticMetaObject(const QByteArray& name, int n) {
case 156: m = &QPlainTextDocumentLayout::staticMetaObject; break;
case 157: m = &QPlainTextEdit::staticMetaObject; break;
case 158: m = &QPluginLoader::staticMetaObject; break;
+#ifndef OS_SAILFISH
case 159: m = &QPrintDialog::staticMetaObject; break;
case 160: m = &QPrintPreviewDialog::staticMetaObject; break;
case 161: m = &QPrintPreviewWidget::staticMetaObject; break;
case 162: m = &QProcess::staticMetaObject; break;
+#endif
case 163: m = &QProgressBar::staticMetaObject; break;
case 164: m = &QProgressDialog::staticMetaObject; break;
case 165: m = &QPropertyAnimation::staticMetaObject; break;
@@ -3105,8 +3127,10 @@ void LObjects::deleteNObject(int n, void* p, int gc) {
case 148: if(gc) delete (QPicture*)p; else delete (LPicture*)p; break;
case 149: if(gc) delete (QPixmap*)p; else delete (LPixmap*)p; break;
case 150: if(gc) delete (QPixmapCache*)p; else delete (LPixmapCache*)p; break;
+#ifndef OS_SAILFISH
case 151: if(gc) delete (QPrinter*)p; else delete (LPrinter*)p; break;
case 152: if(gc) delete (QPrinterInfo*)p; else delete (LPrinterInfo*)p; break;
+#endif
case 153: if(gc) delete (QProcessEnvironment*)p; else delete (LProcessEnvironment*)p; break;
case 164: if(gc) delete (QQuaternion*)p; else delete (LQuaternion*)p; break;
case 166: if(gc) delete (QRadialGradient*)p; else delete (LRadialGradient*)p; break;
@@ -3400,7 +3424,9 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
case 4: ids = LAbstractItemModel::overrideIds; break;
case 5: ids = LAbstractItemView::overrideIds; break;
case 6: ids = LAbstractListModel::overrideIds; break;
+#ifndef OS_SAILFISH
case 8: ids = LAbstractPrintDialog::overrideIds; break;
+#endif
case 9: ids = LAbstractProxyModel::overrideIds; break;
case 10: ids = LAbstractScrollArea::overrideIds; break;
case 11: ids = LAbstractSlider::overrideIds; break;
@@ -3499,7 +3525,9 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
case 146: ids = LOpenGLShaderProgram::overrideIds; break;
case 147: ids = LOpenGLWidget::overrideIds; break;
case 148: ids = LOpenGLWindow::overrideIds; break;
+#ifndef OS_SAILFISH
case 149: ids = LPageSetupDialog::overrideIds; break;
+#endif
case 150: ids = LPaintDeviceWindow::overrideIds; break;
case 151: ids = LPanGesture::overrideIds; break;
case 152: ids = LParallelAnimationGroup::overrideIds; break;
@@ -3509,10 +3537,12 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
case 156: ids = LPlainTextDocumentLayout::overrideIds; break;
case 157: ids = LPlainTextEdit::overrideIds; break;
case 158: ids = LPluginLoader::overrideIds; break;
+#ifndef OS_SAILFISH
case 159: ids = LPrintDialog::overrideIds; break;
case 160: ids = LPrintPreviewDialog::overrideIds; break;
case 161: ids = LPrintPreviewWidget::overrideIds; break;
case 162: ids = LProcess::overrideIds; break;
+#endif
case 163: ids = LProgressBar::overrideIds; break;
case 164: ids = LProgressDialog::overrideIds; break;
case 165: ids = LPropertyAnimation::overrideIds; break;
@@ -3831,8 +3861,10 @@ StrList LObjects::overrideFunctions(const QByteArray& name) {
case 148: ids = LPicture::overrideIds; break;
case 149: ids = LPixmap::overrideIds; break;
case 150: ids = LPixmapCache::overrideIds; break;
+#ifndef OS_SAILFISH
case 151: ids = LPrinter::overrideIds; break;
case 152: ids = LPrinterInfo::overrideIds; break;
+#endif
case 153: ids = LProcessEnvironment::overrideIds; break;
case 164: ids = LQuaternion::overrideIds; break;
case 166: ids = LRadialGradient::overrideIds; break;
diff --git a/src/gen/_lobjects.h b/src/gen/_lobjects.h
index f6bbd05..d68e576 100644
--- a/src/gen/_lobjects.h
+++ b/src/gen/_lobjects.h
@@ -7,7 +7,10 @@
#include "../eql5/eql_global.h"
#include "../ecl_fun.h"
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
Q_DECLARE_METATYPE(QList)
Q_DECLARE_METATYPE(QList)
diff --git a/src/gen/_main_n_classes.h b/src/gen/_main_n_classes.h
index d2dcba9..cbcc008 100644
--- a/src/gen/_main_n_classes.h
+++ b/src/gen/_main_n_classes.h
@@ -6,7 +6,10 @@
#include "../ecl_fun.h"
#include "_lobjects.h"
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
@@ -1475,7 +1478,9 @@ public:
LPainter(uint u, QPdfWriter* x1) : QPainter(x1), unique(u) {}
LPainter(uint u, QPicture* x1) : QPainter(x1), unique(u) {}
LPainter(uint u, QPixmap* x1) : QPainter(x1), unique(u) {}
+#ifndef OS_SAILFISH
LPainter(uint u, QPrinter* x1) : QPainter(x1), unique(u) {}
+#endif
LPainter(uint u, QWidget* x1) : QPainter(x1), unique(u) {}
LPainter(uint u) : unique(u) {}
@@ -1577,6 +1582,7 @@ public:
uint unique;
};
+#ifndef OS_SAILFISH
class LPrinter : public QPrinter {
friend class N151;
public:
@@ -1589,7 +1595,9 @@ public:
void setPageSize(PageSize x1) { quint64 id = LObjects::override_id(unique, 530); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 530, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrinter::setPageSize(x1); }}
void setPageSizeMM(const QSizeF& x1) { quint64 id = LObjects::override_id(unique, 531); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 531, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrinter::setPageSizeMM(x1); }}
};
+#endif
+#ifndef OS_SAILFISH
class LPrinterInfo : public QPrinterInfo {
friend class N152;
public:
@@ -1597,6 +1605,7 @@ public:
static NumList overrideIds;
uint unique;
};
+#endif
class LProcessEnvironment : public QProcessEnvironment {
friend class N153;
diff --git a/src/gen/_main_n_methods.h b/src/gen/_main_n_methods.h
index adaede6..1aaab89 100644
--- a/src/gen/_main_n_methods.h
+++ b/src/gen/_main_n_methods.h
@@ -5,10 +5,13 @@
#include "_main_n_classes.h"
#include
-#include
#include "../extras.h"
#include "../eql5/eql_global.h"
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class EQL_EXPORT N2 : public QObject { // QAccessible
@@ -1694,8 +1697,10 @@ public:
Q_INVOKABLE bool Mbegin(QPainter* o, QPicture* x1) { return o->begin(x1); }
Q_INVOKABLE void* C(uint u, QPixmap* x1) { return new LPainter(u, x1); }
Q_INVOKABLE bool Mbegin(QPainter* o, QPixmap* x1) { return o->begin(x1); }
+#ifndef OS_SAILFISH
Q_INVOKABLE void* C(uint u, QPrinter* x1) { return new LPainter(u, x1); }
Q_INVOKABLE bool Mbegin(QPainter* o, QPrinter* x1) { return o->begin(x1); }
+#endif
Q_INVOKABLE void* C(uint u, QWidget* x1) { return new LPainter(u, x1); }
Q_INVOKABLE bool Mbegin(QPainter* o, QWidget* x1) { return o->begin(x1); }
Q_INVOKABLE void* C(uint u) { return new LPainter(u); }
@@ -2080,6 +2085,7 @@ public:
Q_INVOKABLE void SsetCacheLimit(int x1) { QPixmapCache::setCacheLimit(x1); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT N152 : public QObject { // QPrinterInfo
Q_OBJECT
public:
@@ -2102,6 +2108,7 @@ public:
Q_INVOKABLE QStringList SavailablePrinterNames() { return QPrinterInfo::availablePrinterNames(); }
Q_INVOKABLE QString SdefaultPrinterName() { return QPrinterInfo::defaultPrinterName(); }
};
+#endif
class EQL_EXPORT N153 : public QObject { // QProcessEnvironment
Q_OBJECT
@@ -4305,6 +4312,7 @@ public:
Q_INVOKABLE QMatrix StrueMatrix(const QMatrix& x1, int x2, int x3) { return QPixmap::trueMatrix(x1, x2, x3); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT N151 : public N139 { // QPrinter
Q_OBJECT
public:
@@ -4359,6 +4367,7 @@ public:
Q_INVOKABLE int MtoPage(QPrinter* o) const { return o->toPage(); }
Q_INVOKABLE bool MnewPage(QPrinter* o) { return o->newPage(); }
};
+#endif
class EQL_EXPORT N166 : public N62 { // QRadialGradient
Q_OBJECT
diff --git a/src/gen/_main_q_classes.h b/src/gen/_main_q_classes.h
index fcc25f4..892938c 100644
--- a/src/gen/_main_q_classes.h
+++ b/src/gen/_main_q_classes.h
@@ -6,7 +6,10 @@
#include "../ecl_fun.h"
#include "_lobjects.h"
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
@@ -264,6 +267,7 @@ public:
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QAbstractListModel::timerEvent(x1); }}
};
+#ifndef OS_SAILFISH
class LAbstractPrintDialog : public QAbstractPrintDialog {
Q_OBJECT
friend class Q8;
@@ -314,6 +318,7 @@ public:
void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QAbstractPrintDialog::customEvent(x1); }}
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QAbstractPrintDialog::timerEvent(x1); }}
};
+#endif
class LAbstractProxyModel : public QAbstractProxyModel {
Q_OBJECT
@@ -3825,6 +3830,7 @@ public:
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QOpenGLWindow::timerEvent(x1); }}
};
+#ifndef OS_SAILFISH
class LPageSetupDialog : public QPageSetupDialog {
Q_OBJECT
friend class Q149;
@@ -3877,6 +3883,7 @@ public:
void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPageSetupDialog::customEvent(x1); }}
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPageSetupDialog::timerEvent(x1); }}
};
+#endif
class LPaintDeviceWindow : public QPaintDeviceWindow {
Q_OBJECT
@@ -4095,6 +4102,7 @@ public:
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPluginLoader::timerEvent(x1); }}
};
+#ifndef OS_SAILFISH
class LPrintDialog : public QPrintDialog {
Q_OBJECT
friend class Q159;
@@ -4147,7 +4155,9 @@ public:
void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrintDialog::customEvent(x1); }}
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrintDialog::timerEvent(x1); }}
};
+#endif
+#ifndef OS_SAILFISH
class LPrintPreviewDialog : public QPrintPreviewDialog {
Q_OBJECT
friend class Q160;
@@ -4199,7 +4209,9 @@ public:
void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrintPreviewDialog::customEvent(x1); }}
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrintPreviewDialog::timerEvent(x1); }}
};
+#endif
+#ifndef OS_SAILFISH
class LPrintPreviewWidget : public QPrintPreviewWidget {
Q_OBJECT
friend class Q161;
@@ -4250,7 +4262,9 @@ public:
void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrintPreviewWidget::customEvent(x1); }}
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QPrintPreviewWidget::timerEvent(x1); }}
};
+#endif
+#ifndef OS_SAILFISH
class LProcess : public QProcess {
Q_OBJECT
friend class Q162;
@@ -4282,6 +4296,7 @@ public:
void customEvent(QEvent* x1) { quint64 id = LObjects::override_id(unique, 7); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 7, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProcess::customEvent(x1); }}
void timerEvent(QTimerEvent* x1) { quint64 id = LObjects::override_id(unique, 8); void* fun = LObjects::overrideFun(id); if(fun && (LObjects::calling != id)) { const void* args[] = { &x1 }; callOverrideFun(fun, 8, args, id); } if(!fun || LObjects::call_default || (LObjects::calling == id)) { QProcess::timerEvent(x1); }}
};
+#endif
class LProgressBar : public QProgressBar {
Q_OBJECT
diff --git a/src/gen/_main_q_methods.h b/src/gen/_main_q_methods.h
index 868273e..fd7ba78 100644
--- a/src/gen/_main_q_methods.h
+++ b/src/gen/_main_q_methods.h
@@ -5,10 +5,13 @@
#include "_main_q_classes.h"
#include
-#include
#include "../extras.h"
#include "../eql5/eql_global.h"
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class EQL_EXPORT Q142 : public QObject { // QObject
@@ -1436,6 +1439,7 @@ public:
Q_INVOKABLE QVector SstaticPlugins() { return QPluginLoader::staticPlugins(); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT Q162 : public Q105 { // QProcess
Q_OBJECT
public:
@@ -1489,6 +1493,7 @@ public:
Q_INVOKABLE bool SstartDetached(const QString& x1) { return QProcess::startDetached(x1); }
Q_INVOKABLE QStringList SsystemEnvironment() { return QProcess::systemEnvironment(); }
};
+#endif
class EQL_EXPORT Q195 : public Q142 { // QScreen
Q_OBJECT
@@ -3803,6 +3808,7 @@ public:
Q_INVOKABLE int MupdateBehavior(QOpenGLWidget* o) const { return o->updateBehavior(); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT Q149 : public Q49 { // QPageSetupDialog
Q_OBJECT
public:
@@ -3814,6 +3820,7 @@ public:
Q_INVOKABLE int Mexec(QPageSetupDialog* o) { return o->exec(); }
Q_INVOKABLE void MsetVisible(QPageSetupDialog* o, bool x1) { o->setVisible(x1); }
};
+#endif
class EQL_EXPORT Q150 : public Q281 { // QPaintDeviceWindow
Q_OBJECT
@@ -3822,6 +3829,7 @@ public:
Q_INVOKABLE void Mupdate(QPaintDeviceWindow* o, const QRegion& x1) { o->update(x1); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT Q160 : public Q49 { // QPrintPreviewDialog
Q_OBJECT
public:
@@ -3832,7 +3840,9 @@ public:
Q_INVOKABLE void Mdone(QPrintPreviewDialog* o, int x1) { o->done(x1); }
Q_INVOKABLE void MsetVisible(QPrintPreviewDialog* o, bool x1) { o->setVisible(x1); }
};
+#endif
+#ifndef OS_SAILFISH
class EQL_EXPORT Q161 : public Q279 { // QPrintPreviewWidget
Q_OBJECT
public:
@@ -3846,6 +3856,7 @@ public:
Q_INVOKABLE int MzoomMode(QPrintPreviewWidget* o) const { return o->zoomMode(); }
Q_INVOKABLE void MsetVisible(QPrintPreviewWidget* o, bool x1) { o->setVisible(x1); }
};
+#endif
class EQL_EXPORT Q163 : public Q279 { // QProgressBar
Q_OBJECT
@@ -4431,6 +4442,7 @@ public:
Q_INVOKABLE QSize MsizeHint(QWizard* o) const { return o->sizeHint(); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT Q8 : public Q49 { // QAbstractPrintDialog
Q_OBJECT
public:
@@ -4447,6 +4459,7 @@ public:
Q_INVOKABLE int MtoPage(QAbstractPrintDialog* o) const { return o->toPage(); }
Q_INVOKABLE int Mexec(QAbstractPrintDialog* o) { return o->exec(); }
};
+#endif
class EQL_EXPORT Q10 : public Q70 { // QAbstractScrollArea
Q_OBJECT
@@ -4742,6 +4755,7 @@ public:
Q_INVOKABLE QVariant MinputMethodQuery(QPlainTextEdit* o, Qt::InputMethodQuery x1) const { return o->inputMethodQuery(x1); }
};
+#ifndef OS_SAILFISH
class EQL_EXPORT Q159 : public Q8 { // QPrintDialog
Q_OBJECT
public:
@@ -4757,6 +4771,7 @@ public:
Q_INVOKABLE int Mexec(QPrintDialog* o) { return o->exec(); }
Q_INVOKABLE void MsetVisible(QPrintDialog* o, bool x1) { o->setVisible(x1); }
};
+#endif
class EQL_EXPORT Q196 : public Q10 { // QScrollArea
Q_OBJECT
diff --git a/src/gen/help/_n_classes.h b/src/gen/help/_n_classes.h
index 959fac9..12357fa 100644
--- a/src/gen/help/_n_classes.h
+++ b/src/gen/help/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/help/_n_methods.h b/src/gen/help/_n_methods.h
index 4d1c0db..8a85c4c 100644
--- a/src/gen/help/_n_methods.h
+++ b/src/gen/help/_n_methods.h
@@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N86 : public QObject { // QHelpContentItem
diff --git a/src/gen/help/_q_classes.h b/src/gen/help/_q_classes.h
index a3a9728..00d0663 100644
--- a/src/gen/help/_q_classes.h
+++ b/src/gen/help/_q_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/help/_q_methods.h b/src/gen/help/_q_methods.h
index 0229e60..4d7c349 100644
--- a/src/gen/help/_q_methods.h
+++ b/src/gen/help/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q95 : public Q4 { // QHelpContentModel
diff --git a/src/gen/multimedia/_n_classes.h b/src/gen/multimedia/_n_classes.h
index a7e3e4f..ad83762 100644
--- a/src/gen/multimedia/_n_classes.h
+++ b/src/gen/multimedia/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/multimedia/_n_methods.h b/src/gen/multimedia/_n_methods.h
index e9c9050..c8f470e 100644
--- a/src/gen/multimedia/_n_methods.h
+++ b/src/gen/multimedia/_n_methods.h
@@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N18 : public QObject { // QAudioDeviceInfo
diff --git a/src/gen/multimedia/_q_classes.h b/src/gen/multimedia/_q_classes.h
index 52b2aeb..e2c4f8c 100644
--- a/src/gen/multimedia/_q_classes.h
+++ b/src/gen/multimedia/_q_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/multimedia/_q_methods.h b/src/gen/multimedia/_q_methods.h
index fc55d97..5563c75 100644
--- a/src/gen/multimedia/_q_methods.h
+++ b/src/gen/multimedia/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q18 : public Q142 { // QAbstractVideoSurface
diff --git a/src/gen/network/_n_classes.h b/src/gen/network/_n_classes.h
index 0009824..e5cfa90 100644
--- a/src/gen/network/_n_classes.h
+++ b/src/gen/network/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/network/_n_methods.h b/src/gen/network/_n_methods.h
index 621610a..957f7b1 100644
--- a/src/gen/network/_n_methods.h
+++ b/src/gen/network/_n_methods.h
@@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N21 : public QObject { // QAuthenticator
diff --git a/src/gen/network/_q_classes.h b/src/gen/network/_q_classes.h
index 6e57ffb..6e242ad 100644
--- a/src/gen/network/_q_classes.h
+++ b/src/gen/network/_q_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/network/_q_methods.h b/src/gen/network/_q_methods.h
index 304782d..b8f82a4 100644
--- a/src/gen/network/_q_methods.h
+++ b/src/gen/network/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q7 : public Q142 { // QAbstractNetworkCache
diff --git a/src/gen/quick/_n_classes.h b/src/gen/quick/_n_classes.h
index be76446..b9bc7f8 100644
--- a/src/gen/quick/_n_classes.h
+++ b/src/gen/quick/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/quick/_q_classes.h b/src/gen/quick/_q_classes.h
index fe2cb98..9f2796f 100644
--- a/src/gen/quick/_q_classes.h
+++ b/src/gen/quick/_q_classes.h
@@ -9,7 +9,10 @@
#include
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/sql/_n_classes.h b/src/gen/sql/_n_classes.h
index b20c905..7e78f12 100644
--- a/src/gen/sql/_n_classes.h
+++ b/src/gen/sql/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/sql/_n_methods.h b/src/gen/sql/_n_methods.h
index 9953c95..4eb7f7f 100644
--- a/src/gen/sql/_n_methods.h
+++ b/src/gen/sql/_n_methods.h
@@ -7,9 +7,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N196 : public QObject { // QSqlDatabase
diff --git a/src/gen/sql/_q_classes.h b/src/gen/sql/_q_classes.h
index dd38645..1ed99e9 100644
--- a/src/gen/sql/_q_classes.h
+++ b/src/gen/sql/_q_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/sql/_q_methods.h b/src/gen/sql/_q_methods.h
index 82af0e3..9383a2f 100644
--- a/src/gen/sql/_q_methods.h
+++ b/src/gen/sql/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q211 : public Q142 { // QSqlDriver
diff --git a/src/gen/svg/_n_classes.h b/src/gen/svg/_n_classes.h
index 08dec1b..c37480a 100644
--- a/src/gen/svg/_n_classes.h
+++ b/src/gen/svg/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/svg/_n_methods.h b/src/gen/svg/_n_methods.h
index 8d91860..af5affd 100644
--- a/src/gen/svg/_n_methods.h
+++ b/src/gen/svg/_n_methods.h
@@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N217 : public N140 { // QSvgGenerator
diff --git a/src/gen/svg/_q_classes.h b/src/gen/svg/_q_classes.h
index 5832539..563494c 100644
--- a/src/gen/svg/_q_classes.h
+++ b/src/gen/svg/_q_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/svg/_q_methods.h b/src/gen/svg/_q_methods.h
index fe9b072..960e70d 100644
--- a/src/gen/svg/_q_methods.h
+++ b/src/gen/svg/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q83 : public Q77 { // QGraphicsSvgItem
diff --git a/src/gen/webengine/_n_classes.h b/src/gen/webengine/_n_classes.h
index 1b77b85..0cec0b5 100644
--- a/src/gen/webengine/_n_classes.h
+++ b/src/gen/webengine/_n_classes.h
@@ -9,7 +9,10 @@
#include
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/webengine/_n_methods.h b/src/gen/webengine/_n_methods.h
index 2d4a10d..bd31b21 100644
--- a/src/gen/webengine/_n_methods.h
+++ b/src/gen/webengine/_n_methods.h
@@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N267 : public QObject { // QWebEngineCertificateError
diff --git a/src/gen/webengine/_q_classes.h b/src/gen/webengine/_q_classes.h
index dfeeb80..3ff1d00 100644
--- a/src/gen/webengine/_q_classes.h
+++ b/src/gen/webengine/_q_classes.h
@@ -9,7 +9,10 @@
#include
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/webengine/_q_methods.h b/src/gen/webengine/_q_methods.h
index 8381545..985968e 100644
--- a/src/gen/webengine/_q_methods.h
+++ b/src/gen/webengine/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q265 : public Q142 { // QWebEngineCookieStore
diff --git a/src/gen/webkit/_n_classes.h b/src/gen/webkit/_n_classes.h
index 6803bc8..a057c18 100644
--- a/src/gen/webkit/_n_classes.h
+++ b/src/gen/webkit/_n_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/webkit/_n_methods.h b/src/gen/webkit/_n_methods.h
index 9f42b08..2b07b01 100644
--- a/src/gen/webkit/_n_methods.h
+++ b/src/gen/webkit/_n_methods.h
@@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class N264 : public QObject { // QWebDatabase
diff --git a/src/gen/webkit/_q_classes.h b/src/gen/webkit/_q_classes.h
index d13533c..97a4ee3 100644
--- a/src/gen/webkit/_q_classes.h
+++ b/src/gen/webkit/_q_classes.h
@@ -8,7 +8,10 @@
#include "../_lobjects.h"
#include
#include
-#include
+
+#ifndef OS_SAILFISH
+ #include
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/gen/webkit/_q_methods.h b/src/gen/webkit/_q_methods.h
index 5f949e3..c0a69a0 100644
--- a/src/gen/webkit/_q_methods.h
+++ b/src/gen/webkit/_q_methods.h
@@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include
-#include
#include
+#ifndef OS_SAILFISH
+ #include
+#endif
+
QT_BEGIN_NAMESPACE
class Q273 : public Q142 { // QWebFrame
diff --git a/src/module_help.pro b/src/module_help.pro
index 5ecdcb3..d865238 100644
--- a/src/module_help.pro
+++ b/src/module_help.pro
@@ -1,6 +1,6 @@
QT += help printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -24,6 +24,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/help/_ini.h \
gen/help/_ini2.h \
gen/help/_q_classes.h \
diff --git a/src/module_multimedia.pro b/src/module_multimedia.pro
index 931bcc4..21315fc 100644
--- a/src/module_multimedia.pro
+++ b/src/module_multimedia.pro
@@ -1,6 +1,6 @@
QT += multimedia multimediawidgets printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -24,6 +24,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/multimedia/_ini.h \
gen/multimedia/_ini2.h \
gen/multimedia/_q_classes.h \
diff --git a/src/module_network.pro b/src/module_network.pro
index e81df39..f1b6a25 100644
--- a/src/module_network.pro
+++ b/src/module_network.pro
@@ -1,6 +1,6 @@
-QT += network printsupport uitools
+QT += network widgets printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -24,6 +24,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/network/_ini.h \
gen/network/_ini2.h \
gen/network/_q_classes.h \
diff --git a/src/module_quick.pro b/src/module_quick.pro
index 1fc2a36..1127f79 100644
--- a/src/module_quick.pro
+++ b/src/module_quick.pro
@@ -1,6 +1,6 @@
QT += quick quickwidgets qml printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -24,6 +24,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/quick/_ini.h \
gen/quick/_ini2.h \
gen/quick/_q_classes.h \
diff --git a/src/module_sql.pro b/src/module_sql.pro
index 9fe3c9a..cb2a73d 100644
--- a/src/module_sql.pro
+++ b/src/module_sql.pro
@@ -1,6 +1,6 @@
QT += sql printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -24,6 +24,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/sql/_ini.h \
gen/sql/_ini2.h \
gen/sql/_q_classes.h \
diff --git a/src/module_svg.pro b/src/module_svg.pro
index 5f1db37..1b6b496 100644
--- a/src/module_svg.pro
+++ b/src/module_svg.pro
@@ -1,6 +1,6 @@
QT += svg printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -24,6 +24,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/svg/_ini.h \
gen/svg/_ini2.h \
gen/svg/_q_classes.h \
diff --git a/src/module_webengine.pro b/src/module_webengine.pro
index 0d53010..baaa9f4 100644
--- a/src/module_webengine.pro
+++ b/src/module_webengine.pro
@@ -1,6 +1,6 @@
QT += webengine webenginewidgets printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -26,6 +26,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/webengine/_ini.h \
gen/webengine/_ini2.h \
gen/webengine/_q_classes.h \
diff --git a/src/module_webkit.pro b/src/module_webkit.pro
index 62201c1..10d8c34 100644
--- a/src/module_webkit.pro
+++ b/src/module_webkit.pro
@@ -1,6 +1,6 @@
QT += webkit webkitwidgets printsupport uitools
TEMPLATE = lib
-CONFIG += no_keywords release
+CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
#CONFIG += static
INCLUDEPATH += ../src /usr/local/include
@@ -25,6 +25,14 @@ win32 {
include(windows.pri)
}
+sailfish {
+ # on Sailfish run this prior to run qmake:
+ # $ export SAILFISH=sailfish
+ QT -= printsupport uitools
+ DEFINES += OS_SAILFISH
+ message("*** Building for SailfishOS ***")
+}
+
HEADERS += gen/webkit/_ini.h \
gen/webkit/_ini2.h \
gen/webkit/_q_classes.h \
diff --git a/src/ui_loader.h b/src/ui_loader.h
index d130fdf..3107f6d 100644
--- a/src/ui_loader.h
+++ b/src/ui_loader.h
@@ -3,6 +3,8 @@
#ifndef UI_LOADER_H
#define UI_LOADER_H
+#ifndef OS_SAILFISH
+
#include
#include "gen/_lobjects.h"
@@ -35,6 +37,7 @@ struct UiLoader : public QUiLoader {
w = QUiLoader::createWidget(className, parent, name); }}
return w; }
};
+#endif
QT_END_NAMESPACE