sfos/eql5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some fixes to Sailfish build

Browse source
This commit is contained in:
polos 2021-03-15 17:38:38 +01:00
parent 92b9e2647e
commit 997226c026
13 changed files with 90 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/eql5.pro
View file

@ -1,6 +1,8 @@
# -----------------------------------------------------
# below you can comment out all modules you don't need:
CONFIG += $$(SAILFISH)
SUBDIRS = help \
multimedia \
network \
@ -11,6 +13,14 @@ SUBDIRS = help \
# webkit
# -----------------------------------------------------
sailfish {
# on Sailfish run this prior to run qmake:
# $ export SAILFISH=sailfish
DEFINES += OS_SAILFISH
SUBDIRS -= help svg webengine webkit
message("*** Building for SailfishOS ***")
}
TEMPLATE = subdirs
SUBDIRS += lib exe
@ -33,3 +43,4 @@ webengine.file = module_webengine.pro
webengine.depends = lib exe
webkit.file = module_webkit.pro
webkit.depends = lib exe

22
src/gen/multimedia/_ini.cpp
View file

@ -29,16 +29,20 @@ NumList LAudioOutput::overrideIds = NumList();
NumList LAudioRecorder::overrideIds = NumList();
NumList LCamera::overrideIds = NumList() << 179;
NumList LCameraImageCapture::overrideIds = NumList() << 162 << 184;
#ifndef OS_SAILFISH
NumList LCameraViewfinder::overrideIds = NumList();
NumList LGraphicsVideoItem::overrideIds = NumList() << 261 << 232;
#endif
NumList LMediaControl::overrideIds = NumList();
NumList LMediaObject::overrideIds = NumList() << 179 << 180 << 181 << 182 << 183;
NumList LMediaPlayer::overrideIds = NumList() << 179;
NumList LMediaPlaylist::overrideIds = NumList() << 162;
NumList LMediaRecorder::overrideIds = NumList() << 162;
NumList LRadioTuner::overrideIds = NumList() << 179;
#ifndef OS_SAILFISH
NumList LVideoWidget::overrideIds = NumList() << 25 << 35 << 39 << 20 << 40 << 41;
NumList LVideoWidgetControl::overrideIds = NumList() << 419 << 420 << 421 << 422 << 423 << 424 << 425 << 426 << 427 << 428 << 429 << 430 << 431;
#endif
NumList LAudioDeviceInfo::overrideIds = NumList();
NumList LAudioEncoderSettings::overrideIds = NumList();
NumList LAudioFormat::overrideIds = NumList();
@ -63,8 +67,10 @@ void* multimedia_ini() {
LObjects::Q[30] = new Q31;
LObjects::Q[31] = new Q32;
LObjects::Q[32] = new Q33;
#ifndef OS_SAILFISH
LObjects::Q[33] = new Q34;
LObjects::Q[85] = new Q86;
#endif
LObjects::Q[125] = new Q126;
LObjects::Q[126] = new Q127;
LObjects::Q[127] = new Q128;
@ -72,8 +78,10 @@ void* multimedia_ini() {
LObjects::Q[129] = new Q130;
LObjects::Q[130] = new Q131;
LObjects::Q[186] = new Q187;
#ifndef OS_SAILFISH
LObjects::Q[262] = new Q263;
LObjects::Q[263] = new Q264;
#endif
LObjects::N[17] = new N18;
LObjects::N[18] = new N19;
LObjects::N[19] = new N20;
@ -155,8 +163,10 @@ const QMetaObject* ModuleMultimedia::staticMetaObject(int n) {
case 31: m = &QCameraFocus::staticMetaObject; break;
case 32: m = &QCameraImageCapture::staticMetaObject; break;
case 33: m = &QCameraImageProcessing::staticMetaObject; break;
#ifndef OS_SAILFISH
case 34: m = &QCameraViewfinder::staticMetaObject; break;
case 86: m = &QGraphicsVideoItem::staticMetaObject; break;
#endif
case 126: m = &QMediaControl::staticMetaObject; break;
case 127: m = &QMediaObject::staticMetaObject; break;
case 128: m = &QMediaPlayer::staticMetaObject; break;
@ -164,8 +174,11 @@ const QMetaObject* ModuleMultimedia::staticMetaObject(int n) {
case 130: m = &QMediaRecorder::staticMetaObject; break;
case 131: m = &QMediaService::staticMetaObject; break;
case 187: m = &QRadioTuner::staticMetaObject; break;
#ifndef OS_SAILFISH
case 263: m = &QVideoWidget::staticMetaObject; break;
case 264: m = &QVideoWidgetControl::staticMetaObject; break; }
case 264: m = &QVideoWidgetControl::staticMetaObject; break;
#endif
}
return m; }
void ModuleMultimedia::deleteNObject(int n, void* p, int gc) {
@ -191,16 +204,21 @@ NumList* ModuleMultimedia::overrideIds(const QByteArray& name) {
case 24: ids = &LAudioRecorder::overrideIds; break;
case 29: ids = &LCamera::overrideIds; break;
case 32: ids = &LCameraImageCapture::overrideIds; break;
#ifndef OS_SAILFISH
case 34: ids = &LCameraViewfinder::overrideIds; break;
case 86: ids = &LGraphicsVideoItem::overrideIds; break;
#endif
case 126: ids = &LMediaControl::overrideIds; break;
case 127: ids = &LMediaObject::overrideIds; break;
case 128: ids = &LMediaPlayer::overrideIds; break;
case 129: ids = &LMediaPlaylist::overrideIds; break;
case 130: ids = &LMediaRecorder::overrideIds; break;
case 187: ids = &LRadioTuner::overrideIds; break;
#ifndef OS_SAILFISH
case 263: ids = &LVideoWidget::overrideIds; break;
case 264: ids = &LVideoWidgetControl::overrideIds; break; }}
case 264: ids = &LVideoWidgetControl::overrideIds; break;
#endif
}}
else {
n = LObjects::n_names.value(name);
switch(n) {

2
src/gen/multimedia/_n_methods.h
View file

@ -6,10 +6,10 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include <QtWidgets>
#include <QtMultimediaWidgets>
#ifndef OS_SAILFISH
#include <QtPrintSupport>
#include <QtMultimediaWidgets>
#endif
QT_BEGIN_NAMESPACE

10
src/gen/multimedia/_q_classes.h
View file

@ -6,11 +6,11 @@
#include "_ini2.h"
#include "../../ecl_fun.h"
#include "../_lobjects.h"
#include <QtMultimediaWidgets>
#include <QtWidgets>
#ifndef OS_SAILFISH
#include <QtPrintSupport>
#include <QtMultimediaWidgets>
#endif
QT_BEGIN_NAMESPACE
@ -87,6 +87,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)) { QCameraImageCapture::timerEvent(x1); }}
};
#ifndef OS_SAILFISH
class LCameraViewfinder : public QCameraViewfinder {
Q_OBJECT
friend class Q34;
@ -135,7 +136,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)) { QCameraViewfinder::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)) { QCameraViewfinder::timerEvent(x1); }}
};
#endif
#ifndef OS_SAILFISH
class LGraphicsVideoItem : public QGraphicsVideoItem {
Q_OBJECT
friend class Q86;
@ -152,6 +155,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)) { QGraphicsVideoItem::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)) { QGraphicsVideoItem::timerEvent(x1); }}
};
#endif
class LMediaControl : public QMediaControl {
Q_OBJECT
@ -258,6 +262,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)) { QRadioTuner::timerEvent(x1); }}
};
#ifndef OS_SAILFISH
class LVideoWidget : public QVideoWidget {
Q_OBJECT
friend class Q263;
@ -306,7 +311,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)) { QVideoWidget::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)) { QVideoWidget::timerEvent(x1); }}
};
#endif
#ifndef OS_SAILFISH
class LVideoWidgetControl : public QVideoWidgetControl {
Q_OBJECT
friend class Q264;
@ -333,6 +340,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)) { QVideoWidgetControl::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)) { QVideoWidgetControl::timerEvent(x1); }}
};
#endif
QT_END_NAMESPACE

