excised qjsengine

effects/effect.cpp

@@ -378,7 +378,6 @@ Effect::Effect(Clip* c, const EffectMeta *em) :
 							QFile script_file(get_effects_dir() + "/" + attr.value().toString());
 							if (script_file.open(QFile::ReadOnly)) {
 								script = script_file.readAll();
-								wrapper_obj = jsEngine.newQObject(&painter_wrapper);
 							} else {
 								dout << "[ERROR] Failed to open superimpose script file for" << em->filename;
 								enable_superimpose = false;
@@ -801,6 +800,7 @@ void Effect::process_audio(double timecode_start, double timecode_end, quint8* s
 }
 
 void Effect::redraw(double timecode) {
+	/*
 	// run javascript
 	QPainter p(&img);
 	painter_wrapper.img = &img;
@@ -840,6 +840,7 @@ void Effect::redraw(double timecode) {
 	}
 
 	jsEngine.evaluate(script);
+	*/
 }
 
 bool Effect::valueHasChanged(double timecode) {

effects/effect.h

@@ -8,7 +8,6 @@
 #include <QOpenGLFunctions>
 #include <QOpenGLShaderProgram>
 #include <QOpenGLTexture>
-#include <QJSEngine>
 #include <QMutex>
 #include <QThread>
 class QLabel;
@@ -246,8 +245,6 @@ protected:
 	QOpenGLTexture* texture;
 private:
 	// superimpose effect
-	QJSEngine jsEngine;
-	QJSValue wrapper_obj;
 	QString script;
 
 	bool isOpen;

mainwindow.cpp

@@ -76,7 +76,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
 	// set up style?
 
-    qApp->setStyle(QStyleFactory::create("Fusion"));
+	qApp->setStyle(QStyleFactory::create("Fusion"));
 
 	QPalette darkPalette;
     darkPalette.setColor(QPalette::Window, QColor(53,53,53));
@@ -93,7 +93,7 @@ MainWindow::MainWindow(QWidget *parent) :
 	darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218));
 	darkPalette.setColor(QPalette::HighlightedText, Qt::black);
 
-    qApp->setPalette(darkPalette);
+	qApp->setPalette(darkPalette);
 
 	// end style
 	ui->setupUi(this);

olive.pro

@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui multimedia opengl qml
+QT       += core gui multimedia opengl
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 

panels/timeline.cpp

@@ -27,8 +27,6 @@
 #include <QInputDialog>
 #include <QMessageBox>
 
-#include <QJSEngine>
-
 long refactor_frame_number(long framenumber, double source_frame_rate, double target_frame_rate) {
     if (source_frame_rate == target_frame_rate) return framenumber;
 	return qFloor(((double)framenumber/source_frame_rate)*target_frame_rate);