10
src/gen/multimedia/_q_methods.h
View file

@ -6,10 +6,10 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include <QtWidgets>
#include <QtMultimediaWidgets>
#ifndef OS_SAILFISH
#include <QtPrintSupport>
#include <QtMultimediaWidgets>
#endif
QT_BEGIN_NAMESPACE
@ -144,6 +144,7 @@ public:
Q_INVOKABLE int MwhiteBalanceMode(QCameraImageProcessing* o) const { return o->whiteBalanceMode(); }
};
#ifndef OS_SAILFISH
class Q86 : public Q77 { // QGraphicsVideoItem
Q_OBJECT
public:
@ -159,6 +160,7 @@ public:
Q_INVOKABLE QRectF MboundingRect(QGraphicsVideoItem* o) const { return o->boundingRect(); }
Q_INVOKABLE void Mpaint(QGraphicsVideoItem* o, QPainter* x1, const QStyleOptionGraphicsItem* x2, QWidget* x3 = 0) { o->paint(x1, x2, x3); }
};
#endif
class Q126 : public Q142 { // QMediaControl
Q_OBJECT
@ -309,6 +311,7 @@ public:
Q_INVOKABLE int Mavailability(QRadioTuner* o) const { return o->availability(); }
};
#ifndef OS_SAILFISH
class Q264 : public Q126 { // QVideoWidgetControl
Q_OBJECT
public:
@ -326,6 +329,7 @@ public:
Q_INVOKABLE void MsetSaturation(QVideoWidgetControl* o, int x1) { o->setSaturation(x1); }
Q_INVOKABLE QWidget* MvideoWidget(QVideoWidgetControl* o) { return o->videoWidget(); }
};
#endif
class Q24 : public Q130 { // QAudioRecorder
Q_OBJECT
@ -369,6 +373,7 @@ public:
Q_INVOKABLE int Mavailability(QCamera* o) const { return o->availability(); }
};
#ifndef OS_SAILFISH
class Q263 : public Q279 { // QVideoWidget
Q_OBJECT
public:
@ -382,7 +387,9 @@ public:
Q_INVOKABLE int Msaturation(QVideoWidget* o) const { return o->saturation(); }
Q_INVOKABLE QSize MsizeHint(QVideoWidget* o) const { return o->sizeHint(); }
};
#endif
#ifndef OS_SAILFISH
class Q34 : public Q263 { // QCameraViewfinder
Q_OBJECT
public:
@ -390,6 +397,7 @@ public:
Q_INVOKABLE QMediaObject* MmediaObject(QCameraViewfinder* o) const { return o->mediaObject(); }
Q_INVOKABLE bool MsetMediaObject(QCameraViewfinder* o, QMediaObject* x1) { return ((LCameraViewfinder*)o)->setMediaObject(x1); }
};
#endif
QT_END_NAMESPACE

16
src/gen/quick/_ini.cpp
View file

@ -33,9 +33,13 @@ NumList LQuickItemGrabResult::overrideIds = NumList();
NumList LQuickPaintedItem::overrideIds = NumList() << 342 << 329 << 330 << 338 << 340;
NumList LQuickRenderControl::overrideIds = NumList();
NumList LQuickTextDocument::overrideIds = NumList();
#ifndef OS_SAILFISH
NumList LQuickTextureFactory::overrideIds = NumList() << 343 << 344 << 345 << 346;
#endif
NumList LQuickView::overrideIds = NumList();
#ifndef OS_SAILFISH
NumList LQuickWidget::overrideIds = NumList() << 29 << 30 << 31 << 32 << 13 << 14 << 35 << 15 << 16 << 38 << 17 << 18 << 19 << 41 << 43;
#endif
NumList LQuickWindow::overrideIds = NumList();
NumList LSGAbstractRenderer::overrideIds = NumList() << 347;
NumList LSGDynamicTexture::overrideIds = NumList() << 348;
@ -90,9 +94,13 @@ void* quick_ini() {
LObjects::Q[178] = new Q179;
LObjects::Q[179] = new Q180;
LObjects::Q[180] = new Q181;
#ifndef OS_SAILFISH
LObjects::Q[181] = new Q182;
#endif
LObjects::Q[182] = new Q183;
#ifndef OS_SAILFISH
LObjects::Q[183] = new Q184;
#endif
LObjects::Q[184] = new Q185;
LObjects::Q[189] = new Q190;
LObjects::Q[190] = new Q191;
@ -183,9 +191,13 @@ const QMetaObject* ModuleQuick::staticMetaObject(int n) {
case 179: m = &QQuickPaintedItem::staticMetaObject; break;
case 180: m = &QQuickRenderControl::staticMetaObject; break;
case 181: m = &QQuickTextDocument::staticMetaObject; break;
#ifndef OS_SAILFISH
case 182: m = &QQuickTextureFactory::staticMetaObject; break;
#endif
case 183: m = &QQuickView::staticMetaObject; break;
#ifndef OS_SAILFISH
case 184: m = &QQuickWidget::staticMetaObject; break;
#endif
case 185: m = &QQuickWindow::staticMetaObject; break;
case 190: m = &QSGAbstractRenderer::staticMetaObject; break;
case 191: m = &QSGDynamicTexture::staticMetaObject; break;
@ -244,9 +256,13 @@ NumList* ModuleQuick::overrideIds(const QByteArray& name) {
case 179: ids = &LQuickPaintedItem::overrideIds; break;
case 180: ids = &LQuickRenderControl::overrideIds; break;
case 181: ids = &LQuickTextDocument::overrideIds; break;
#ifndef OS_SAILFISH
case 182: ids = &LQuickTextureFactory::overrideIds; break;
#endif
case 183: ids = &LQuickView::overrideIds; break;
#ifndef OS_SAILFISH
case 184: ids = &LQuickWidget::overrideIds; break;
#endif
case 185: ids = &LQuickWindow::overrideIds; break;
case 190: ids = &LSGAbstractRenderer::overrideIds; break;
case 191: ids = &LSGDynamicTexture::overrideIds; break;

5
src/gen/quick/_n_methods.h
View file

@ -6,9 +6,12 @@
#include "_n_classes.h"
#include "../_main_n_methods.h"
#include <QtWidgets>
#include <QtPrintSupport>
#include <QtQuick>
#ifndef OS_SAILFISH
#include <QtPrintSupport>
#endif
QT_BEGIN_NAMESPACE
class N104 : public QObject { // QJSValue

6
src/gen/quick/_q_classes.h
View file

@ -7,11 +7,11 @@
#include "../../ecl_fun.h"
#include "../_lobjects.h"
#include <QtQuick>
#include <QtQuickWidgets>
#include <QtWidgets>
#ifndef OS_SAILFISH
#include <QtPrintSupport>
#include <QtQuickWidgets>
#endif
QT_BEGIN_NAMESPACE
@ -302,6 +302,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)) { QQuickTextDocument::timerEvent(x1); }}
};
#ifndef OS_SAILFISH
class LQuickTextureFactory : public QQuickTextureFactory {
Q_OBJECT
friend class Q182;
@ -320,6 +321,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)) { QQuickTextureFactory::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)) { QQuickTextureFactory::timerEvent(x1); }}
};
#endif
class LQuickView : public QQuickView {
Q_OBJECT
@ -358,6 +360,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)) { QQuickView::timerEvent(x1); }}
};
#ifndef OS_SAILFISH
class LQuickWidget : public QQuickWidget {
Q_OBJECT
friend class Q184;
@ -408,6 +411,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)) { QQuickWidget::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)) { QQuickWidget::timerEvent(x1); }}
};
#endif
class LQuickWindow : public QQuickWindow {
Q_OBJECT

9
src/gen/quick/_q_methods.h
View file

@ -6,9 +6,12 @@
#include "_q_classes.h"
#include "../_main_q_methods.h"
#include <QtWidgets>
#include <QtPrintSupport>
#include <QtQuick>
#ifndef OS_SAILFISH
#include <QtPrintSupport>
#endif
QT_BEGIN_NAMESPACE
class Q112 : public Q142 { // QJSEngine
@ -318,6 +321,7 @@ public:
Q_INVOKABLE QTextDocument* MtextDocument(QQuickTextDocument* o) const { return o->textDocument(); }
};
#ifndef OS_SAILFISH
class Q182 : public Q142 { // QQuickTextureFactory
Q_OBJECT
public:
@ -327,6 +331,7 @@ public:
Q_INVOKABLE int MtextureByteCount(QQuickTextureFactory* o) const { return o->textureByteCount(); }
Q_INVOKABLE QSize MtextureSize(QQuickTextureFactory* o) const { return o->textureSize(); }
};
#endif
class Q190 : public Q142 { // QSGAbstractRenderer
Q_OBJECT
@ -408,6 +413,7 @@ public:
Q_INVOKABLE QSGTextureProvider* MtextureProvider(QQuickFramebufferObject* o) const { return o->textureProvider(); }
};
#ifndef OS_SAILFISH
class Q184 : public Q279 { // QQuickWidget
Q_OBJECT
public:
@ -430,6 +436,7 @@ public:
Q_INVOKABLE int Mstatus(QQuickWidget* o) const { return o->status(); }
Q_INVOKABLE bool Mevent(QQuickWidget* o, QEvent* x1) { return ((LQuickWidget*)o)->event(x1); }
};
#endif
class Q185 : public Q281 { // QQuickWindow
Q_OBJECT

3
src/module_multimedia.pro
View file

@ -27,7 +27,8 @@ win32 {
sailfish {
# on Sailfish run this prior to run qmake:
# $ export SAILFISH=sailfish
QT -= printsupport uitools
QT -= multimediawidgets printsupport uitools
QT += widgets
DEFINES += OS_SAILFISH
message("*** Building for SailfishOS ***")
}

3
src/module_network.pro
View file

@ -1,4 +1,4 @@
QT += network widgets printsupport uitools
QT += network printsupport uitools
TEMPLATE = lib
CONFIG += no_keywords release $$(SAILFISH)
CONFIG += plugin
@ -28,6 +28,7 @@ sailfish {
# on Sailfish run this prior to run qmake:
# $ export SAILFISH=sailfish
QT -= printsupport uitools
QT += widgets
DEFINES += OS_SAILFISH
message("*** Building for SailfishOS ***")
}

3
src/module_quick.pro
View file

@ -27,7 +27,8 @@ win32 {
sailfish {
# on Sailfish run this prior to run qmake:
# $ export SAILFISH=sailfish
QT -= printsupport uitools
QT -= quickwidgets printsupport uitools
QT += widgets
DEFINES += OS_SAILFISH
message("*** Building for SailfishOS ***")
}

1
src/module_sql.pro
View file

@ -28,6 +28,7 @@ sailfish {
# on Sailfish run this prior to run qmake:
# $ export SAILFISH=sailfish
QT -= printsupport uitools
QT += widgets
DEFINES += OS_SAILFISH
message("*** Building for SailfishOS ***")
}