diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb20a92fe7..2fb94228b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ include(FindPkgConfig)
 include(CMakePushCheckState)
 include(GenerateExportHeader)
 
-find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Script ScriptTools Sql Svg Test Widgets Xml)
+find_package(Qt5 ${QT_REQUIRED_VERSION} REQUIRED COMPONENTS Core DBus Gui QuickWidgets Qml Sql Svg Test Widgets Xml )
 
 find_package(Qt5QuickControls2 ${QT_REQUIRED_VERSION})
 set_package_properties(Qt5QuickControls2 PROPERTIES TYPE RUNTIME PURPOSE "Needed by the player's context area")
@@ -36,6 +36,9 @@ set_package_properties(Qt5QuickControls2 PROPERTIES TYPE RUNTIME PURPOSE "Needed
 find_package(Qt5WebEngine ${QT_REQUIRED_VERSION})
 set_package_properties(Qt5WebEngine PROPERTIES TYPE OPTIONAL PURPOSE "Needed by the wikipedia applet")
 
+find_package(Qt5UiTools ${QT_REQUIRED_VERSION})
+set_package_properties(Qt5UiTools PROPERTIES TYPE OPTIONAL PURPOSE "Needed by the scripting engine")
+
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Archive
     Attica
diff --git a/MAINTAINERS b/MAINTAINERS
index bd5dda2c07..a7505aa0df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2,4 +2,4 @@ Amarok does not have clear maintainers of all parts of the codebase. The current
 
 You are welcome to work on any part of it provided you coordinate with others working in that part.
 
-If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on http://bugs.kde.org directly.
\ No newline at end of file
+If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on https://bugs.kde.org directly.
diff --git a/Mainpage.dox b/Mainpage.dox
index 8bbf3196ef..07306b7af7 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -13,7 +13,7 @@ of the <a href="http://techbase.kde.org">KDE Techbase</a>.
 
 @maintainers
 Amarok does not have clear maintainers of any part of the codebase. You are welcome to work on any part of it provided  you coordinate with others working in that part. <br/>
-If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on http://bugs.kde.org directly.
+If you need to contact someone about a particular part it is best to contact the developer mailing list at amarok-devel@kde.org or the assignee of the corresponding component on https://bugs.kde.org directly.
 
 @authors
 <!--
diff --git a/README b/README
index f216487cc3..811df442cb 100644
--- a/README
+++ b/README
@@ -1,170 +1,10 @@
 Amarok - the audio player for KDE
 ===================================
 
-There are many media players around these days, it's true. What's missing from most
-players is a user interface that doesn't get in the way of the user. How many
-buttons do you have to press for simply adding some new tracks to the playlist?
-Amarok tries to be a little different, providing a simple drag and drop interface
-that really makes playlist handling easy.
+This *personal* repository is a clone of the official Amarok repository (https://invent.kde.org/kde/amarok).
+Here I publish my ongoing improvements, which are also sent upstream once they are completed.
+You are welcome to use it. But the code might be unstable, and is supported by no one else but me.
+Feel free to contact me with suggestions and bug reports.
 
-
- FEATURES
-==========
-
-    * Quick and simple drag and drop playlist creation
-    * Music library
-    * Cross platform: Support for Unix, MacOS X and Windows
-    * Plays all audio formats known to man
-    * Cover art download using Last.fm services
-    * Automatic play-statistics generation (iRate style)
-    * Full lyrics download
-    * Learn about your music with integrated Wikipedia
-    * Full Last.fm support
-    * gpodder.net support
-    * Configurable on screen display for track changes
-    * Podcast support
-    * iPod support, as well as other media players
-    * Powerful scripting interface
-    * Integration with Plasma and KDE Applications
-    * Integration with multiple web sources including Magnatune, Jamendo,
-      Ampache, MP3tunes, and others.
---------------------------------------------------------------------------------
-
-
- DEPENDENCIES
-==============
-
-The following list should give you an impression what's required but it might
-not be entirely up to date. You can always look at CMakeLists.txt to discover
-the most recent dependencies.
-
-Required
-    * KDE Frameworks 5 (for an exact list look at CMakeLists.txt)
-      https://www.kde.org
-
-    * Phonon 4.6.60 (with support for Qt5) and one of the following backends:
-      * phonon-gstreamer 4.6.3 (or newer)
-      * phonon-vlc 0.6.1 (or newer; as of 0.6.1 doesn't yet play Audio CDs, bug 313046)
-
-    * Qt 5.8 (or newer)
-      https://qt.io/
-
-    * TagLib 1.7 (or newer)
-      (Metadata tagging library)
-
-    * TagLib Extras 1.0.1 (or newer)
-      (Support for metadata reading of additional file types)
-      svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib-extras
-
-    * MySQL 5.0 (or newer) Embedded: libmysqld compiled with fPIC
-      (In-process database support)
-
-Optional
-    * Taglib 1.8 for support of MOD, IT, S3M and XM files
-    * Taglib 1.9 for support of Opus files
-      http://taglib.org/
-      https://github.com/taglib/taglib
-
-    * iPod support requires:
-      * libgpod 0.8.2 (or newer)
-        http://www.gtkpod.org/libgpod/
-      * optional iPod album artwork support requires:
-        * libgpod built with GDKPixBuf support enabled
-        * GDKPixBuf 2.0 (or newer) itself
-
-    * libmtp 1.0.0 (or newer)
-      (MTP device support)
-      http://libmtp.sourceforge.net/
-
-    * Spectrum analyzer requires:
-      * QtOpenGL
-
-    * Mp3tunes.com integration (including syncronization) requires:
-      * OpenSSL https://www.openssl.org
-      * libxml2 http://xmlsoft.org
-      * libcurl https://curl.haxx.se
-      * Glib2 https://www.gtk.org
-      * Loudmouth, the Jabber library, http://www.loudmouth-project.org/
-      * Qt must be compiled with Glib enabled
-
-    * Liblastfm 1.0.3 (or newer)
-      (For scrobbling, internet radio, and artist info)
-      http://cdn.last.fm/client/liblastfm-1.0.3.tar.gz
-      https://github.com/eartle/liblastfm
-
-    * MySQL 5.0 (or newer) Server (external database support)
-
-    * MusicBrainz-based audio fingerprint tag lookup requires:
-      * FFmpeg 0.7.0 (or newer) - https://ffmpeg.org/
-        * libavcodec & libavformat specifically
-      * LibOFA - http://code.google.com/p/musicip-libofa/
-
-    * gpodder.net Podcast Provider & Service
-      * libmygpo-qt 1.0.9 (or newer)
-         Actually it needs the to-be-released 1.10. Or you use 1.0.9 and add the
-         patches from the following pull requests:
-         - https://github.com/gpodder/libmygpo-qt/pull/12
-         - https://github.com/gpodder/libmygpo-qt/pull/13
-
-    * Transcoding requires (at runtime):
-      * FFmpeg 0.7.0 (or newer) - https://ffmpeg.org/
-      * For all supported encoders to be available in Amarok, FFmpeg needs to
-        support the following codecs:
-        * aac (introduced in 3.0, https://www.ffmpeg.org/index.html#aac_encoder_stable)
-        * alac
-        * flac
-        * opus
-        * libmp3lame (NOT just "mp3")
-        * libvorbis (NOT just "vorbis")
-        * wmav2
-
-    * CD support requires:
-      * audiocd-kio - https://www.kde.org/ (part of KDE multimedia)
-
-    * Building tests require:
-      * gmock 1.4 (or newer) - https://github.com/google/googletest
-
-Please note that if compiling from source you also need to install -dev/-devel
-versions of these packages, depending on your distribution.
---------------------------------------------------------------------------------
-
-
- IMPORTANT INSTALL INSTRUCTIONS
-================================
-
-To compile from source, please refer to the INSTALL file.
-
-Packages for popular distributions are available at https://amarok.kde.org
---------------------------------------------------------------------------------
-
-
- FURTHER RESOURCES
-===================
-
-For answers to problems like "Amarok won't play any MP3s!" and "My MP3s skip
-and stutter!" please visit:
-
-   https://amarok.kde.org/
---------------------------------------------------------------------------------
-
-
- CONTRIBUTING
-==============
-
-If you wish to contribute to Amarok, you should build it from Git and subscribe
-to the amarok AT kde.org mailing list. The IRC channel is also a place where
-it's nice to be. There you can talk to other developers easily, and you can see
-instant notifications of commits to the Git master repository. For instant email
-notification of commits, visit http://commitfilter.kde.org/ , and http://amarok.be/fisheye
-provides a slightly-less-instant overview.
-
-More information at:
-https://community.kde.org/Amarok/Development/Join
-
-See you on IRC!
-
---------------------------------------------------------------------------------
-
-WWW:  https://amarok.kde.org
-MAIL: amarok@kde.org
-IRC:  irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr
+Packages for (k)Ubuntu 19.10 (or newer) are available at https://launchpad.net/~pgomes/+archive/ubuntu/amarok
+I rebase from the official repository before a new release. Thus, new packages incorporate other people's improvements, and should be fully usable.
diff --git a/data/amarok.notifyrc b/data/amarok.notifyrc
index 0338ccc955..90f1b327b7 100644
--- a/data/amarok.notifyrc
+++ b/data/amarok.notifyrc
@@ -167,6 +167,7 @@ Name[en_GB]=Message
 Name[eo]=Mesaĝo
 Name[es]=Mensaje
 Name[et]=Teade
+Name[eu]=Mezua
 Name[fi]=Viesti
 Name[fr]=Message
 Name[ga]=Teachtaireacht
@@ -211,6 +212,7 @@ Comment[el]=Το Amarok εξέδωσε ένα μη κατηγοριοποιημ
 Comment[en_GB]=Amarok issued an uncategorised text message
 Comment[es]=Amarok emitió un mensaje de texto no clasificado
 Comment[et]=Amarok andis liigitamata tekstiteate
+Comment[eu]=Amarok-ek kategoriarik gabeko testu mezu bat eman du
 Comment[fi]=Amarok lähetti luokittelemattoman tekstiviestin
 Comment[fr]=Amarok a émis un message de texte sans catégorie
 Comment[ga]=Chuir Amarok teachtaireacht téacs gan catagóir amach
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/changelog b/distribution/deb_packaging/ubuntu/18.04/debian/changelog
new file mode 100644
index 0000000000..1dd2dddfa4
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/18.04/debian/changelog
@@ -0,0 +1,87 @@
+amarok (2:2.9.70+1SNAPSHOT20200916214648+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 21:46:48 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200916171021+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 17:10:21 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200915122323+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Port scripting engine from QTScript to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 15 Sep 2020 12:23:23 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Replace usage of QJSEngine:importModule to compile with QT5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 01 Jul 2020 12:44:47 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200630174341+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Change numbering to old Ubuntu scheme
+  * Fix compilation error for scripting code compatible with QT 5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 30 Jun 2020 17:43:41 +0200
+
+amarok (2.9.70+1SNAPSHOT20200626194036+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Second release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 26 Jun 2020 19:40:36 +0200
+
+amarok (2.9.70+1SNAPSHOT20200623170346+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * First release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 23 Jun 2020 17:03:46 +0200
+
+amarok (2.9.70+1SNAPSHOT20200616130454+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix crash in breadcrumb when deleting the child menu of a category
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 16 Jun 2020 13:04:54 +0200
+
+amarok (2.9.70+1SNAPSHOT20200612103823+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix crash when closing Edit Filter dialog
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 12 Jun 2020 10:38:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200504192042+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix error message at PlaylistDock
+  * add Dockerfile for Neon 18.04 and Ubuntu 20.04
+  * add debian packaging conf for Ubuntu 20.04 
+  * Reorganize dir structure for packaging configuration and Dockerfiles
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Sat, 25 Apr 2020 22:38:26 +0200
+
+amarok (2.9.70+1SNAPSHOT20200424193358+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Fix breadcrumb
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 24 Apr 2020 19:34:09 +0200
+
+amarok (2.9.70+1SNAPSHOT20200410173239+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * add missing libkf5doctools-dev to control file
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 10 Apr 2020 17:32:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200407170839+0200-0ubuntu1ppa1~ubuntu18.04.1) bionic; urgency=medium
+
+  * Initial release 
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 07 Apr 2020 17:16:20 +0200
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/control b/distribution/deb_packaging/ubuntu/18.04/debian/control
new file mode 100644
index 0000000000..2d2a960a07
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/18.04/debian/control
@@ -0,0 +1,77 @@
+Source: amarok
+Section: sound
+Priority: optional
+Maintainer: Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+Build-Depends: debhelper-compat (= 11),
+               cmake,
+               extra-cmake-modules,
+               kirigami2-dev,
+               libaio-dev,
+               libavcodec-dev,
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
+               libcurl4-openssl-dev,
+               libfftw3-dev,
+               libgcrypt20-dev,
+               libgdk-pixbuf2.0-dev,
+               libkf5archive-dev,
+               libkf5attica-dev,
+               libkf5codecs-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5crash-dev,
+               libkf5dbusaddons-dev,
+               libkf5declarative-dev,
+               libkf5dnssd-dev,
+               libkf5doctools-dev,
+               libkf5globalaccel-dev,
+               libkf5guiaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kcmutils-dev,
+               libkf5kio-dev,
+               libkf5newstuff-dev,
+               libkf5notifications-dev,
+               libkf5notifyconfig-dev,
+               libkf5package-dev,
+               libkf5solid-dev,
+               libkf5texteditor-dev,
+               libkf5threadweaver-dev,
+               libkf5wallet-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               liblastfm5-dev,
+               libloudmouth1-dev,
+               libmariadbd-dev,
+               libmariadb-dev,
+               libmtp-dev,
+               libmygpo-qt-dev,
+               libofa0-dev,
+               libphonon4qt5-dev,
+               libpostproc-dev,
+               libqt5svg5-dev,
+               libssl-dev,
+               libswscale-dev,
+               libtag1-dev,
+               libtag-extras-dev,
+               libxml2-dev,
+               pkg-config,
+               qtdeclarative5-dev,
+               qtquickcontrols2-5-dev,
+               qtscript5-dev,
+               qttools5-dev,
+               qtwebengine5-dev
+Standards-Version: 4.4.0
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
+
+Package: amarok
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Amarok for KDE5
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/copyright b/distribution/deb_packaging/ubuntu/18.04/debian/copyright
new file mode 100644
index 0000000000..cc1bc053dd
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/18.04/debian/copyright
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: amarok
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
+
+# If you want to use GPL v2 or later for the /debian/* files use
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2020 Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+#
+# If you need, there are some extra license texts available in two places:
+#   /usr/share/debhelper/dh_make/licenses/
+#   /usr/share/common-licenses/
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/rules b/distribution/deb_packaging/ubuntu/18.04/debian/rules
new file mode 100755
index 0000000000..10853335c9
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/18.04/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_OPTIONS=nocheck
+
+
+%:
+	dh $@
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+override_dh_shlibdeps:
+# Remove metapackage to be compatible with Neon
+	dh_shlibdeps -- -xqtdeclarative-abi-5-9-5
diff --git a/distribution/deb_packaging/ubuntu/18.04/debian/source/format b/distribution/deb_packaging/ubuntu/18.04/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/18.04/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/changelog b/distribution/deb_packaging/ubuntu/19.10/debian/changelog
new file mode 100644
index 0000000000..69f1a1e539
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/19.10/debian/changelog
@@ -0,0 +1,87 @@
+amarok (2:2.9.70+1SNAPSHOT20200916214648+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 21:46:48 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200916171021+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 17:10:21 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200915122323+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Port scripting engine from QTScript to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 15 Sep 2020 12:23:23 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Replace usage of QJSEngine:importModule to compile with QT5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 01 Jul 2020 12:44:47 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200630174341+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Change numbering to old Ubuntu scheme
+  * Fix compilation error for scripting code compatible with QT 5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 30 Jun 2020 17:43:41 +0200
+
+amarok (2.9.70+1SNAPSHOT20200626194036+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Second release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 26 Jun 2020 19:40:36 +0200
+
+amarok (2.9.70+1SNAPSHOT20200623170346+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * First release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 23 Jun 2020 17:03:46 +0200
+
+amarok (2.9.70+1SNAPSHOT20200616130454+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Fix crash in breadcrumb when deleting the child menu of a category
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 16 Jun 2020 13:04:54 +0200
+
+amarok (2.9.70+1SNAPSHOT20200612103823+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Fix crash when closing Edit Filter dialog
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 12 Jun 2020 10:38:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200504192042+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Fix error message at PlaylistDock
+  * add Dockerfile for Neon 18.04 and Ubuntu 20.04
+  * add debian packaging conf for Ubuntu 20.04 
+  * Reorganize dir structure for packaging configuration and Dockerfiles
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Sat, 25 Apr 2020 22:38:26 +0200
+
+amarok (2.9.70+1SNAPSHOT20200424193358+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Fix breadcrumb
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 24 Apr 2020 19:34:09 +0200
+
+amarok (2.9.70+1SNAPSHOT20200410173239+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * add missing libkf5doctools-dev to control file
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 10 Apr 2020 17:32:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200407170839+0200-0ubuntu1ppa1~ubuntu19.10.1) eoan; urgency=medium
+
+  * Initial release 
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 07 Apr 2020 17:16:20 +0200
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/control b/distribution/deb_packaging/ubuntu/19.10/debian/control
new file mode 100644
index 0000000000..f5b7b73e4e
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/19.10/debian/control
@@ -0,0 +1,79 @@
+Source: amarok
+Section: sound
+Priority: optional
+Maintainer: Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+Build-Depends: debhelper-compat (= 12),
+               cmake,
+               extra-cmake-modules,
+               kirigami2-dev,
+               libavcodec-dev,
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
+               libcurl4-openssl-dev,
+               libfftw3-dev,
+               libgcrypt20-dev,
+               libgdk-pixbuf2.0-dev,
+               libgmock-dev,
+               libgpod-dev,
+               libkf5archive-dev,
+               libkf5attica-dev,
+               libkf5codecs-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5crash-dev,
+               libkf5dbusaddons-dev,
+               libkf5declarative-dev,
+               libkf5dnssd-dev,
+               libkf5doctools-dev,
+               libkf5globalaccel-dev,
+               libkf5guiaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kcmutils-dev,
+               libkf5kio-dev,
+               libkf5newstuff-dev,
+               libkf5notifications-dev,
+               libkf5notifyconfig-dev,
+               libkf5package-dev,
+               libkf5solid-dev,
+               libkf5texteditor-dev,
+               libkf5threadweaver-dev,
+               libkf5wallet-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               liblastfm5-dev,
+               libloudmouth1-dev,
+               libmariadbd-dev,
+               libmariadb-dev,
+               libmariadb-dev-compat,
+               libmtp-dev,
+               libmygpo-qt-dev,
+               libofa0-dev,
+               libphonon4qt5-dev,
+               libpostproc-dev,
+               libqt5svg5-dev,
+               libssl-dev,
+               libswscale-dev,
+               libtag1-dev,
+               libtag-extras-dev,
+               libxml2-dev,
+               pkg-config,
+               qtdeclarative5-dev,
+               qtquickcontrols2-5-dev,
+               qtscript5-dev,
+               qttools5-dev,
+               qtwebengine5-dev
+Standards-Version: 4.4.0
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
+
+Package: amarok
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Amarok for KDE5
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/copyright b/distribution/deb_packaging/ubuntu/19.10/debian/copyright
new file mode 100644
index 0000000000..cc1bc053dd
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/19.10/debian/copyright
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: amarok
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
+
+# If you want to use GPL v2 or later for the /debian/* files use
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2020 Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+#
+# If you need, there are some extra license texts available in two places:
+#   /usr/share/debhelper/dh_make/licenses/
+#   /usr/share/common-licenses/
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/rules b/distribution/deb_packaging/ubuntu/19.10/debian/rules
new file mode 100755
index 0000000000..2c67714039
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/19.10/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_OPTIONS=nocheck
+
+
+%:
+	dh $@
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config
+
+override_dh_shlibdeps:
+# Remove metapackage to be compatible with Neon
+	dh_shlibdeps -- -xqtdeclarative-abi-5-12-4
diff --git a/distribution/deb_packaging/ubuntu/19.10/debian/source/format b/distribution/deb_packaging/ubuntu/19.10/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/19.10/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/changelog b/distribution/deb_packaging/ubuntu/20.04/debian/changelog
new file mode 100644
index 0000000000..87b23565f3
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/20.04/debian/changelog
@@ -0,0 +1,87 @@
+amarok (2:2.9.70+1SNAPSHOT20200916214648+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 21:46:48 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200916171021+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 16 Sep 2020 17:10:21 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200915122323+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Port scripting engine from QTScript to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 15 Sep 2020 12:23:23 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200703102146+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Remove dependency to metapackage qtdeclarative-abi that prevents installation to Neon
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 03 Jul 2020 10:21:46 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200701124447+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Replace usage of QJSEngine:importModule to compile with QT5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Wed, 01 Jul 2020 12:44:47 +0200
+
+amarok (2:2.9.70+1SNAPSHOT20200630174341+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Change numbering to old Ubuntu scheme
+  * Fix compilation error for scripting code compatible with QT 5.8
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 30 Jun 2020 17:43:41 +0200
+
+amarok (2.9.70+1SNAPSHOT20200626194036+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Second release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 26 Jun 2020 19:40:36 +0200
+
+amarok (2.9.70+1SNAPSHOT20200623170346+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * First release of script engine porting to QJSEngine
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 23 Jun 2020 17:03:46 +0200
+
+amarok (2.9.70+1SNAPSHOT20200616130454+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Fix crash in breadcrumb when deleting the child menu of a category
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 16 Jun 2020 13:04:54 +0200
+
+amarok (2.9.70+1SNAPSHOT20200612103823+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Fix crash when closing Edit Filter dialog
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 12 Jun 2020 10:38:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200504192042+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Fix error message at PlaylistDock
+  * add Dockerfile for Neon 18.04 and Ubuntu 20.04
+  * add debian packaging conf for Ubuntu 20.04 
+  * Reorganize dir structure for packaging configuration and Dockerfiles
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Sat, 25 Apr 2020 22:38:26 +0200
+
+amarok (2.9.70+1SNAPSHOT20200424193358+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Fix breadcrumb
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 24 Apr 2020 19:34:09 +0200
+
+amarok (2.9.70+1SNAPSHOT20200410173239+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * add missing libkf5doctools-dev to control file
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Fri, 10 Apr 2020 17:32:23 +0200
+
+amarok (2.9.70+1SNAPSHOT20200407170839+0200-0ubuntu1ppa1~ubuntu20.04.1) focal; urgency=medium
+
+  * Initial release 
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  Tue, 07 Apr 2020 17:16:20 +0200
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/control b/distribution/deb_packaging/ubuntu/20.04/debian/control
new file mode 100644
index 0000000000..f5b7b73e4e
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/20.04/debian/control
@@ -0,0 +1,79 @@
+Source: amarok
+Section: sound
+Priority: optional
+Maintainer: Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+Build-Depends: debhelper-compat (= 12),
+               cmake,
+               extra-cmake-modules,
+               kirigami2-dev,
+               libavcodec-dev,
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
+               libcurl4-openssl-dev,
+               libfftw3-dev,
+               libgcrypt20-dev,
+               libgdk-pixbuf2.0-dev,
+               libgmock-dev,
+               libgpod-dev,
+               libkf5archive-dev,
+               libkf5attica-dev,
+               libkf5codecs-dev,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5crash-dev,
+               libkf5dbusaddons-dev,
+               libkf5declarative-dev,
+               libkf5dnssd-dev,
+               libkf5doctools-dev,
+               libkf5globalaccel-dev,
+               libkf5guiaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5kcmutils-dev,
+               libkf5kio-dev,
+               libkf5newstuff-dev,
+               libkf5notifications-dev,
+               libkf5notifyconfig-dev,
+               libkf5package-dev,
+               libkf5solid-dev,
+               libkf5texteditor-dev,
+               libkf5threadweaver-dev,
+               libkf5wallet-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               liblastfm5-dev,
+               libloudmouth1-dev,
+               libmariadbd-dev,
+               libmariadb-dev,
+               libmariadb-dev-compat,
+               libmtp-dev,
+               libmygpo-qt-dev,
+               libofa0-dev,
+               libphonon4qt5-dev,
+               libpostproc-dev,
+               libqt5svg5-dev,
+               libssl-dev,
+               libswscale-dev,
+               libtag1-dev,
+               libtag-extras-dev,
+               libxml2-dev,
+               pkg-config,
+               qtdeclarative5-dev,
+               qtquickcontrols2-5-dev,
+               qtscript5-dev,
+               qttools5-dev,
+               qtwebengine5-dev
+Standards-Version: 4.4.0
+Homepage: https://amarok.kde.org/
+Vcs-Browser: https://github.com/pcgomes/amarok
+Vcs-Git: https://github.com/pcgomes/amarok.git
+
+Package: amarok
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Amarok for KDE5
+ (K)ubuntu, starting from 19.10, does not support applications that were not ported to QT5.
+ Amarok has not concluded the ported yet, but is usable. So I create packages for KDE5
+ until the port is concluded, and (K)ubuntu releases Amarok packages again.
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/copyright b/distribution/deb_packaging/ubuntu/20.04/debian/copyright
new file mode 100644
index 0000000000..cc1bc053dd
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/20.04/debian/copyright
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: amarok
+Source: <url://example.com>
+
+Files: *
+Copyright: <years> <put author's name and email here>
+           <years> <likewise for another author>
+License: <special license>
+ <Put the license of the package here indented by 1 space>
+ <This follows the format of Description: lines in control file>
+ .
+ <Including paragraphs>
+
+# If you want to use GPL v2 or later for the /debian/* files use
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2020 Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+#
+# If you need, there are some extra license texts available in two places:
+#   /usr/share/debhelper/dh_make/licenses/
+#   /usr/share/common-licenses/
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/rules b/distribution/deb_packaging/ubuntu/20.04/debian/rules
new file mode 100755
index 0000000000..37a422338f
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/20.04/debian/rules
@@ -0,0 +1,30 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_OPTIONS=nocheck
+
+
+%:
+	dh $@
+
+
+# dh_make generated override targets
+# This is example for Cmake (See https://bugs.debian.org/641051 )
+override_dh_auto_configure:
+#	dh_auto_configure -- #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config
+
+override_dh_shlibdeps:
+# Remove metapackage to be compatible with Neon
+	dh_shlibdeps -- -xqtdeclarative-abi-5-12-8
diff --git a/distribution/deb_packaging/ubuntu/20.04/debian/source/format b/distribution/deb_packaging/ubuntu/20.04/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/20.04/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/distribution/deb_packaging/ubuntu/changelog_edit.sh b/distribution/deb_packaging/ubuntu/changelog_edit.sh
new file mode 100755
index 0000000000..80d5399405
--- /dev/null
+++ b/distribution/deb_packaging/ubuntu/changelog_edit.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+DATENOW=$(date "+%s"); for i in 18.04_bionic 19.10_eoan 20.04_focal; do version=$(echo $i|cut -d_ -f1); code=$(echo $i|cut -d_ -f2); cat << EOF > ${version}/new_cl_entry; cat ${version}/new_cl_entry ${version}/debian/changelog > ${version}/new_cl; mv ${version}/new_cl ${version}/debian/changelog; rm ${version}/new_cl*; done
+amarok (2:2.9.70+1SNAPSHOT$(date -d "@${DATENOW}" +"%Y%m%d%H%M%S%z")-0ubuntu1ppa1~ubuntu${version}.1) ${code}; urgency=medium
+
+  * Fix compilation error when optional qttools5-dev is not present
+
+ -- Pedro de Carvalho Gomes <pedrogomes81@gmail.com>  $(date -R -d "@${DATENOW}")
+
+EOF
diff --git a/distribution/docker/neon/5.18-unstable/Dockerfile b/distribution/docker/neon/5.18-unstable/Dockerfile
new file mode 100644
index 0000000000..7f58b2081c
--- /dev/null
+++ b/distribution/docker/neon/5.18-unstable/Dockerfile
@@ -0,0 +1,27 @@
+FROM kdeneon/plasma:unstable
+USER root
+WORKDIR /root
+ENV container docker
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DISPLAY=:0
+RUN apt-get update; apt-get upgrade -y;
+# amarok build dependencies
+RUN apt-get install -y cmake extra-cmake-modules g++ git libaio-dev libmariadb-dev libmariadbd-dev libmariadbclient-dev-compat pkg-config  \
+    qtdeclarative5-dev qtscript5-dev libqt5svg5-dev qtquickcontrols2-5-dev qtwebengine5-dev libkf5archive-dev libkf5attica-dev \
+    libkf5codecs-dev libkf5config-dev libkf5configwidgets-dev libkf5coreaddons-dev libkf5crash-dev libkf5dbusaddons-dev \
+    libkf5declarative-dev libkf5dnssd-dev libkf5globalaccel-dev libkf5guiaddons-dev libkf5i18n-dev libkf5iconthemes-dev \
+    libkf5kcmutils-dev libkf5kio-dev libkf5newstuff-dev libkf5notifications-dev libkf5notifyconfig-dev libkf5package-dev libkf5solid-dev \
+    libkf5texteditor-dev libkf5threadweaver-dev libkf5widgetsaddons-dev libkf5windowsystem-dev libkf5wallet-dev kirigami2-dev \
+    gettext libtag1-dev libtag-extras-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev \
+    libgpod-dev libgdk-pixbuf2.0-dev libmtp-dev libcurl4-openssl-dev libxml2-dev libssl-dev libgcrypt20-dev \
+    libfftw3-dev libloudmouth1-dev libofa0-dev liblastfm5-dev libkf5auth-dev libkf5parts-dev libkf5service-dev \
+    libkf5webengineviewer-dev libqt5webchannel5-dev libkf5bookmarks-dev libkf5completion-dev libkf5itemviews-dev \
+    libkf5jobwidgets-dev libkf5xmlgui-dev libkf5textwidgets-dev libkf5sonnet-dev
+# fetch code
+RUN git clone https://github.com/pcgomes/amarok.git
+# configure build with cmake
+RUN mkdir -p amarok/build
+RUN cmake -DCMAKE_BUILD_TYPE=Debug -B amarok/build -S amarok
+# build it
+RUN make install
+CMD ["/bin/bash"]
diff --git a/distribution/docker/ubuntu/18.04/Dockerfile b/distribution/docker/ubuntu/18.04/Dockerfile
new file mode 100644
index 0000000000..77975eb6c6
--- /dev/null
+++ b/distribution/docker/ubuntu/18.04/Dockerfile
@@ -0,0 +1,27 @@
+FROM ubuntu:18.04
+USER root
+WORKDIR /root
+ENV container docker
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DISPLAY=:0
+RUN apt-get update; apt-get upgrade -y;
+# amarok build dependencies
+RUN apt-get install -y cmake extra-cmake-modules g++ git libaio-dev libmariadb-dev libmariadbd-dev libmariadbclient-dev-compat pkg-config  \
+    qtdeclarative5-dev qtscript5-dev libqt5svg5-dev qtquickcontrols2-5-dev qtwebengine5-dev libphonon4qt5-dev libkf5archive-dev libkf5attica-dev \
+    libkf5codecs-dev libkf5config-dev libkf5configwidgets-dev libkf5coreaddons-dev libkf5crash-dev libkf5dbusaddons-dev \
+    libkf5declarative-dev libkf5dnssd-dev libkf5doctools-dev libkf5globalaccel-dev libkf5guiaddons-dev libkf5i18n-dev libkf5iconthemes-dev \
+    libkf5kcmutils-dev libkf5kio-dev libkf5newstuff-dev libkf5notifications-dev libkf5notifyconfig-dev libkf5package-dev libkf5solid-dev \
+    libkf5texteditor-dev libkf5threadweaver-dev libkf5widgetsaddons-dev libkf5windowsystem-dev libkf5wallet-dev kirigami2-dev \
+    gettext libtag1-dev libtag-extras-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev \
+    libgdk-pixbuf2.0-dev libmtp-dev libcurl4-openssl-dev libxml2-dev libssl-dev libgcrypt20-dev \
+    libfftw3-dev libloudmouth1-dev libofa0-dev liblastfm5-dev libkf5auth-dev libkf5parts-dev libkf5service-dev \
+    libkf5webengineviewer-dev libqt5webchannel5-dev libkf5bookmarks-dev libkf5completion-dev libkf5itemviews-dev \
+    libkf5jobwidgets-dev libkf5xmlgui-dev libkf5textwidgets-dev libkf5sonnet-dev
+# fetch code
+RUN git clone https://github.com/pcgomes/amarok.git
+# configure build with cmake
+RUN mkdir -p amarok/build
+RUN cmake -DCMAKE_BUILD_TYPE=Debug -B amarok/build -S amarok
+# build it
+RUN make install
+CMD ["/bin/bash"]
diff --git a/distribution/docker/ubuntu/19.10/Dockerfile b/distribution/docker/ubuntu/19.10/Dockerfile
new file mode 100644
index 0000000000..ae5c839079
--- /dev/null
+++ b/distribution/docker/ubuntu/19.10/Dockerfile
@@ -0,0 +1,25 @@
+FROM ubuntu:19.10
+USER root
+WORKDIR /root
+ENV container docker
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DISPLAY=:0
+RUN apt-get update; apt-get upgrade -y;
+# amarok build dependencies
+RUN apt-get install -y cmake extra-cmake-modules g++ git libmariadb-dev libmariadbd-dev pkg-config  \
+    qtdeclarative5-dev qtscript5-dev libqt5svg5-dev qtquickcontrols2-5-dev qtwebengine5-dev  \
+    libkf5archive-dev libkf5attica-dev libkf5codecs-dev libkf5config-dev libkf5configwidgets-dev libkf5coreaddons-dev libkf5crash-dev \
+    libkf5dbusaddons-dev libkf5declarative-dev libkf5dnssd-dev libkf5globalaccel-dev libkf5guiaddons-dev libkf5i18n-dev libkf5iconthemes-dev \
+    libkf5kcmutils-dev libkf5kio-dev libkf5newstuff-dev libkf5notifications-dev libkf5notifyconfig-dev libkf5package-dev libkf5solid-dev \
+    libkf5texteditor-dev libkf5threadweaver-dev libkf5widgetsaddons-dev libkf5windowsystem-dev libkf5wallet-dev kirigami2-dev \
+    gettext libtag1-dev libtag-extras-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev \
+    libgpod-dev libgdk-pixbuf2.0-dev libmygpo-qt-dev libmtp-dev libcurl4-openssl-dev libxml2-dev libssl-dev libgcrypt20-dev \
+    libfftw3-dev libloudmouth1-dev libofa0-dev liblastfm5-dev libgmock-dev libkf5doctools-dev
+# fetch code
+RUN git clone https://github.com/pcgomes/amarok.git
+# configure build with cmake
+RUN mkdir -p amarok/build
+RUN cmake -DCMAKE_BUILD_TYPE=Debug -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config -DMYSQL_INCLUDE_DIR=/usr/include/mariadb  -B amarok/build -S amarok
+# build it
+RUN make install
+CMD ["/bin/bash"]
diff --git a/distribution/docker/ubuntu/20.04/Dockerfile b/distribution/docker/ubuntu/20.04/Dockerfile
new file mode 100644
index 0000000000..decae88287
--- /dev/null
+++ b/distribution/docker/ubuntu/20.04/Dockerfile
@@ -0,0 +1,25 @@
+FROM ubuntu:20.04
+USER root
+WORKDIR /root
+ENV container docker
+ENV DEBIAN_FRONTEND=noninteractive
+ENV DISPLAY=:0
+RUN apt-get update; apt-get upgrade -y;
+# amarok build dependencies
+RUN apt-get install -y cmake extra-cmake-modules g++ git pkg-config dpkg-dev libmariadb-dev libmariadbd-dev libmariadb-dev-compat \
+    qtdeclarative5-dev qtscript5-dev libqt5svg5-dev qtquickcontrols2-5-dev qtwebengine5-dev libphonon4qt5-dev kirigami2-dev \
+    libkf5archive-dev libkf5attica-dev libkf5codecs-dev libkf5config-dev libkf5configwidgets-dev libkf5coreaddons-dev libkf5crash-dev \
+    libkf5dbusaddons-dev libkf5declarative-dev libkf5dnssd-dev libkf5globalaccel-dev libkf5guiaddons-dev libkf5i18n-dev libkf5iconthemes-dev \
+    libkf5kcmutils-dev libkf5kio-dev libkf5newstuff-dev libkf5notifications-dev libkf5notifyconfig-dev libkf5package-dev libkf5solid-dev \
+    libkf5texteditor-dev libkf5threadweaver-dev libkf5widgetsaddons-dev libkf5windowsystem-dev libkf5wallet-dev libkf5doctools-dev \
+    gettext libtag1-dev libtag-extras-dev libavcodec-dev libavformat-dev libavdevice-dev libavutil-dev libswscale-dev libpostproc-dev \
+    libgpod-dev libgdk-pixbuf2.0-dev libmygpo-qt-dev libmtp-dev libcurl4-openssl-dev libxml2-dev libssl-dev libgcrypt20-dev \
+    libfftw3-dev libloudmouth1-dev libofa0-dev liblastfm5-dev libgmock-dev
+# fetch code
+RUN git clone https://github.com/pcgomes/amarok.git
+# configure build with cmake
+RUN mkdir -p amarok/build
+RUN cmake -DCMAKE_BUILD_TYPE=Debug -DMYSQLCONFIG_EXECUTABLE=/usr/bin/mariadb_config -DMYSQL_INCLUDE_DIR=/usr/include/mariadb -B amarok/build -S amarok
+# build it
+RUN make install
+CMD ["/bin/bash"]
diff --git a/release_scripts/generate_changelog.rb b/release_scripts/generate_changelog.rb
index a6c4458cfa..3e0a3e72e4 100755
--- a/release_scripts/generate_changelog.rb
+++ b/release_scripts/generate_changelog.rb
@@ -25,7 +25,7 @@
 $changelog.gsub!(/\n{2,}/, "\n")
 
 # Replace bug number with direct link to bugs.kde.org
-$changelog.gsub!(/BR (\d+)/, '<a href="http://bugs.kde.org/show_bug.cgi?id=\\1">\\0</a>')
+$changelog.gsub!(/BR (\d+)/, '<a href="https://bugs.kde.org/show_bug.cgi?id=\\1">\\0</a>')
 
 # Make bullets
 bullet_item_regexp =
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cfff9631c2..eac57e0cb2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -442,6 +442,7 @@ set(scriptengine_SRCS
     scripting/scriptengine/AmarokEqualizerScript.cpp
     scripting/scriptengine/AmarokInfoScript.cpp
     scripting/scriptengine/AmarokKNotifyScript.cpp
+    scripting/scriptengine/AmarokLyricsScript.cpp
     scripting/scriptengine/AmarokNetworkScript.cpp
     scripting/scriptengine/AmarokOSDScript.cpp
     scripting/scriptengine/AmarokPlaylistManagerScript.cpp
@@ -464,6 +465,29 @@ set(scriptengine_SRCS
     scripting/scriptengine/exporters/ScriptableBiasExporter.cpp
 )
 
+set(qtbindings_SRCS
+    scripting/scriptengine/qtbindings/CoreByteArray.cpp
+    scripting/scriptengine/qtbindings/CoreCoreApplication.cpp
+    scripting/scriptengine/qtbindings/CoreDir.cpp
+    scripting/scriptengine/qtbindings/CoreFile.cpp
+    scripting/scriptengine/qtbindings/CoreFileInfo.cpp
+    scripting/scriptengine/qtbindings/CoreIODevice.cpp
+    scripting/scriptengine/qtbindings/CoreLocale.cpp
+    scripting/scriptengine/qtbindings/CoreResource.cpp
+    scripting/scriptengine/qtbindings/CoreTextCodec.cpp
+    scripting/scriptengine/qtbindings/CoreTextStream.cpp
+    scripting/scriptengine/qtbindings/CoreTranslator.cpp
+    scripting/scriptengine/qtbindings/CoreUrl.cpp
+    scripting/scriptengine/qtbindings/GuiCheckBox.cpp
+    scripting/scriptengine/qtbindings/GuiDialogButtonBox.cpp
+    scripting/scriptengine/qtbindings/GuiLabel.cpp
+    scripting/scriptengine/qtbindings/SqlSqlQuery.cpp
+)
+if( Qt5UiTools_FOUND )
+    # Append below all files from QtBindings::UiTools namespace
+    list(APPEND qtbindings_SRCS scripting/scriptengine/qtbindings/UiToolsUiLoader.cpp)
+endif()
+
 set(scriptconsole_SRCS
     scripting/scriptconsole/CompletionModel.cpp
     scripting/scriptconsole/ScriptConsole.cpp
@@ -605,6 +629,7 @@ set(amaroklib_LIB_SRCS
     ${libplaylistbrowser_SRCS}
     ${libplaylistmanager_SRCS}
     ${dbus_SRCS}
+    ${qtbindings_SRCS}
     ${scriptengine_SRCS}
     ${scriptconsole_SRCS}
     ${libstatusbar_SRCS}
@@ -764,7 +789,7 @@ if( LIBOFA_FOUND AND AVCODEC_FOUND AND AVFORMAT_FOUND AND AVUTIL_FOUND )
         musicbrainz/MusicDNSAudioDecoder.cpp
         musicbrainz/MusicDNSFinder.cpp
         musicbrainz/MusicDNSXmlParser.cpp
-    )
+            )
 endif()
 
 qt5_add_dbus_adaptor(
@@ -823,12 +848,10 @@ target_link_libraries(amaroklib
     KF5::ThreadWeaver
     KF5::WidgetsAddons
     KF5::WindowSystem
-    ${QT_QTSCRIPTTOOLS_LIBRARY}
     Qt5::Gui
+    Qt5::Qml
     Qt5::Quick
     Qt5::QuickWidgets
-    Qt5::Script
-    Qt5::ScriptTools
     Qt5::Sql
     Qt5::Svg
     ${CMAKE_DL_LIBS}
@@ -845,6 +868,11 @@ if( Qt5WebEngine_FOUND )
     add_definitions( -DWITH_QT_WEBENGINE )
 endif()
 
+if( Qt5UiTools_FOUND )
+    target_link_libraries( amaroklib Qt5::UiTools )
+    add_definitions( -DWITH_QT_UITOOLS )
+endif()
+
 include_directories(${TAGLIB_INCLUDES})
 add_definitions(${TAGLIB_CFLAGS})
 target_link_libraries(amaroklib ${TAGLIB_LIBRARIES})
@@ -910,7 +938,11 @@ install(FILES amarok_codecinstall.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPE
 install(FILES amarok_append.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/ServiceMenus)
 install(FILES amarok-play-audiocd.desktop DESTINATION ${KDE_INSTALL_DATADIR}/solid/actions)
 
-install(FILES amarok.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+if( ${ECM_VERSION} STRGREATER "5.58.0" )
+    install(FILES amarok.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+else()
+    install(FILES amarok.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+endif()
 
 # protocol handlers
 install(FILES amarokurls/amarok.protocol  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR})
diff --git a/src/EngineController.cpp b/src/EngineController.cpp
index 5468b19a3b..b8be7a26d0 100644
--- a/src/EngineController.cpp
+++ b/src/EngineController.cpp
@@ -286,7 +286,7 @@ EngineController::restoreSession()
         Meta::TrackPtr track = CollectionManager::instance()->trackForUrl( url );
 
         // Only give a resume time for local files, because resuming remote protocols can have weird side effects.
-        // See: http://bugs.kde.org/show_bug.cgi?id=172897
+        // See: https://bugs.kde.org/show_bug.cgi?id=172897
         if( url.isLocalFile() )
             play( track, AmarokConfig::resumeTime(), AmarokConfig::resumePaused() );
         else
diff --git a/src/aboutdialog/ExtendedAboutDialog.cpp b/src/aboutdialog/ExtendedAboutDialog.cpp
index 52aac03f70..7a714af06b 100644
--- a/src/aboutdialog/ExtendedAboutDialog.cpp
+++ b/src/aboutdialog/ExtendedAboutDialog.cpp
@@ -229,7 +229,7 @@ ExtendedAboutDialog::ExtendedAboutDialog(const KAboutData &about, const OcsData
             if (!aboutData->customAuthorTextEnabled())
             {
                 if (aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.kde.org")
-                    bugsLabel->setText( i18n("Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report bugs.\n") );
+                    bugsLabel->setText( i18n("Please use <a href=\"https://bugs.kde.org\">https://bugs.kde.org</a> to report bugs.\n") );
                 else
                 {
                     if(aboutData->authors().count() == 1 && (aboutData->authors().first().emailAddress() == aboutData->bugAddress()))
diff --git a/src/amarok-contextapplet.desktop b/src/amarok-contextapplet.desktop
index dd880e9766..bd4377d413 100644
--- a/src/amarok-contextapplet.desktop
+++ b/src/amarok-contextapplet.desktop
@@ -5,8 +5,8 @@ Comment=Plugin for Amarok
 Comment[be]=Утулка для Amarok
 Comment[bg]=Приставка за Amarok
 Comment[bs]=Priključak za Amarok
-Comment[ca]=Connector per l'Amarok
-Comment[ca@valencia]=Connector per l'Amarok
+Comment[ca]=Connector per a l'Amarok
+Comment[ca@valencia]=Connector per a l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[csb]=Wtëkôcz dlô Amaroka
 Comment[da]=Plugin til Amarok
diff --git a/src/amarok-plugin.desktop b/src/amarok-plugin.desktop
index 326cc2fa1e..f8d3ec9490 100644
--- a/src/amarok-plugin.desktop
+++ b/src/amarok-plugin.desktop
@@ -5,8 +5,8 @@ Comment=Plugin for Amarok
 Comment[be]=Утулка для Amarok
 Comment[bg]=Приставка за Amarok
 Comment[bs]=Priključak za Amarok
-Comment[ca]=Connector per l'Amarok
-Comment[ca@valencia]=Connector per l'Amarok
+Comment[ca]=Connector per a l'Amarok
+Comment[ca@valencia]=Connector per a l'Amarok
 Comment[cs]=Modul pro AmaroK
 Comment[csb]=Wtëkôcz dlô Amaroka
 Comment[da]=Plugin til Amarok
diff --git a/src/browsers/BrowserBreadcrumbWidget.cpp b/src/browsers/BrowserBreadcrumbWidget.cpp
index 6c0499ab48..1b41c4faeb 100644
--- a/src/browsers/BrowserBreadcrumbWidget.cpp
+++ b/src/browsers/BrowserBreadcrumbWidget.cpp
@@ -37,38 +37,29 @@
 BrowserBreadcrumbWidget::BrowserBreadcrumbWidget( QWidget * parent )
     : BoxWidget( false, parent)
     , m_rootList( nullptr )
-    , m_childMenuButton( nullptr )
 {
     setFixedHeight( 28 );
     setContentsMargins( 3, 0, 3, 0 );
 
     m_breadcrumbArea = new BoxWidget( false, this );
     m_breadcrumbArea->setContentsMargins( 0, 0, 0, 0 );
-    static_cast<QBoxLayout*>( layout() )->setStretchFactor( m_breadcrumbArea, 10 );
+    layout()->setStretchFactor( m_breadcrumbArea, 10 );
 
     new BreadcrumbUrlMenuButton( QStringLiteral("navigate"), this );
-
-    m_spacer = new QWidget( nullptr );
 }
 
 BrowserBreadcrumbWidget::~BrowserBreadcrumbWidget()
 {
-    clearCrumbs();
 }
 
 void
 BrowserBreadcrumbWidget::clearCrumbs()
 {
-    foreach( BrowserBreadcrumbItem *item, m_items )
+    const QList<QWidget *> childCrumbs = m_breadcrumbArea->findChildren<QWidget *>(QString(), Qt::FindDirectChildrenOnly);
+    for( auto item : childCrumbs)
     {
-        item->hide();
         item->deleteLater();
     }
-    m_items.clear();
-
-    //if we have a final menu button, also delete it.
-    delete m_childMenuButton;
-    m_childMenuButton = 0;
 }
 
 void
@@ -89,10 +80,11 @@ BrowserBreadcrumbWidget::updateBreadcrumbs()
         return;
 
     clearCrumbs();
-    m_spacer->setParent( this );
 
     addLevel( m_rootList );
-    m_breadcrumbArea->layout()->addWidget( m_spacer );
+
+    // spacer is the right-most widget
+    new QWidget(m_breadcrumbArea);
 
     showAsNeeded();
 }
@@ -102,7 +94,6 @@ BrowserBreadcrumbWidget::addLevel( BrowserCategoryList *list )
 {
     BrowserBreadcrumbItem *item = list->breadcrumb();
     addBreadCrumbItem( item );
-    m_items.append( item );
 
     BrowserCategory *childCategory = list->activeCategory();
 
@@ -120,11 +111,10 @@ BrowserBreadcrumbWidget::addLevel( BrowserCategoryList *list )
         {
             BrowserBreadcrumbItem *leaf = childCategory->breadcrumb();
             addBreadCrumbItem( leaf );
-            m_items.append( leaf );
 
             const QList<BrowserBreadcrumbItem*> additionalItems = childCategory->additionalItems();
             //no children, but check if there are additional breadcrumb levels (for internal navigation in the category) that should be added anyway.
-            foreach( BrowserBreadcrumbItem *addItem, additionalItems )
+            for( BrowserBreadcrumbItem *addItem : additionalItems )
             {
                 //hack to ensure that we have not already added it to the front of the breadcrumb...
                 addBreadCrumbItem( addItem );
@@ -142,16 +132,16 @@ BrowserBreadcrumbWidget::addLevel( BrowserCategoryList *list )
         BrowserCategoryList *childList = qobject_cast<BrowserCategoryList*>( list );
         if( childList )
         {
-            m_childMenuButton = new BreadcrumbItemMenuButton( m_breadcrumbArea );
+            auto childMenuButton = new BreadcrumbItemMenuButton( m_breadcrumbArea );
 
-            QMenu *menu = new QMenu( item );
+            auto menu = new QMenu( item );
             menu->hide();
 
             QMap<QString,BrowserCategory *> childMap =  childList->categories();
 
-            QStringList childNames = childMap.keys();
+            const QStringList childNames = childMap.keys();
 
-            foreach( const QString &siblingName, childNames )
+            for( const QString &siblingName : childNames )
             {
                 //no point in adding ourselves to this menu
                 if ( siblingName == list->name() )
@@ -164,7 +154,7 @@ BrowserBreadcrumbWidget::addLevel( BrowserCategoryList *list )
 
             }
 
-            m_childMenuButton->setMenu( menu );
+            childMenuButton->setMenu( menu );
 
             //do a little magic to line up items in the menu with the current item
             int offset = 6;
@@ -178,15 +168,13 @@ BrowserBreadcrumbWidget::addLevel( BrowserCategoryList *list )
 void
 BrowserBreadcrumbWidget::addBreadCrumbItem( BrowserBreadcrumbItem *item )
 {
-    item->hide();
-    item->setParent( this ); // may be already shown, we want it to be last, so reparent
-    m_breadcrumbArea->layout()->addWidget( item );
+    item->setParent( m_breadcrumbArea );
 }
 
 void BrowserBreadcrumbWidget::resizeEvent( QResizeEvent *event )
 {
     Q_UNUSED( event )
-    // we need to postpone the call, because hideAsNeeded() itself may trigger resizeEvent
+    // we need to postpone the call, because showAsNeeded() itself may trigger resizeEvent
     QTimer::singleShot( 0 , this, &BrowserBreadcrumbWidget::showAsNeeded );
 }
 
@@ -201,17 +189,7 @@ void BrowserBreadcrumbWidget::showAsNeeded()
     //make a temp list that includes both regular items and add items
     QList<BrowserBreadcrumbItem *> allItems;
 
-    allItems.append( m_items );
-    if( m_rootList->activeCategory() )
-        allItems.append( m_rootList->activeCategory()->additionalItems() );
-
-    // filter-out leftover items not parented to m_breadcrumbArea (bug 285712):
-    QMutableListIterator<BrowserBreadcrumbItem *> it( allItems );
-    while( it.hasNext() )
-    {
-        if( it.next()->parent() != m_breadcrumbArea )
-            it.remove();
-    }
+    allItems.append( m_breadcrumbArea->findChildren<BrowserBreadcrumbItem *>(QString(), Qt::FindDirectChildrenOnly));
 
     if( allItems.isEmpty() )
         return;
diff --git a/src/browsers/BrowserBreadcrumbWidget.h b/src/browsers/BrowserBreadcrumbWidget.h
index 0884430b38..3e8e47b62b 100644
--- a/src/browsers/BrowserBreadcrumbWidget.h
+++ b/src/browsers/BrowserBreadcrumbWidget.h
@@ -103,12 +103,8 @@ private Q_SLOTS:
     //QStringList m_currentPath;
     BrowserCategoryList * m_rootList;
 
-    QList<BrowserBreadcrumbItem *> m_items;
-    QWidget *m_spacer;
     BoxWidget *m_breadcrumbArea;
 
-    BreadcrumbItemMenuButton *m_childMenuButton;
-
 };
 
 #endif
diff --git a/src/browsers/BrowserCategoryListModel.cpp b/src/browsers/BrowserCategoryListModel.cpp
index 724278f8b1..625d10dba8 100644
--- a/src/browsers/BrowserCategoryListModel.cpp
+++ b/src/browsers/BrowserCategoryListModel.cpp
@@ -60,7 +60,7 @@ BrowserCategoryListModel::data( const QModelIndex &index, int role ) const
             return QVariant( m_categories[index.row()]->longDescription() );
 
         case CustomCategoryRoles::CategoryRole:
-            return qVariantFromValue( m_categories[index.row()] );
+            return QVariant::fromValue( m_categories[index.row()] );
 
         default:
             return QVariant();
diff --git a/src/browsers/CollectionTreeView.cpp b/src/browsers/CollectionTreeView.cpp
index 25779aad2b..9d7b0c9413 100644
--- a/src/browsers/CollectionTreeView.cpp
+++ b/src/browsers/CollectionTreeView.cpp
@@ -1150,7 +1150,7 @@ CollectionTreeView::createExtendedActions( const QModelIndexList &indices )
             QActionList gActions = The::globalCollectionActions()->actionsFor( item->data() );
             foreach( QAction *action, gActions )
             {
-                if( action ) // Can become 0-pointer, see http://bugs.kde.org/show_bug.cgi?id=183250
+                if( action ) // Can become 0-pointer, see https://bugs.kde.org/show_bug.cgi?id=183250
                 {
                     actions.append( action );
                     debug() << "Got global action: " << action->text();
diff --git a/src/configdialog/dialogs/PlaybackConfig.cpp b/src/configdialog/dialogs/PlaybackConfig.cpp
index af1daa98ba..e1e6bf943f 100644
--- a/src/configdialog/dialogs/PlaybackConfig.cpp
+++ b/src/configdialog/dialogs/PlaybackConfig.cpp
@@ -88,7 +88,7 @@ PlaybackConfig::configurePhonon() //SLOT
     KCMultiDialog KCM;
 
     KCM.setWindowTitle( i18n( "Sound System - Amarok" ) );
-    KCM.addModule( QStringLiteral("kcm_phonon") );
+    KCM.addModule( QStringLiteral("kcm_pulseaudio") );
     KCM.exec();
 }
 
diff --git a/src/configdialog/dialogs/ScriptsConfig.cpp b/src/configdialog/dialogs/ScriptsConfig.cpp
index e81753b507..77dd549f1c 100644
--- a/src/configdialog/dialogs/ScriptsConfig.cpp
+++ b/src/configdialog/dialogs/ScriptsConfig.cpp
@@ -249,15 +249,16 @@ ScriptsConfig::slotUninstallScript()
         return;
 
     ScriptItem *item = ScriptManager::instance()->m_scripts.value( m_selector->currentItem() );
+    /*
     int response = KMessageBox::warningContinueCancel( this, i18n( "You are advised to only uninstall manually "
                                                                     "installed scripts using this button." ) );
     if( response == KMessageBox::Cancel )
         return;
+    */
 
-    QRegExp regex( "(.*apps/amarok/scripts/.+/).*script.spec" );
-    regex.indexIn( item->info().entryPath() );
-    qDebug() << "About to remove folder " << regex.cap( 1 );
-    removeDir( regex.cap( 1 ) );
+    QFileInfo specFile( item->specPath() );
+    qDebug() << "About to remove folder " << specFile.path();
+    QDir( specFile.path() ).removeRecursively();
     m_timer->start();
 }
 
@@ -288,21 +289,3 @@ ScriptsConfig::findSpecFile( const KArchiveDirectory *dir ) const
     }
     return nullptr;
 }
-
-void
-ScriptsConfig::removeDir( const QString &dirPath ) const
-{
-    QDir dir( dirPath );
-    if( dir.exists( dirPath ) )
-    {
-        foreach( const QFileInfo &info, dir.entryInfoList( QDir::NoDotAndDotDot | QDir::System | QDir::Hidden  | QDir::AllDirs | QDir::Files ) )
-        {
-            if( info.isDir() )
-                removeDir( info.absoluteFilePath() );
-            else
-                QFile::remove( info.absoluteFilePath() );
-        }
-        dir.rmdir( dirPath );
-    }
-}
-
diff --git a/src/configdialog/dialogs/ScriptsConfig.h b/src/configdialog/dialogs/ScriptsConfig.h
index 053ab6ae7c..d7cddb4dd8 100644
--- a/src/configdialog/dialogs/ScriptsConfig.h
+++ b/src/configdialog/dialogs/ScriptsConfig.h
@@ -56,7 +56,6 @@ private Q_SLOTS:
 
 private:
     const KArchiveFile *findSpecFile( const KArchiveDirectory *dir ) const;
-    void removeDir( const QString &dirPath ) const;
 
     bool m_configChanged;
     ScriptSelector *m_selector;
diff --git a/src/context/applets/albums/package/metadata.desktop b/src/context/applets/albums/package/metadata.desktop
index 6075e4bedf..5a426e4e37 100644
--- a/src/context/applets/albums/package/metadata.desktop
+++ b/src/context/applets/albums/package/metadata.desktop
@@ -74,7 +74,10 @@ Comment[el]=Διαχειριστής εξωφύλλου άλμπουμ για τ
 Comment[en_GB]=Album cover manager for Amarok
 Comment[es]=Gestor de portadas de álbumes para Amarok
 Comment[et]=Amaroki kaanepildihaldur
+Comment[eu]=Amarok-en album azal kudeatzailea
 Comment[fr]=Gestionnaire de pochettes d'album pour Amarok
+Comment[gl]=Xestor de portadas de álbums para Amarok
+Comment[id]=Pengelola sampul album untuk Amarok
 Comment[it]=Gestore delle copertine per Amarok
 Comment[ko]=Amarok 앨범 커버 관리자
 Comment[nl]=Albumhoesbeheerder voor Amarok
diff --git a/src/context/applets/analyzer/package/metadata.desktop b/src/context/applets/analyzer/package/metadata.desktop
index d85dd5c800..07c2a03ddb 100644
--- a/src/context/applets/analyzer/package/metadata.desktop
+++ b/src/context/applets/analyzer/package/metadata.desktop
@@ -10,6 +10,7 @@ Name[el]=Αναλυτής
 Name[en_GB]=Analyser
 Name[es]=Analizador
 Name[et]=Analüüsija
+Name[eu]=Analizatzailea
 Name[fi]=Analysaattori
 Name[fr]=Analyseur
 Name[gl]=Analizador
@@ -49,7 +50,10 @@ Comment[el]=Μικροεφαρμογή ανάλυσης για το AmaroK
 Comment[en_GB]=Analyser applet for Amarok
 Comment[es]=Miniaplicación de análisis para Amarok
 Comment[et]=Amaroki analüüsiaplett
+Comment[eu]=Amarok-erako analizatzaile aplikaziotxoa
 Comment[fr]=Module d'analyseur pour Amarok
+Comment[gl]=Trebello de analizador para Amarok
+Comment[id]=Applet analyzer untuk Amarok
 Comment[it]=Applet dell'analizzatore per Amarok
 Comment[ko]=Amarok 분석기 애플릿
 Comment[nl]=Analyse-applet voor Amarok
diff --git a/src/context/applets/currenttrack/package/metadata.desktop b/src/context/applets/currenttrack/package/metadata.desktop
index fcb40e4db3..44e8fa4b40 100644
--- a/src/context/applets/currenttrack/package/metadata.desktop
+++ b/src/context/applets/currenttrack/package/metadata.desktop
@@ -65,7 +65,10 @@ Comment[el]=Μικροεφαρμογή τρέχοντος κομματιού γ
 Comment[en_GB]=Current track applet for Amarok
 Comment[es]=Miniaplicación de pista actual para Amarok
 Comment[et]=Amaroki aktiivse raja aplett
+Comment[eu]=Amarok-erako uneko pistako aplikaziotxoa
 Comment[fr]=Module de piste actuelle pour Amarok
+Comment[gl]=Trebello de pista actual para Amarok
+Comment[id]=Applet trek saat ini untuk Amarok
 Comment[it]=Applet della traccia attuale per Amarok
 Comment[ko]=Amarok 현재 트랙 애플릿
 Comment[nl]=Huidig track-applet voor Amarok
diff --git a/src/context/applets/lyrics/package/metadata.desktop b/src/context/applets/lyrics/package/metadata.desktop
index ad0e14776e..bcbdae7893 100644
--- a/src/context/applets/lyrics/package/metadata.desktop
+++ b/src/context/applets/lyrics/package/metadata.desktop
@@ -64,11 +64,15 @@ Comment[ca]=Miniaplicació de lletres per a l'Amarok
 Comment[ca@valencia]=Miniaplicació de lletres per a l'Amarok
 Comment[cs]=Applet pro texty písní pro Amarok
 Comment[da]=Sangtekst-applet til Amarok
+Comment[de]=Liedtext-Modul für Amarok
 Comment[el]=Μικροεφαρμογή στίχων για το AmaroK
 Comment[en_GB]=Lyrics applet for Amarok
 Comment[es]=Miniaplicación de letras para Amarok
 Comment[et]=Amaroki sõnadeaplett
+Comment[eu]=Amarok-erako hitzen aplikaziotxoa
 Comment[fr]=Module de paroles pour Amarok
+Comment[gl]=Trebello de letras de cancións para Amarok
+Comment[id]=Applet lirik untuk Amarok
 Comment[it]=Applet dei testi per Amarok
 Comment[ko]=Amarok 가사 애플릿
 Comment[nl]=Liedtekst-applet voor Amarok
diff --git a/src/context/applets/photos/package/metadata.desktop b/src/context/applets/photos/package/metadata.desktop
index 76c870f8c2..fc6e2136e4 100644
--- a/src/context/applets/photos/package/metadata.desktop
+++ b/src/context/applets/photos/package/metadata.desktop
@@ -63,11 +63,15 @@ Comment[ca]=Miniaplicació de fotos per a l'Amarok
 Comment[ca@valencia]=Miniaplicació de fotos per a l'Amarok
 Comment[cs]=Applet fotek pro Amarok
 Comment[da]=Foto-applet til Amarok
+Comment[de]=Foto-Modul für Amarok
 Comment[el]=Μικροεφαρμογή φωτογραφιών για το AmaroK
 Comment[en_GB]=Photos applet for Amarok
 Comment[es]=Miniaplicación de fotos para Amarok
 Comment[et]=Amaroki fotoaplett
+Comment[eu]=Amarok-erako argazkien aplikaziotxoa
 Comment[fr]=Module de photos pour Amarok
+Comment[gl]=Trebello de fotos para Amarok
+Comment[id]=Applet foto untuk Amarok
 Comment[it]=Applet delle foto per Amarok
 Comment[ko]=Amarok 사진 애플릿
 Comment[nl]=Foto's-applet voor Amarok
diff --git a/src/context/applets/wikipedia/package/metadata.desktop b/src/context/applets/wikipedia/package/metadata.desktop
index b11065601c..fdd292e051 100644
--- a/src/context/applets/wikipedia/package/metadata.desktop
+++ b/src/context/applets/wikipedia/package/metadata.desktop
@@ -63,11 +63,15 @@ Comment[ca]=Miniaplicació de la viquipèdia per a l'Amarok
 Comment[ca@valencia]=Miniaplicació de la viquipèdia per a l'Amarok
 Comment[cs]=Applet pro Wikipedii pro Amarok
 Comment[da]=Wikipedia-applet til Amarok
+Comment[de]=Wikipedia-Modul für Amarok
 Comment[el]=Μικροεφαρμογή Wikipedia για το Amarok
 Comment[en_GB]=Wikipedia applet for Amarok
 Comment[es]=Miniaplicación de la Wikipedia para Amarok
 Comment[et]=Amaroki Wikipedia aplett
+Comment[eu]=Amarok-erako Wikipediako aplikaziotxoa
 Comment[fr]=Module Wikipédia pour Amarok
+Comment[gl]=Trebello de Wikipedia para Amarok
+Comment[id]=Applet wikipedia untuk Amarok
 Comment[it]=Applet di Wikipedia per Amarok
 Comment[ko]=Amarok 위키백과 애플릿
 Comment[nl]=Wikipedia-applet voor Amarok
diff --git a/src/context/context_qml_package/metadata.desktop b/src/context/context_qml_package/metadata.desktop
index 8901550f09..4c7537df27 100644
--- a/src/context/context_qml_package/metadata.desktop
+++ b/src/context/context_qml_package/metadata.desktop
@@ -9,6 +9,7 @@ Name[el]=Amarok-Context-QML-Package
 Name[en_GB]=Amarok-Context-QML-Package
 Name[es]=Pquete QML para contexto de Amarok
 Name[et]=Amaroki konteksti QML-pakett
+Name[eu]=Amarok-Testuinguru-QML-Paketea
 Name[fi]=Amarok-konteksti-QML-paketti
 Name[fr]=Amarok-Context-QML-Package
 Name[gl]=Paquete de QML de contexto de Amarok
@@ -35,6 +36,7 @@ Comment[el]=Πακέτο QML βάσης για την περιοχή περιε
 Comment[en_GB]=QML base package for amarok context area
 Comment[es]=Paquete QML base para el área de contexto de Amarok
 Comment[et]=QML baaspakett Amaroki kontekstialale
+Comment[eu]=Amarok-en testuinguru eremurako oinarrizko QML paketea
 Comment[fi]=QML-pohjapaketti Amarokin kontekstialueelle
 Comment[fr]=Paquet QML de base pour l'espace de contexte d'amarok
 Comment[gl]=Paquete base de QML para a zona de contexto de Amarok.
diff --git a/src/context/engines/similarartists/SimilarArtistsEngine.cpp b/src/context/engines/similarartists/SimilarArtistsEngine.cpp
index 44565130da..e903e8b9f3 100644
--- a/src/context/engines/similarartists/SimilarArtistsEngine.cpp
+++ b/src/context/engines/similarartists/SimilarArtistsEngine.cpp
@@ -146,7 +146,7 @@ SimilarArtistsEngine::parseSimilarArtists( const QUrl &url, consr QByteArray &da
     debug() << "Found" << saList.size() << "similar artists to" << m_artist;
     Plasma::DataEngine::Data eData;
     eData[ "artist"  ] = m_artist;
-    eData[ "similar" ] = qVariantFromValue( saList );
+    eData[ "similar" ] = QVariant::fromValue( saList );
     setData( "similarArtists", eData );
 }
 
diff --git a/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp b/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp
index bdad5c7181..3f43e99e75 100644
--- a/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp
+++ b/src/context/engines/upcomingevents/UpcomingEventsEngine.cpp
@@ -157,7 +157,7 @@ UpcomingEventsEngine::artistEventsFetched( const QUrl &url, const QByteArray &da
     {
         LastFmEvent::List artistEvents = filterEvents( eventsParser.events() );
         engineData[ "artist" ] = m_currentArtist->name();
-        engineData[ "events" ] = qVariantFromValue( artistEvents );
+        engineData[ "events" ] = QVariant::fromValue( artistEvents );
     }
     setData( "artistevents", engineData );
 }
@@ -181,8 +181,8 @@ UpcomingEventsEngine::venueEventsFetched( const QUrl &url, const QByteArray data
         LastFmEvent::List venueEvents = filterEvents( eventsParser.events() );
         if( !venueEvents.isEmpty() )
         {
-            engineData[ "venue"  ] = qVariantFromValue( venueEvents.first()->venue() );
-            engineData[ "events" ] = qVariantFromValue( venueEvents );
+            engineData[ "venue"  ] = QVariant::fromValue( venueEvents.first()->venue() );
+            engineData[ "events" ] = QVariant::fromValue( venueEvents );
         }
     }
     setData( "venueevents", engineData );
diff --git a/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop b/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop
index 488e9d3157..af55f98a96 100644
--- a/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop
+++ b/src/core-impl/collections/db/sql/mysqlcollection/amarok_collection-mysqlcollection.desktop
@@ -12,6 +12,7 @@ Name[el]=Συλλογή MySQL
 Name[en_GB]=MySQL Collection
 Name[es]=Colección MySQL
 Name[et]=MySQL kogu
+Name[eu]=MySQL bilduma
 Name[fi]=MySQL-kokoelma
 Name[fr]=Collection MySQL
 Name[gl]=Colección MySQL
diff --git a/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop b/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop
index 9fbd09c589..bda2fb5193 100644
--- a/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop
+++ b/src/core-impl/collections/ipodcollection/amarok_collection-ipodcollection.desktop
@@ -12,6 +12,7 @@ Name[el]=Συλλογή iPod, iPad & iPhone
 Name[en_GB]=iPod, iPad & iPhone Collection
 Name[es]=Colección de iPod, iPad e iPhone
 Name[et]=iPodi, iPadi ja iPhone'i kogu
+Name[eu]=iPod, iPad eta iPhone-eko bilduma
 Name[fi]=iPod-, iPad- ja iPhone-kokoelma
 Name[fr]=Collection iPod, iPad & iPhone
 Name[ga]=Bailiúchán iPod, iPad, agus iPhone
@@ -44,8 +45,8 @@ Name[x-test]=xxiPod, iPad & iPhone Collectionxx
 Name[zh_TW]=iPod, iPad 與 iPhone 收藏
 Comment=Plugin to use iPod-like devices as collections in Amarok
 Comment[bs]=Priključak za korištenje uređaja poput iPod-a kao kolekcija u Amaroku
-Comment[ca]=Connector per utilitzar dispositius de tipus iPod com a col·leccions en l'Amarok
-Comment[ca@valencia]=Connector per utilitzar dispositius de tipus iPod com a col·leccions en l'Amarok
+Comment[ca]=Connector per a usar dispositius de tipus iPod com a col·leccions en l'Amarok
+Comment[ca@valencia]=Connector per a usar dispositius de tipus iPod com a col·leccions en l'Amarok
 Comment[cs]=Modul pro využití zařízení jako např. iPod jako sbírky pro AmaroK
 Comment[da]=Plugin til at bruge iPod-lignende enheder som samlinger i Amarok
 Comment[de]=Modul für die Verwendung von Geräten wie dem iPod als Sammlung in Amarok
@@ -53,6 +54,7 @@ Comment[el]=Πρόσθετο χρήσης συσκευών παρόμοιων μ
 Comment[en_GB]=Plugin to use iPod-like devices as collections in Amarok
 Comment[es]=Complemento para dispositivos similares a iPod en Amarok
 Comment[et]=Plugin iPodi-laadsete seadmete kasutamiseks Amaroki koguna
+Comment[eu]=Amarok-en iPod tankerako gailuak bildumak bezala erabiltzeko plugina
 Comment[fi]=Liitännäinen iPodin kaltaisten laitteiden käyttämiseen Amarokissa kokoelmina
 Comment[fr]=Module externe pour utiliser des périphériques de type iPod comme collections dans Amarok
 Comment[ga]=Breiseán chun gléasanna cosúil le iPod a úsáid mar bhailiúcháin in Amarok
diff --git a/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop b/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
index 86d8e8f73b..d8931a0631 100644
--- a/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
+++ b/src/core-impl/storage/sql/mysqlestorage/amarok_storage-mysqlestorage.desktop
@@ -12,6 +12,7 @@ Name[el]=Αποθηκευτικό μέσο MySQLe
 Name[en_GB]=MySQLe Storage
 Name[es]=Almacenamiento MySQLe
 Name[et]=MySQLe salvesti
+Name[eu]=MySQLe biltegiratzea
 Name[fi]=MySQLe-tallennus
 Name[fr]=Stockage MySQLe
 Name[gl]=Almacenamento MySQLe
@@ -35,8 +36,8 @@ Name[x-test]=xxMySQLe Storagexx
 Name[zh_TW]=MySQLe 儲存空間
 Comment=Storage plugin for Amarok
 Comment[bs]=Priključak za Amarok
-Comment[ca]=Connector d'emmagatzematge per l'Amarok
-Comment[ca@valencia]=Connector d'emmagatzematge per l'Amarok
+Comment[ca]=Connector d'emmagatzematge per a l'Amarok
+Comment[ca@valencia]=Connector d'emmagatzematge per a l'Amarok
 Comment[cs]=Modul úložiště pro AmaroK
 Comment[da]=Lagrings-plugin til Amarok
 Comment[de]=Speicher-Modul für Amarok
@@ -44,6 +45,7 @@ Comment[el]=Πρόσθετο αποθηκευτικού μέσου για το A
 Comment[en_GB]=Storage plugin for Amarok
 Comment[es]=Complemento de almacenamiento para Amarok
 Comment[et]=Amaroki salvestiplugin
+Comment[eu]=Amarok-erako biltegiratze plugina
 Comment[fi]=Amarokin tallennusliitännäinen
 Comment[fr]=Module de stockage pour Amarok
 Comment[gl]=Complemento de almacenamento para Amarok
diff --git a/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop b/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
index aa88ef70d5..e45ef621b8 100644
--- a/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
+++ b/src/core-impl/storage/sql/mysqlserverstorage/amarok_storage-mysqlserverstorage.desktop
@@ -12,6 +12,7 @@ Name[el]=Αποθηκευτικό μέσο MySQLServer
 Name[en_GB]=MySQLServer Storage
 Name[es]=Almacenamiento MySQLServer
 Name[et]=MySQLServeri salvesti
+Name[eu]=MySQLServer biltegiratzea
 Name[fi]=MySQLServer-tallennus
 Name[fr]=Stockage MySQLServeur
 Name[gl]=Almacenamento MySQLServer
@@ -35,8 +36,8 @@ Name[x-test]=xxMySQLServer Storagexx
 Name[zh_TW]=MySQLServer 儲存空間
 Comment=Storage plugin for Amarok
 Comment[bs]=Priključak za Amarok
-Comment[ca]=Connector d'emmagatzematge per l'Amarok
-Comment[ca@valencia]=Connector d'emmagatzematge per l'Amarok
+Comment[ca]=Connector d'emmagatzematge per a l'Amarok
+Comment[ca@valencia]=Connector d'emmagatzematge per a l'Amarok
 Comment[cs]=Modul úložiště pro AmaroK
 Comment[da]=Lagrings-plugin til Amarok
 Comment[de]=Speicher-Modul für Amarok
@@ -44,6 +45,7 @@ Comment[el]=Πρόσθετο αποθηκευτικού μέσου για το A
 Comment[en_GB]=Storage plugin for Amarok
 Comment[es]=Complemento de almacenamiento para Amarok
 Comment[et]=Amaroki salvestiplugin
+Comment[eu]=Amarok-erako biltegiratze plugina
 Comment[fi]=Amarokin tallennusliitännäinen
 Comment[fr]=Module de stockage pour Amarok
 Comment[gl]=Complemento de almacenamento para Amarok
diff --git a/src/core/meta/Meta.cpp b/src/core/meta/Meta.cpp
index 9d997375e3..dad5c1c0f6 100644
--- a/src/core/meta/Meta.cpp
+++ b/src/core/meta/Meta.cpp
@@ -155,7 +155,7 @@ Meta::Track::operator==( const Meta::Track &track ) const
 bool
 Meta::Track::lessThan( const Meta::TrackPtr& left, const Meta::TrackPtr& right )
 {
-    if( !left || !right ) // These should never be 0, but it can apparently happen (http://bugs.kde.org/show_bug.cgi?id=181187)
+    if( !left || !right ) // These should never be 0, but it can apparently happen (https://bugs.kde.org/show_bug.cgi?id=181187)
         return false;
 
     if( left->album() && right->album() )
diff --git a/src/core/podcasts/PodcastReader.cpp b/src/core/podcasts/PodcastReader.cpp
index 533d855eba..a437ca33cc 100644
--- a/src/core/podcasts/PodcastReader.cpp
+++ b/src/core/podcasts/PodcastReader.cpp
@@ -1159,7 +1159,7 @@ PodcastReader::endItem()
         }
 
         //make sure that the episode is not a bogus match. The channel has to be correct.
-        // See http://bugs.kde.org/show_bug.cgi?id=227515
+        // See https://bugs.kde.org/show_bug.cgi?id=227515
         if( !episode.isNull() && episode->channel() == m_channel )
         {
             debug() << "updating episode: " << episode->title();
@@ -1611,7 +1611,7 @@ PodcastReader::parsePubDate( const QString &dateString )
         parseInput = rfcDateDayRegex.cap(1);
     }
     //Hack around a to strict RFCDate implementation in KDateTime.
-    //See http://bugs.kde.org/show_bug.cgi?id=231062
+    //See https://bugs.kde.org/show_bug.cgi?id=231062
     QRegExp rfcMonthLowercase( QStringLiteral("^\\d+\\s+\\b(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\\b") );
     if( rfcMonthLowercase.indexIn( parseInput ) != -1 )
     {
diff --git a/src/dialogs/EditFilterDialog.cpp b/src/dialogs/EditFilterDialog.cpp
index f667884b8a..428911bb2f 100644
--- a/src/dialogs/EditFilterDialog.cpp
+++ b/src/dialogs/EditFilterDialog.cpp
@@ -144,8 +144,8 @@ EditFilterDialog::filterForToken( Token *token )
         newFilter.inverted = false;
 
         m_filters.insert( token, newFilter );
-        connect( token, &Token::destroyed,
-                 this, &EditFilterDialog::slotTokenDestroyed );
+        connect( token, &Token::removed,
+                 this, &EditFilterDialog::slotTokenRemoved );
     }
 
     return m_filters[token];
@@ -168,11 +168,11 @@ EditFilterDialog::slotTokenSelected( Token *token )
 }
 
 void
-EditFilterDialog::slotTokenDestroyed( QObject *token )
+EditFilterDialog::slotTokenRemoved( Token *token )
 {
     DEBUG_BLOCK
 
-    m_filters.take( qobject_cast<Token*>(token) );
+    m_filters.take( token );
     if( m_curToken == token )
     {
         m_curToken = 0;
@@ -451,8 +451,8 @@ EditFilterDialog::updateDropTarget( const QString &text )
                             ? tokenForField( filter.filter.field() )
                             : SIMPLE_TEXT_CONSTRUCT;
             m_filters.insert( nToken, filter );
-            connect( nToken, &Token::destroyed,
-                     this, &EditFilterDialog::slotTokenDestroyed );
+            connect( nToken, &Token::removed,
+                     this, &EditFilterDialog::slotTokenRemoved);
 
             m_ui->dropTarget->appendToken( nToken );
 
diff --git a/src/dialogs/EditFilterDialog.h b/src/dialogs/EditFilterDialog.h
index ff96ea8050..a9041c9b92 100644
--- a/src/dialogs/EditFilterDialog.h
+++ b/src/dialogs/EditFilterDialog.h
@@ -46,7 +46,7 @@ class EditFilterDialog : public QDialog
 
     private Q_SLOTS:
         void slotTokenSelected( Token *token );
-        void slotTokenDestroyed( QObject *token );
+        void slotTokenRemoved( Token *token );
         void slotAttributeChanged( const MetaQueryWidget::Filter &filter );
         void slotInvert( bool checked );
         void slotSeparatorChange();
diff --git a/src/importers/amarok/amarok_importer-amarok.desktop b/src/importers/amarok/amarok_importer-amarok.desktop
index ae37600d30..38f865f44d 100644
--- a/src/importers/amarok/amarok_importer-amarok.desktop
+++ b/src/importers/amarok/amarok_importer-amarok.desktop
@@ -12,6 +12,7 @@ Name[el]=Amarok 2.x εισαγωγέας
 Name[en_GB]=Amarok 2.x Importer
 Name[es]=Importador de Amarok 2.x
 Name[et]=Amarok 2.x importija
+Name[eu]=Amarok 2.x inportatzailea
 Name[fi]=Amarok 2.x -tuonti
 Name[fr]=Importateur d'Amarok 2.x
 Name[gl]=Importador de Amarok 2.x
@@ -47,6 +48,7 @@ Comment[el]=Εισάγει στατιστικά από τη βάση δεδομ
 Comment[en_GB]=Import statistics from Amarok 2.x database
 Comment[es]=Importa estadísticas de la base de datos de Amarok 2.x
 Comment[et]=Statistika import Amarok 2.x andmebaasist
+Comment[eu]=Inportatu estatistikak Amarok 2.x datu-basetik
 Comment[fi]=Tuo tilastot Amarok 2.x:n tietokannasta
 Comment[fr]=Importe les statistiques de la base de données d'Amarok 2.x
 Comment[gl]=Importar estatísticas da base de datos de Amarok 2.x.
diff --git a/src/importers/banshee/amarok_importer-banshee.desktop b/src/importers/banshee/amarok_importer-banshee.desktop
index 6763501f7b..74a235b6e7 100644
--- a/src/importers/banshee/amarok_importer-banshee.desktop
+++ b/src/importers/banshee/amarok_importer-banshee.desktop
@@ -12,6 +12,7 @@ Name[el]=Banshee εισαγωγέας
 Name[en_GB]=Banshee Importer
 Name[es]=Importador de Banshee
 Name[et]=Banshee importija
+Name[eu]=Banshee inportatzailea
 Name[fi]=Banshee-tuonti
 Name[fr]=Importateur de Banshee
 Name[gl]=Importador de Banshee
@@ -47,6 +48,7 @@ Comment[el]=Εισάγει στατιστικά από τη βάση δεδομ
 Comment[en_GB]=Import statistics from Banshee database
 Comment[es]=Importa estadísticas de la base de datos de Banshee
 Comment[et]=Statistika import Banshee andmebaasist
+Comment[eu]=Inportatu estatistikak Banshee datu-basetik
 Comment[fi]=Tuo tilastot Bansheen tietokannasta
 Comment[fr]=Importe les statistiques de la base de données de Banshee
 Comment[gl]=Importar estatísticas da base de datos de Banshee.
diff --git a/src/importers/clementine/amarok_importer-clementine.desktop b/src/importers/clementine/amarok_importer-clementine.desktop
index c7c9bd2bb5..e4a1cf38be 100644
--- a/src/importers/clementine/amarok_importer-clementine.desktop
+++ b/src/importers/clementine/amarok_importer-clementine.desktop
@@ -12,6 +12,7 @@ Name[el]=Clementine εισαγωγέας
 Name[en_GB]=Clementine Importer
 Name[es]=Importador de Clementine
 Name[et]=Clementine importija
+Name[eu]=Clementine inportatzailea
 Name[fi]=Clementine-tuonti
 Name[fr]=Importateur de Clémentine
 Name[gl]=Importador de Clementine
@@ -47,6 +48,7 @@ Comment[el]=Εισάγει στατιστικά από τη βάση δεδομ
 Comment[en_GB]=Import statistics from Clementine database
 Comment[es]=Importa estadísticas de la base de datos de Clementine
 Comment[et]=Statistika import Clementine andmebaasist
+Comment[eu]=Inportatu estatistikak Clementine datu-basetik
 Comment[fi]=Tuo tilastot Clementinen tietokannasta
 Comment[fr]=Importe les statistiques de la base de données de Clémentine
 Comment[gl]=Importar estatísticas da base de datos de Clementine.
diff --git a/src/importers/fastforward/amarok_importer-fastforward.desktop b/src/importers/fastforward/amarok_importer-fastforward.desktop
index 2515383d25..2a09a412f5 100644
--- a/src/importers/fastforward/amarok_importer-fastforward.desktop
+++ b/src/importers/fastforward/amarok_importer-fastforward.desktop
@@ -12,6 +12,7 @@ Name[el]=Amarok 1.4 (FastForward) εισαγωγέας
 Name[en_GB]=Amarok 1.4 (FastForward) Importer
 Name[es]=Importador de Amarok 1.4 (FastForward)
 Name[et]=Amarok 1.4 (FastForward) importija
+Name[eu]=Amarok 1.4 (FastForward) inportatzailea
 Name[fi]=Amarok 1.4 (Fast Forward) -tuonti
 Name[fr]=Importateur d'Amarok 1.4 (FastForward)
 Name[gl]=Importador de Amarok 1.4 (FastForward)
@@ -47,6 +48,7 @@ Comment[el]=Εισάγει στατιστικά από τη βάση δεδομ
 Comment[en_GB]=Import statistics from Amarok 1.4 database
 Comment[es]=Importa estadísticas de la base de datos de Amarok 1.4
 Comment[et]=Statistika import Amarok 1.4 andmebaasist
+Comment[eu]=Inportatu estatistikak Amarok 1.4 datu-basetik
 Comment[fi]=Tuo tilastot Amarok 1.4:n tietokannasta
 Comment[fr]=Importe les statistiques de la base de données d'Amarok 1.4
 Comment[gl]=Importar estatísticas da base de datos de Amarok 1.4.
diff --git a/src/importers/itunes/amarok_importer-itunes.desktop b/src/importers/itunes/amarok_importer-itunes.desktop
index 14be1a698e..65e502b05e 100644
--- a/src/importers/itunes/amarok_importer-itunes.desktop
+++ b/src/importers/itunes/amarok_importer-itunes.desktop
@@ -12,6 +12,7 @@ Name[el]=Apple iTunes εισαγωγέας
 Name[en_GB]=Apple iTunes Importer
 Name[es]=Importador de iTunes
 Name[et]=Apple iTunesi importija
+Name[eu]=Apple iTunes inportatzailea
 Name[fi]=Apple iTunes -tuonti
 Name[fr]=Importateur d'iTunes d'Apple
 Name[gl]=Importador de Apple iTunes
@@ -47,6 +48,7 @@ Comment[el]=Εισάγει στατιστικά από τη βάση δεδομ
 Comment[en_GB]=Import statistics from Apple iTunes database
 Comment[es]=Importa estadísticas de la base de datos iTunes de Apple
 Comment[et]=Statistika import Apple iTunesi andmebaasist
+Comment[eu]=Inportatu estatistikak Apple iTunes datu-basetik
 Comment[fi]=Tuo tilastot Apple iTunesin tietokannasta
 Comment[fr]=Importe les statistiques de la base de données d'iTunes d'Apple
 Comment[gl]=Importar estatísticas da base de datos de Apple iTunes.
diff --git a/src/importers/rhythmbox/amarok_importer-rhythmbox.desktop b/src/importers/rhythmbox/amarok_importer-rhythmbox.desktop
index 6b9f725d06..f90575829d 100644
--- a/src/importers/rhythmbox/amarok_importer-rhythmbox.desktop
+++ b/src/importers/rhythmbox/amarok_importer-rhythmbox.desktop
@@ -12,6 +12,7 @@ Name[el]=Rhythmbox εισαγωγέας
 Name[en_GB]=Rhythmbox Importer
 Name[es]=Importador de Rhythmbox
 Name[et]=Rhythmbox importija
+Name[eu]=Rhythmbox inportatzailea
 Name[fi]=Rhythmbox-tuonti
 Name[fr]=Importateur de Rhythmbox
 Name[gl]=Importador de Rhythmbox
@@ -47,6 +48,7 @@ Comment[el]=Εισάγει στατιστικά από τη βάση δεδομ
 Comment[en_GB]=Import statistics from Rhythmbox database
 Comment[es]=Importa estadísticas de la base de datos de Rhythmbox
 Comment[et]=Statistika import Rhythmboxi andmebaasist
+Comment[eu]=Inportatu estatistikak Rhythmbox datu-basetik
 Comment[fi]=Tuo tilastot Rhythmboxin tietokannasta
 Comment[fr]=Importe les statistiques de la base de données de Rhythmbox
 Comment[gl]=Importar estatísticas da base de datos de Rhythmbox.
diff --git a/src/org.kde.amarok.appdata.xml b/src/org.kde.amarok.appdata.xml
index 1a9131db93..000cad0b5b 100644
--- a/src/org.kde.amarok.appdata.xml
+++ b/src/org.kde.amarok.appdata.xml
@@ -53,6 +53,7 @@
   <summary xml:lang="fi">Äänisoitin</summary>
   <summary xml:lang="fr">Lecteur audio</summary>
   <summary xml:lang="gl">Reprodutor de son</summary>
+  <summary xml:lang="ia">Reproductor de audio</summary>
   <summary xml:lang="id">Pemutar Audio</summary>
   <summary xml:lang="it">Lettore audio</summary>
   <summary xml:lang="ko">오디오 재생기</summary>
@@ -85,6 +86,7 @@
     <p xml:lang="fi">Amarok on vapaa, monipuolinen ja tehokas monen alustan musiikkisoitin- ja -kokoelmanhallintasovellus.</p>
     <p xml:lang="fr">Amarok est un lecteur de musique et un gestionnaire de collections libre, multiplateforme, polyvalent, puissant et riche en fonctionnalités.</p>
     <p xml:lang="gl">Amarok é xestor de coleccións de música e reprodutor libre, compatíbel con múltiples plataformas, versátil, potente e cheo de funcionalidades.</p>
+    <p xml:lang="ia">Amarok es un libere, versatile e potente reproductor musical</p>
     <p xml:lang="id">Amarok adalah pemutar musik dan pengelola koleksi gratis, lintas platform, serbaguna, hebat, dan kaya fitur.</p>
     <p xml:lang="it">Amarok è un lettore musicale e gestore delle raccolte libero, versatile, potente e ricco di funzionalità</p>
     <p xml:lang="ko">Amarok은 강력한 크로스 플랫폼 자유 소프트웨어 음악 재생기 및 모음집 관리 도구입니다.</p>
@@ -314,6 +316,7 @@
       <li xml:lang="fi">Kansikuvien hallinta</li>
       <li xml:lang="fr">Gestionnaire de pochettes</li>
       <li xml:lang="gl">Xestor de portadas.</li>
+      <li xml:lang="ia">Gerente de copertura</li>
       <li xml:lang="id">Pengelola sampul</li>
       <li xml:lang="it">Gestore delle copertine</li>
       <li xml:lang="ko">커버 관리자</li>
@@ -366,7 +369,7 @@
   </description>
   <url type="homepage">https://amarok.kde.org</url>
   <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=amarok</url>
-  <url type="help">https://docs.kde.org/index.php?application=amarok</url>
+  <url type="help">https://docs.kde.org/?application=amarok</url>
   <screenshots>
     <screenshot type="default">
       <caption>Playing music in Amarok</caption>
@@ -412,6 +415,7 @@
       <caption xml:lang="fi">Amarok-ikkunat</caption>
       <caption xml:lang="fr">Fenêtres Amarok</caption>
       <caption xml:lang="gl">Xanelas de Amarok</caption>
+      <caption xml:lang="ia">Fenestras de Amarok</caption>
       <caption xml:lang="id">Window Amarok</caption>
       <caption xml:lang="it">Finestre di Amarok</caption>
       <caption xml:lang="ko">Amarok 창</caption>
diff --git a/src/org.kde.amarok.desktop b/src/org.kde.amarok.desktop
index 21b37826ea..cd2db88b61 100644
--- a/src/org.kde.amarok.desktop
+++ b/src/org.kde.amarok.desktop
@@ -200,6 +200,7 @@ X-KDE-Keywords[el]=μουσική,podcast
 X-KDE-Keywords[en_GB]=music,podcast
 X-KDE-Keywords[es]=música,podcast
 X-KDE-Keywords[et]=muusika,podcast
+X-KDE-Keywords[eu]=musika,podcast
 X-KDE-Keywords[fi]=musiikki,podcast
 X-KDE-Keywords[fr]=musique, podcast
 X-KDE-Keywords[ga]=ceol,podchraoladh
diff --git a/src/org.kde.amarok_containers.desktop b/src/org.kde.amarok_containers.desktop
index 7220707256..ec52e8483b 100644
--- a/src/org.kde.amarok_containers.desktop
+++ b/src/org.kde.amarok_containers.desktop
@@ -198,6 +198,7 @@ X-KDE-Keywords[el]=μουσική,podcast
 X-KDE-Keywords[en_GB]=music,podcast
 X-KDE-Keywords[es]=música,podcast
 X-KDE-Keywords[et]=muusika,podcast
+X-KDE-Keywords[eu]=musika,podcast
 X-KDE-Keywords[fi]=musiikki,podcast
 X-KDE-Keywords[fr]=musique, podcast
 X-KDE-Keywords[ga]=ceol,podchraoladh
diff --git a/src/playlist/PlaylistDock.cpp b/src/playlist/PlaylistDock.cpp
index fee958d342..1006c9529e 100644
--- a/src/playlist/PlaylistDock.cpp
+++ b/src/playlist/PlaylistDock.cpp
@@ -247,7 +247,7 @@ Playlist::Dock::paletteChanged( const QPalette &palette )
     QString barStyle( "QFrame#PlaylistBarBox { border: 1px ridge %1; background-color: %2; "
                                              " color: %3; border-radius: 3px; } "
                       "QLabel { color: %4; }" );
-    barStyle = barStyle.arg( ridgeColor, backgroundColor, textColor );
+    barStyle = barStyle.arg( ridgeColor, backgroundColor, textColor, textColor );
 
     m_dynamicHintWidget->setStyleSheet( hintStyle );
     if( m_barBox )
diff --git a/src/scripting/scriptconsole/ScriptConsole.cpp b/src/scripting/scriptconsole/ScriptConsole.cpp
index 512fe30384..1dcf99a3fb 100644
--- a/src/scripting/scriptconsole/ScriptConsole.cpp
+++ b/src/scripting/scriptconsole/ScriptConsole.cpp
@@ -29,7 +29,7 @@
 #include <QListWidget>
 #include <QKeyEvent>
 #include <QMenuBar>
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QTemporaryFile>
@@ -40,6 +40,7 @@
 #include <KTextEditor/View>
 #include <KLocalizedString>
 
+#include <iostream>
 
 using namespace AmarokScript;
 using namespace ScriptConsoleNS;
@@ -67,37 +68,34 @@ ScriptConsole::ScriptConsole( QWidget *parent )
         deleteLater();
         return;
     }
-    m_scriptListDock = new ScriptListDockWidget( this );
-    m_debugger = new QScriptEngineDebugger( this );
 
     setDockNestingEnabled( true );
     setWindowTitle( i18n( "Script Console" ) );
     setObjectName( QStringLiteral("scriptconsole") );
 
-    m_debugger->setAutoShowStandardWindow( false );
-    m_codeWidget = getWidget( QStringLiteral("Code"), QScriptEngineDebugger::CodeWidget );
-    addDockWidget( Qt::BottomDockWidgetArea, m_codeWidget );
-    QList<QDockWidget*> debugWidgets = QList<QDockWidget*>() << getWidget( i18n( "Console" ), QScriptEngineDebugger::ConsoleWidget )
-                    << getWidget( i18n( "Error" ), QScriptEngineDebugger::ErrorLogWidget )
-                    << getWidget( i18n( "Debug Output" ), QScriptEngineDebugger::DebugOutputWidget )
-                    << getWidget( i18n( "Loaded Scripts" ), QScriptEngineDebugger::ScriptsWidget )
-                    << getWidget( i18n( "Breakpoints" ), QScriptEngineDebugger::BreakpointsWidget )
-                    << getWidget( i18n( "Stack" ), QScriptEngineDebugger::StackWidget )
-                    << getWidget( i18n( "Locals" ), QScriptEngineDebugger::LocalsWidget );
+    m_scriptListDock = new ScriptListDockWidget( this );
+    m_codeWidget = getWidget( i18n("Code"), nullptr );
+    m_consoleWidget = getWidget( i18n("Console"), nullptr );
+    m_outputWidget = getWidget( i18n( "Output" ), nullptr );
+    m_errorWidget = getWidget( i18n( "Error" ), nullptr );
+
+    QList<QDockWidget*> debugWidgets = QList<QDockWidget*>()
+                    << m_codeWidget
+                    << m_consoleWidget
+                    << m_outputWidget
+                    << m_errorWidget;
     foreach( QDockWidget *widget, debugWidgets )
     {
       addDockWidget( Qt::BottomDockWidgetArea, widget );
     }
-    addDockWidget( Qt::BottomDockWidgetArea, m_scriptListDock );
-    tabifyDockWidget( debugWidgets[0], debugWidgets[1] );
     tabifyDockWidget( debugWidgets[1], debugWidgets[2] );
-    tabifyDockWidget( debugWidgets[3], debugWidgets[4] );
-    tabifyDockWidget( debugWidgets[5], debugWidgets[6] );
+    tabifyDockWidget( debugWidgets[2], debugWidgets[3] );
+
+    addDockWidget( Qt::BottomDockWidgetArea, m_scriptListDock );
 
     QMenuBar *bar = new QMenuBar( this );
     setMenuBar( bar );
-    bar->addMenu( m_debugger->createStandardMenu( this ) );
-    QToolBar *toolBar = m_debugger->createStandardToolBar( this );
+    QToolBar *toolBar = new QToolBar( this );
     QAction *action = new QAction( i18n( "Stop" ), this );
     action->setIcon( QApplication::style()->standardIcon( QStyle::SP_MediaStop ) );
     connect( action, &QAction::toggled, this, &ScriptConsole::slotAbortEvaluation );
@@ -146,7 +144,6 @@ ScriptConsole::ScriptConsole( QWidget *parent )
                                                 "available at:\nhttp://community.kde.org/Amarok/Development#Scripting"
                                                 "\nExecute code: CTRL-Enter\nBack in code history: Page Up"
                                                 "\nForward in code history: Page Down"
-                                                "See the debugger manual at: <link here>"
                                                , 0 );
     item->setFlags( Qt::NoItemFlags );
     m_scriptListDock->addItem( item );
@@ -161,10 +158,35 @@ ScriptConsole::ScriptConsole( QWidget *parent )
         m_savePath = Amarok::saveLocation(QStringLiteral("scriptconsole"));
 
     slotNewScript();
-    connect( m_debugger, &QScriptEngineDebugger::evaluationSuspended, this, &ScriptConsole::slotEvaluationSuspended );
-    connect( m_debugger, &QScriptEngineDebugger::evaluationResumed, this, &ScriptConsole::slotEvaluationResumed );
     show();
     raise();
+
+    // Install interceptor for JS console logs and forward to appropriate widget
+    qInstallMessageHandler( [] ( QtMsgType type, const QMessageLogContext &context, const QString &msg )
+    {
+        Q_UNUSED( type );
+        QString category(context.category);
+        if ( category.compare( "js" ) == 0 ) {
+
+            QString scriptName( context.file );
+            // clean "file:" from file name
+            scriptName.remove( 0, 5);
+
+            // Search script by name
+            ScriptConsoleItem *searchResult = instance()->getScriptListDockWidget()->getScript( scriptName );
+            if (searchResult != nullptr ) {
+                // Found it - update its console widget
+                QString logEntry = QString("[%1: %2] %3")
+                .arg( scriptName )
+                .arg( context.line )
+                .arg( msg );
+                searchResult->appendToConsoleWidget( logEntry );
+            }
+        }
+
+        // Print all QT logging to STDERR as default
+        std::cerr << msg.toStdString() << std::endl;
+    });
 }
 
 void
@@ -173,21 +195,7 @@ ScriptConsole::slotExecuteNewScript()
     if( m_scriptItem->document()->text().isEmpty() )
         return;
 
-    QScriptSyntaxCheckResult syntaxResult = m_scriptItem->engine()->checkSyntax( m_scriptItem->document()->text() );
-    if( QScriptSyntaxCheckResult::Valid != syntaxResult.state() )
-    {
-        debug() << "Syntax error: " << syntaxResult.errorLineNumber() << syntaxResult.errorMessage();
-        KTextEditor::View *view = dynamic_cast<KTextEditor::View*>( m_codeWidget->widget() );
-        ScriptEditorDocument::highlight( view, syntaxResult.errorLineNumber(), QColor( 255, 0, 0 ) );
-        int response = KMessageBox::warningContinueCancel( this, i18n( "Syntax error at line %1, continue anyway?\nError: %2",
-                                                  syntaxResult.errorLineNumber(), syntaxResult.errorMessage() ),
-                                            i18n( "Syntax Error" ) );
-        if( response == KMessageBox::Cancel )
-            return;
-    }
-
     m_scriptItem->document()->save();
-    m_codeWidget->setWidget( m_debugger->widget( QScriptEngineDebugger::CodeWidget ) );
     m_scriptItem->start( false );
 }
 
@@ -237,9 +245,15 @@ ScriptConsole::createScriptItem( const QString &script )
     return scriptItem;
 }
 
+ScriptListDockWidget*
+ScriptConsole::getScriptListDockWidget()
+{
+    return m_scriptListDock;
+}
+
 ScriptConsole::~ScriptConsole()
 {
-    m_debugger->detach();
+    //m_debugger->detach();
 }
 
 void
@@ -250,12 +264,14 @@ ScriptConsole::slotEvaluationSuspended()
         slotNewScript();
         return;
     }
-    debug() << "Is Evaluating() " << m_scriptItem->engine()->isEvaluating();
-    debug() << "Exception isValid()" << m_scriptItem->engine()->uncaughtException().isValid();
-    if( m_scriptItem->engine() && m_scriptItem->engine()->uncaughtException().isValid() )
+    debug() << "Is Running() " << m_scriptItem->running();
+    debug() << "Engine isError()" << m_scriptItem->engineResult().isError();
+    // TODO - Inspect if translations work with real debugger signals
+    //if( m_scriptItem->engine() && m_scriptItem->engine()->uncaughtException().isValid() )
+    if( m_scriptItem->engine() && m_scriptItem->engineResult().isError() )
         return;
 
-    KTextEditor::View *view = m_scriptItem->createEditorView( m_codeWidget );
+    KTextEditor::View *view = m_scriptItem->getEditorView( m_codeWidget );
     view->installEventFilter( this );
     view->document()->installEventFilter( this );
     m_codeWidget->setWidget( view );
@@ -264,12 +280,12 @@ ScriptConsole::slotEvaluationSuspended()
 void
 ScriptConsole::slotEvaluationResumed()
 {
-    debug() << "Is Evaluating() " << m_scriptItem->engine()->isEvaluating();
-    debug() << "Exception isValid()" << m_scriptItem->engine()->uncaughtException().isValid();
-    if( !m_scriptItem->engine() || !m_scriptItem->engine()->isEvaluating() )
+    debug() << "Is running() " << m_scriptItem->running();
+    debug() << "Engine isError()" << m_scriptItem->engineResult().isError();
+    if( !m_scriptItem->engine() || !m_scriptItem->running() )
         return;
 
-    KTextEditor::View *view = m_scriptItem->createEditorView( m_codeWidget );
+    KTextEditor::View *view = m_scriptItem->getEditorView( m_codeWidget );
     view->installEventFilter( this );
     m_codeWidget->setWidget( view );
 }
@@ -280,12 +296,13 @@ ScriptConsole::slotAbortEvaluation()
     m_scriptItem->pause();
 }
 
+
 QDockWidget*
-ScriptConsole::getWidget( const QString &title, QScriptEngineDebugger::DebuggerWidget widget )
+ScriptConsole::getWidget( const QString &title, QWidget *widget )
 {
-    QDockWidget *debugWidget = new QDockWidget( title, this );
-    debugWidget->setWidget( m_debugger->widget( widget ) );
-    return debugWidget;
+    QDockWidget *dockWidget = new QDockWidget( title, this );
+    dockWidget->setWidget( widget );
+    return dockWidget;
 }
 
 void
@@ -293,19 +310,38 @@ ScriptConsole::setCurrentScriptItem( ScriptConsoleItem *item )
 {
     if( !item || m_scriptItem.data() == item )
         return;
-    m_debugger->detach();
-    m_debugger->attachTo( item->engine() );
+
+    // Set the active script widgets and update them
     m_scriptItem = item;
-    if( item->engine() && item->engine()->isEvaluating() )
+
+    KTextEditor::View *view = item->getEditorView( m_codeWidget );
+    m_codeWidget->setWidget( view  );
+    view->installEventFilter( this );
+    view->show();
+
+    QWidget *console = item->getConsoleWidget( m_consoleWidget );
+    m_consoleWidget->setWidget( console );
+    console->show();
+
+    QWidget *output = item->getOutputWdiget( m_outputWidget  );
+    m_outputWidget->setWidget( output );
+    output->show();
+
+    QWidget *error  = item->getErrorWidget( m_errorWidget );
+    m_errorWidget->setWidget( error );
+    error->show();
+
+    /* TODO - install filters
+    if( item->engine() && item->running() )
     {
-        m_codeWidget->setWidget( m_debugger->widget( QScriptEngineDebugger::CodeWidget ) );
+        view->document()->setReadWrite( false );
     }
     else
     {
-        KTextEditor::View *view = item->createEditorView( m_codeWidget );
+        view->document()->setReadWrite( true );
         view->installEventFilter( this );
-        m_codeWidget->setWidget( view );
     }
+    */
 }
 
 void
@@ -350,6 +386,12 @@ ScriptListDockWidget::ScriptListDockWidget( QWidget *parent )
              this, &ScriptListDockWidget::slotCurrentItemChanged );
 }
 
+QListWidget*
+ScriptListDockWidget::listWidget()
+{
+    return m_scriptListWidget;
+}
+
 void
 ScriptListDockWidget::addScript( ScriptConsoleItem *script )
 {
@@ -362,6 +404,16 @@ ScriptListDockWidget::addScript( ScriptConsoleItem *script )
     m_scriptListWidget->setCurrentItem( item );
 }
 
+ScriptConsoleItem*
+ScriptListDockWidget::getScript( const QString &scriptName)
+{
+    QList<QListWidgetItem *> searchResult = listWidget()->findItems( scriptName, Qt::MatchFixedString);
+    if (! searchResult.isEmpty() ) {
+        return searchResult.first()->data( ScriptRole ).value<ScriptConsoleItem*>();
+    }
+    return nullptr;
+}
+
 void
 ScriptListDockWidget::removeCurrentScript()
 {
diff --git a/src/scripting/scriptconsole/ScriptConsole.h b/src/scripting/scriptconsole/ScriptConsole.h
index 7afba0026d..7e0a7cfb02 100644
--- a/src/scripting/scriptconsole/ScriptConsole.h
+++ b/src/scripting/scriptconsole/ScriptConsole.h
@@ -19,8 +19,6 @@
 
 #include <QMainWindow>
 #include <QDockWidget>
-#include <QScriptEngineAgent>
-#include <QScriptEngineDebugger>
 #include <QPointer>
 
 namespace KTextEditor{
@@ -30,7 +28,7 @@ class QEvent;
 class QListWidget;
 class QListWidgetItem;
 class QModelIndex;
-class QScriptEngine;
+class QJSEngine;
 
 namespace ScriptConsoleNS
 {
@@ -58,13 +56,16 @@ class ScriptListDockWidget;
             ~ScriptConsole() override;
 
             bool eventFilter( QObject *watched, QEvent *event ) override;
-            QDockWidget *getWidget( const QString &title, QScriptEngineDebugger::DebuggerWidget widget );
+            QDockWidget *getWidget( const QString &title, QWidget *widget );
             void closeEvent( QCloseEvent *event ) override;
             ScriptConsoleItem* createScriptItem( const QString &script );
+            ScriptListDockWidget *getScriptListDockWidget();
 
-            QScriptEngineDebugger *m_debugger;
             QPointer<ScriptConsoleItem> m_scriptItem;
+            QDockWidget *m_consoleWidget;
             QDockWidget *m_codeWidget;
+            QDockWidget *m_outputWidget;
+            QDockWidget *m_errorWidget;
             QString m_savePath;
             KTextEditor::Editor *m_editor;
             ScriptListDockWidget *m_scriptListDock;
@@ -78,7 +79,9 @@ class ScriptListDockWidget;
         public:
             explicit ScriptListDockWidget( QWidget *parent );
             ~ScriptListDockWidget() override;
+            QListWidget *listWidget();
             void addScript( ScriptConsoleItem *script );
+            ScriptConsoleItem *getScript( const QString &scriptName);
             void addItem( QListWidgetItem *item );
 
         public Q_SLOTS:
diff --git a/src/scripting/scriptconsole/ScriptConsoleItem.cpp b/src/scripting/scriptconsole/ScriptConsoleItem.cpp
index be3b046e03..c6b2743ed5 100644
--- a/src/scripting/scriptconsole/ScriptConsoleItem.cpp
+++ b/src/scripting/scriptconsole/ScriptConsoleItem.cpp
@@ -27,11 +27,13 @@
 
 #include <QFile>
 #include <QFileInfo>
-#include <QScriptEngine>
+#include <QJSValue>
 #include <QTextStream>
 #include <QDir>
-#include <QScriptEngineDebugger>
-#include <QMainWindow>
+#include <QPlainTextEdit>
+#include <QMessageLogContext>
+#include <QStringBuilder>
+
 
 using namespace ScriptConsoleNS;
 
@@ -44,6 +46,17 @@ ScriptConsoleItem::ScriptConsoleItem( QObject *parent, const QString &name, cons
     document->setParent( this );
     document->save( url() );
     initializeScriptEngine();
+
+    m_view = m_viewFactory->createView( nullptr );
+    m_console= new QPlainTextEdit( nullptr );
+    m_console->setReadOnly(true);
+    m_output = new QPlainTextEdit( nullptr );
+    m_output->setReadOnly(true);
+    m_error = new QPlainTextEdit( nullptr );
+    m_error->setReadOnly(true);
+
+    connect( this, &ScriptConsoleItem::evaluated, this, &ScriptConsoleItem::updateOutputWidget);
+    connect( this, &ScriptConsoleItem::signalHandlerException, this, &ScriptConsoleItem::updateErrorWidget);
 }
 
 ScriptConsoleItem::~ScriptConsoleItem()
@@ -63,6 +76,12 @@ ScriptConsoleItem::~ScriptConsoleItem()
     }
     if( m_view )
         m_view->deleteLater();
+    if (m_console)
+        m_console->deleteLater();
+    if (m_output)
+        m_output->deleteLater();
+    if (m_error)
+        m_error->deleteLater();
 }
 
 KPluginInfo
@@ -72,14 +91,15 @@ ScriptConsoleItem::createSpecFile( const QString &name, const QString &category,
                             "\nIcon=\"\""
                             "\nType=script"
                             "\nServiceTypes=KPluginInfo"
-                            "\nName= %1"
+                            "\nName=%1"
+                            "\nComment=Amarok console script"
                             "\nX-KDE-PluginInfo-Name=%1"
                             "\nX-KDE-PluginInfo-Version=1.0"
                             "\nX-KDE-PluginInfo-Category=%2"
                             "\nX-KDE-PluginInfo-Depends=Amarok2.0"
                             "\nX-KDE-PluginInfo-EnabledByDefault=false\n" ).arg( name, category );
-
-    QString specPath = QStringLiteral( "%1/script.spec" ).arg( path );
+    // TODO - Replace .desktop with new json format. Important: file extension matters
+    QString specPath = QStringLiteral( "%1/script.desktop" ).arg( path );
     QFile file( specPath );
     if( !file.open( QIODevice::WriteOnly ) )
     {
@@ -104,20 +124,47 @@ ScriptConsoleItem::start( bool silent )
     }
     m_viewFactory->save();
     Q_ASSERT( engine() );
-    engine()->pushContext();
-    return ScriptItem::start( silent );
+    //engine()->pushContext();
+    m_viewFactory->setReadWrite( false );
+    bool result = ScriptItem::start( silent );
+    m_viewFactory->setReadWrite( true );
+    return result;
 }
 
 KTextEditor::View*
-ScriptConsoleItem::createEditorView( QWidget *parent )
+ScriptConsoleItem::getEditorView( QWidget *parent )
 {
-    if( !m_view )
-        m_view = m_viewFactory->createView( parent );
-    else
-        m_view->setParent( parent );
+    m_view->setParent( parent );
     return m_view.data();
 }
 
+QWidget *
+ScriptConsoleItem::getConsoleWidget( QWidget *parent )
+{
+    m_console->setParent( parent );
+    return m_console.data();
+}
+
+void
+ScriptConsoleItem::appendToConsoleWidget( const QString &msg )
+{
+    m_console->appendPlainText( msg );
+}
+
+QWidget *
+ScriptConsoleItem::getOutputWdiget( QWidget *parent )
+{
+    m_output->setParent( parent );
+    return m_output.data();
+}
+
+QWidget *
+ScriptConsoleItem::getErrorWidget( QWidget *parent )
+{
+    m_error->setParent( parent );
+    return m_error.data();
+}
+
 void
 ScriptConsoleItem::initializeScriptEngine()
 {
@@ -138,11 +185,12 @@ ScriptConsoleItem::setClearOnDeletion( bool clearOnDelete )
 }
 
 QString
-ScriptConsoleItem::handleError( QScriptEngine *engine )
+ScriptConsoleItem::handleError( QJSValue *result )
 {
     QString errorString = QStringLiteral( "Script Error: %1 (line: %2)" )
-                        .arg( engine->uncaughtException().toString(),
-                              QString::number( engine->uncaughtExceptionLineNumber() ) );
+                        .arg( result->toString() )
+                        .arg( result->property("lineNumber").toInt() );
+
     return errorString;
 }
 
@@ -151,6 +199,18 @@ ScriptConsoleItem::pause()
 {
     if( !running() )
         return;
-    engine()->popContext();
+    ///engine()->popContext();
     ScriptItem::pause();
 }
+
+void
+ScriptConsoleItem::updateOutputWidget( QString output )
+{
+    m_output->appendPlainText( output );
+}
+
+void
+ScriptConsoleItem::updateErrorWidget( QJSValue error )
+{
+    m_error->appendPlainText( handleError( &error ) );
+}
diff --git a/src/scripting/scriptconsole/ScriptConsoleItem.h b/src/scripting/scriptconsole/ScriptConsoleItem.h
index 54b4e4ce14..9b32c6f448 100644
--- a/src/scripting/scriptconsole/ScriptConsoleItem.h
+++ b/src/scripting/scriptconsole/ScriptConsoleItem.h
@@ -22,8 +22,9 @@
 namespace KTextEditor{
     class View;
 }
-class QScriptEngine;
+class QJSValue;
 class QWidget;
+class QPlainTextEdit;
 
 namespace ScriptConsoleNS
 {
@@ -39,7 +40,11 @@ namespace ScriptConsoleNS
             ~ScriptConsoleItem() override;
             ScriptEditorDocument* document() { return m_viewFactory; }
             bool start( bool silent = false ) override;
-            KTextEditor::View *createEditorView( QWidget *parent );
+            KTextEditor::View *getEditorView( QWidget *parent );
+            void appendToConsoleWidget( const QString &msg);
+            QWidget *getConsoleWidget( QWidget *parent );
+            QWidget *getOutputWdiget( QWidget *parent );
+            QWidget *getErrorWidget( QWidget *parent );
 
             /**
              * Clear script files on disk upon object deletion
@@ -47,15 +52,24 @@ namespace ScriptConsoleNS
             void setClearOnDeletion( bool clearOnDelete );
             void pause() override;
 
+        public Q_SLOTS:
+            void updateOutputWidget( QString output );
+            void updateErrorWidget( QJSValue error );
+
+
         private:
             bool m_clearOnDelete;
             ScriptEditorDocument *m_viewFactory;
             QPointer<KTextEditor::View> m_view;
+            QPointer<QPlainTextEdit> m_console;
+            QPointer<QPlainTextEdit> m_output;
+            QPointer<QPlainTextEdit> m_error;
 
             void timerEvent(QTimerEvent* event) override;
             void initializeScriptEngine() override;
             static KPluginInfo createSpecFile( const QString &name, const QString &category, const QString &path );
-            QString handleError( QScriptEngine *engine ) override;
+            QString handleError( QJSValue *result ) override;
+
     };
 }
 
diff --git a/src/scripting/scriptengine/AmarokBookmarkScript.cpp b/src/scripting/scriptengine/AmarokBookmarkScript.cpp
index 37318bd716..935a10126e 100644
--- a/src/scripting/scriptengine/AmarokBookmarkScript.cpp
+++ b/src/scripting/scriptengine/AmarokBookmarkScript.cpp
@@ -26,24 +26,56 @@
 #include "playlist/PlaylistViewUrlGenerator.h"
 #include "scripting/scriptengine/ScriptingDefines.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 Q_DECLARE_METATYPE( StringMap )
 
 using namespace AmarokScript;
 
-AmarokBookmarkScript::AmarokBookmarkScript( QScriptEngine *engine )
+AmarokBookmarkScript::AmarokBookmarkScript( QJSEngine *engine )
     : QObject( engine )
-{
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
-    engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Bookmark"), scriptObject );
-    qScriptRegisterMetaType<BookmarkGroupPtr>( engine, toScriptValue<BookmarkGroupPtr, BookmarkGroupPrototype>, fromScriptValue<BookmarkGroupPtr, BookmarkGroupPrototype> );
-    qScriptRegisterMetaType<AmarokUrlPtr>( engine, toScriptValue<AmarokUrlPtr, BookmarkPrototype>, fromScriptValue<AmarokUrlPtr, BookmarkPrototype> );
-    engine->globalObject().setProperty( QStringLiteral("BookmarkGroup"), engine->newFunction( BookmarkGroupPrototype::bookmarkGroupCtor ) );
-    engine->globalObject().setProperty( QStringLiteral("Bookmark"), engine->newFunction( BookmarkPrototype::bookmarkCtor ) );
-    qScriptRegisterMetaType<BookmarkGroupList>( engine, toScriptArray, fromScriptArray );
-    qScriptRegisterMetaType<BookmarkList>( engine, toScriptArray, fromScriptArray );
+    , m_engine( engine )
+{
+    QJSValue scriptObject = m_engine->newQObject( this );
+    m_engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Bookmark"), scriptObject );
+
+    qRegisterMetaType<BookmarkGroupPtr>();
+    QMetaType::registerConverter<BookmarkGroupPtr,QJSValue>( [=] (BookmarkGroupPtr bGroup) { return toScriptValue<BookmarkGroupPtr, BookmarkGroupPrototype>( m_engine, bGroup ); } );
+    QMetaType::registerConverter<QJSValue,BookmarkGroupPtr>( [] (QJSValue jsValue) {
+            BookmarkGroupPtr bGroup;
+            fromScriptValue<BookmarkGroupPtr, BookmarkGroupPrototype>( jsValue, bGroup );
+            return bGroup;
+        } );
+
+    qRegisterMetaType<AmarokUrlPtr>();
+    QMetaType::registerConverter<AmarokUrlPtr, QJSValue>( [=] (AmarokUrlPtr url) { return toScriptValue<AmarokUrlPtr, BookmarkPrototype>( m_engine, url ); } );
+    QMetaType::registerConverter<QJSValue, AmarokUrlPtr>( [] (QJSValue jsValue) {
+        AmarokUrlPtr url;
+        fromScriptValue<AmarokUrlPtr, BookmarkPrototype>( jsValue, url );
+        return url;
+    } );
+
+    QJSValue bookmarkGroupCtor = scriptObject.property("bookmarkGroupCtorWrapper");
+    m_engine->globalObject().setProperty( QStringLiteral("BookmarkGroup"), bookmarkGroupCtor );
+
+    QJSValue bookmarkCtor = scriptObject.property("bookmarkCtorWrapper");
+    m_engine->globalObject().setProperty( QStringLiteral("Bookmark"), bookmarkCtor );
+
+    qRegisterMetaType<BookmarkGroupList>();
+    QMetaType::registerConverter<BookmarkGroupList, QJSValue>( [=] (BookmarkGroupList bgList) { return toScriptArray<BookmarkGroupList>( m_engine, bgList ); } );
+    QMetaType::registerConverter<QJSValue, BookmarkGroupList>( [] (QJSValue jsValue) {
+        BookmarkGroupList bgList;
+        fromScriptArray<BookmarkGroupList>( jsValue, bgList );
+        return bgList;
+    } );
+
+    qRegisterMetaType<BookmarkList>();
+    QMetaType::registerConverter<BookmarkList,QJSValue>( [=] (BookmarkList bList) { return toScriptArray<BookmarkList>( m_engine, bList); } );
+    QMetaType::registerConverter<QJSValue,BookmarkList>( [] (QJSValue jsValue) {
+        BookmarkList bList;
+        fromScriptArray<BookmarkList>( jsValue, bList );
+        return bList;
+    } );
 }
 
 AmarokUrlPtr
@@ -70,38 +102,49 @@ AmarokBookmarkScript::createCurrentTrackBookmark()
     return AmarokUrlPtr( new AmarokUrl( PlayUrlGenerator::instance()->createCurrentTrackBookmark() ) );
 }
 
+QJSValue
+AmarokBookmarkScript::bookmarkCtorWrapper( QJSValue arg0, QJSValue arg1 )
+{
+    return BookmarkPrototype::bookmarkCtor( arg0, arg1, m_engine );
+}
+
+QJSValue
+AmarokBookmarkScript::bookmarkGroupCtorWrapper( QJSValue arg0, QJSValue arg1 )
+{
+    return BookmarkGroupPrototype::bookmarkGroupCtor( arg0, arg1, m_engine );
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // BookmarkGroupPrototype
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-QScriptValue
-BookmarkGroupPrototype::bookmarkGroupCtor( QScriptContext *context, QScriptEngine *engine )
+QJSValue
+BookmarkGroupPrototype::bookmarkGroupCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engine )
 {
     BookmarkGroup *group = 0;
-    switch( context->argumentCount() )
-    {
-        case 0:
-            return context->throwError( QScriptContext::SyntaxError, QStringLiteral("Not enough arguments!!") );
-
-        case 1:
-            if( context->argument( 0 ).isString() )
-                group = new BookmarkGroup( context->argument( 0 ).toString() );
-            break;
-
-        case 2:
-            if( context->argument( 0 ).isString() )
-            {
-                QString name = context->argument( 0 ).toString();
-                if( context->argument( 1 ).isString() )
-                    group = new BookmarkGroup( name, context->argument( 1 ).toString() );
-                else if( dynamic_cast<BookmarkGroupPrototype*>( context->argument(1).toQObject() ) )
-                    group = new BookmarkGroup( name, dynamic_cast<BookmarkGroupPrototype*>( context->argument(1).toQObject() )->data() );
-            }
-            break;
+    if ( arg1.isUndefined() ) {
+        if( arg0.isString() )
+            group = new BookmarkGroup( arg0.toString() );
+    } else {
+        if( arg0.isString() )
+        {
+            QString name = arg0.toString();
+            if( arg1.isString() )
+                group = new BookmarkGroup( name, arg1.toString() );
+            else if( dynamic_cast<BookmarkGroupPrototype*>( arg1.toQObject() ) )
+                group = new BookmarkGroup( name, dynamic_cast<BookmarkGroupPrototype*>( arg1.toQObject() )->data() );
+        }
     }
-    if( !group )
-        return context->throwError( QScriptContext::TypeError, QStringLiteral("Invalid arguments!") );
-    return engine->newQObject( new BookmarkGroupPrototype( BookmarkGroupPtr( group ) ), QScriptEngine::ScriptOwnership, QScriptEngine::ExcludeSuperClassContents );
+    if( !group ) {
+        /* TODO - Use commented code once QT versions >= 5.12
+        QJSValue errorObj = engine->newErrorObject( QJSValue::TypeError,  QStringLiteral("Invalid arguments!") );
+        engine->throwError( errorObj.errorType(), errorObj.toString() );
+        return errorObj;
+        */
+        return engine->evaluate("throw new TypeError('Invalid arguments!')");
+    }
+
+    return engine->newQObject( new BookmarkGroupPrototype( BookmarkGroupPtr( group ) ) );
 }
 
 BookmarkGroupPrototype::BookmarkGroupPrototype( const BookmarkGroupPtr &group )
@@ -210,41 +253,37 @@ BookmarkPrototype::save()
     return success;
 }
 
-QScriptValue
-BookmarkPrototype::bookmarkCtor( QScriptContext *context, QScriptEngine *engine )
+QJSValue
+BookmarkPrototype::bookmarkCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engine )
 {
     AmarokUrlPtr url;
-    switch( context->argumentCount() )
-    {
-        case 0:
-            return context->throwError( QScriptContext::SyntaxError, QStringLiteral("Not enough arguments!!") );
-
-        case 1:
-            if( context->argument( 0 ).isString() )
-                url = new AmarokUrl( context->argument( 0 ).toString() );
-            break;
-
-        case 2:
-            if( context->argument( 0 ).isString() )
+    if ( arg1.isUndefined() ) {
+            if( arg0.isString() )
+                url = new AmarokUrl( arg0.toString() );
+    } else {
+            if( arg0.isString() )
             {
-                BookmarkGroupPrototype *proto = dynamic_cast<BookmarkGroupPrototype*>( context->argument(1).toQObject() );
+                BookmarkGroupPrototype *proto = dynamic_cast<BookmarkGroupPrototype*>( arg1.toQObject() );
                 if( proto )
-                    url = new AmarokUrl( context->argument( 0 ).toString(), proto->data() );
+                    url = new AmarokUrl( arg0.toString(), proto->data() );
             }
             else
             {
-                Meta::TrackPtr track = engine->fromScriptValue<Meta::TrackPtr>( context->argument( 0 ) );
-                if( track && context->argument( 1 ).toVariant().canConvert( QVariant::LongLong ) )
-                    url = new AmarokUrl( PlayUrlGenerator::instance()->createTrackBookmark( track, context->argument(1).toVariant().toLongLong() ) );
+                Meta::TrackPtr track = engine->fromScriptValue<Meta::TrackPtr>( arg0 );
+                if( track && arg1.toVariant().canConvert( QVariant::LongLong ) )
+                    url = new AmarokUrl( PlayUrlGenerator::instance()->createTrackBookmark( track, arg1.toVariant().toLongLong() ) );
             }
-            break;
     }
-    if( !url )
-        return context->throwError( QScriptContext::TypeError, QStringLiteral("Invalid arguments!") );
+    if( !url ) {
+        /* TODO - Use commented code once QT versions >= 5.12
+        QJSValue errorObj = engine->newErrorObject( QJSValue::TypeError,  QStringLiteral("Invalid arguments!") );
+        engine->throwError( errorObj.errorType(), errorObj.toString() );
+        return errorObj;
+        */
+        return engine->evaluate("throw new TypeError('Invalid arguments!')");
+    }
 
-    return engine->newQObject( new BookmarkPrototype( url ),
-                               QScriptEngine::ScriptOwnership,
-                               QScriptEngine::ExcludeSuperClassContents );
+    return engine->newQObject( new BookmarkPrototype( url ) );
 }
 
 BookmarkPrototype::BookmarkPrototype( const AmarokUrlPtr &bookmark )
diff --git a/src/scripting/scriptengine/AmarokBookmarkScript.h b/src/scripting/scriptengine/AmarokBookmarkScript.h
index 67e1e46d92..cab02ecb7f 100644
--- a/src/scripting/scriptengine/AmarokBookmarkScript.h
+++ b/src/scripting/scriptengine/AmarokBookmarkScript.h
@@ -20,13 +20,12 @@
 #include "amarokurls/BookmarkGroup.h"
 #include "core/meta/Meta.h"
 
+#include <QJSValue>
 #include <QObject>
 #include <QMap>
 #include <QMetaType>
 
-class QScriptContext;
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
 
 typedef QMap< QString, QString > StringMap;
 
@@ -38,7 +37,7 @@ namespace AmarokScript
         Q_OBJECT
 
         public:
-            explicit AmarokBookmarkScript( QScriptEngine* scriptEngine );
+            explicit AmarokBookmarkScript( QJSEngine* scriptEngine );
 
             /**
              * @return bookmark for the current context view.
@@ -59,6 +58,21 @@ namespace AmarokScript
              * Bookmark the current track at the current position.
              */
             Q_INVOKABLE AmarokUrlPtr createCurrentTrackBookmark();
+
+            /**
+             * Wraps the invocation to BookmarkPrototype::bookmarkCtor so it can bind to a QJSEngine
+             */
+            Q_INVOKABLE QJSValue bookmarkCtorWrapper( QJSValue arg0, QJSValue arg1  = QJSValue(QJSValue::UndefinedValue ) );
+
+            /**
+             * Wraps the invocation to BookmarkGroupPrototype::bookmarkGroupCtor so it can bind to a QJSEngine
+             */
+            Q_INVOKABLE QJSValue bookmarkGroupCtorWrapper( QJSValue arg0, QJSValue arg1 = QJSValue(QJSValue::UndefinedValue ) );
+
+        private:
+
+            QJSEngine *m_engine;
+
     };
 
     class BookmarkPrototype : public QObject
@@ -76,8 +90,8 @@ namespace AmarokScript
         Q_PROPERTY( QString url READ url )
 
         public:
-            static QScriptValue bookmarkCtor( QScriptContext *context, QScriptEngine *engine );
             explicit BookmarkPrototype( const AmarokUrlPtr &bookmark );
+            static QJSValue bookmarkCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engine );
             AmarokUrlPtr data() const { return m_url; }
 
             /**
@@ -132,7 +146,7 @@ namespace AmarokScript
 
         public:
             explicit BookmarkGroupPrototype( const BookmarkGroupPtr &group );
-            static QScriptValue bookmarkGroupCtor( QScriptContext *context, QScriptEngine *engine );
+            static QJSValue bookmarkGroupCtor( QJSValue &arg0, QJSValue &arg1, QJSEngine *engine);
             BookmarkGroupPtr data() const { return m_group; }
 
             /**
diff --git a/src/scripting/scriptengine/AmarokCollectionScript.cpp b/src/scripting/scriptengine/AmarokCollectionScript.cpp
index 95b3035516..e7473588e4 100644
--- a/src/scripting/scriptengine/AmarokCollectionScript.cpp
+++ b/src/scripting/scriptengine/AmarokCollectionScript.cpp
@@ -25,7 +25,7 @@
 #include "core-impl/collections/db/sql/SqlCollectionLocation.h"
 #include "core/collections/QueryMaker.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 #define SCRIPTING_DEPRECATED( x ) \
                                     AmarokScriptEngine *amarokScriptEngine = dynamic_cast<AmarokScriptEngine*>(parent()); \
@@ -40,8 +40,7 @@ using Collections::QueryMaker;
 AmarokCollectionScript::AmarokCollectionScript( AmarokScriptEngine *engine )
     : QObject( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     //deprecate
     engine->setDeprecatedProperty( QStringLiteral("Amarok"), QStringLiteral("Collection"), scriptObject );
 
diff --git a/src/scripting/scriptengine/AmarokCollectionViewScript.cpp b/src/scripting/scriptengine/AmarokCollectionViewScript.cpp
index 52a574fc74..4273bb38e6 100644
--- a/src/scripting/scriptengine/AmarokCollectionViewScript.cpp
+++ b/src/scripting/scriptengine/AmarokCollectionViewScript.cpp
@@ -32,7 +32,8 @@
 
 #include <QMenu>
 #include <QMetaEnum>
-#include <QScriptEngine>
+#include <QQmlEngine>
+#include <QJSEngine>
 #include <QSortFilterProxyModel>
 
 Q_DECLARE_METATYPE( QAction* )
@@ -50,9 +51,8 @@ AmarokCollectionViewScript::AmarokCollectionViewScript( AmarokScriptEngine *engi
     , m_scriptName( scriptName )
     , m_categoryEnum( metaObject()->enumerator( metaObject()->indexOfEnumerator("Category") ) )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
-    QScriptValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
+    QJSValue scriptObject = engine->newQObject( this );
+    QJSValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
     Q_ASSERT( !windowObject.isUndefined() );
     windowObject.setProperty( QStringLiteral("CollectionView"), scriptObject );
     const QMetaEnum typeEnum = CollectionTreeItem::staticMetaObject.enumerator( CollectionTreeItem::staticMetaObject.indexOfEnumerator( "Type" ) );
@@ -60,7 +60,14 @@ AmarokCollectionViewScript::AmarokCollectionViewScript( AmarokScriptEngine *engi
     scriptObject.setProperty( QStringLiteral("Type"), engine->enumObject( typeEnum ) );
     Q_ASSERT( m_categoryEnum.isValid() );
     scriptObject.setProperty( QStringLiteral("Category"), engine->enumObject( m_categoryEnum ) );
-    qScriptRegisterMetaType<CollectionTreeItem*>( engine, CollectionViewItem::toScriptValue, fromScriptValue<CollectionTreeItem*, CollectionViewItem> );
+
+    qRegisterMetaType<CollectionTreeItem*>();
+    QMetaType::registerConverter<CollectionTreeItem*, QJSValue>( [=] (CollectionTreeItem* item) { return CollectionViewItem::toScriptValue( m_engine, item ); } );
+    QMetaType::registerConverter<QJSValue, CollectionTreeItem*>( [=] (QJSValue jsValue) {
+        CollectionTreeItem* item;
+        fromScriptValue<CollectionTreeItem*, CollectionViewItem>( jsValue, item );
+        return item;
+    } );
     engine->registerArrayType< QList<CollectionTreeItem*> >();
     engine->registerArrayType<QActionList>();
     s_instances[m_scriptName] = this;
@@ -89,14 +96,14 @@ AmarokCollectionViewScript::filter() const
 QActionList
 AmarokCollectionViewScript::actions()
 {
-    QScriptValue actions = m_actionFunction.call( QScriptValue(), QScriptValueList() << selectionScriptValue() );
+    QJSValue actions = m_actionFunction.call( QJSValueList() << selectionScriptValue() );
     QActionList actionList = m_engine->fromScriptValue<QActionList>( actions );
     debug() << "Received " << actionList.size() << " actions";
     return actionList;
 }
 
 void
-AmarokCollectionViewScript::setAction( const QScriptValue &value )
+AmarokCollectionViewScript::setAction( const QJSValue &value )
 {
     m_actionFunction = value;
 }
@@ -131,11 +138,12 @@ AmarokCollectionViewScript::createScriptedActions( QMenu &menu, const QModelInde
     }
 }
 
-QScriptValue
+QJSValue
 AmarokCollectionViewScript::selectionScriptValue()
 {
-    return m_engine->newQObject( s_selection.data(), QScriptEngine::QtOwnership,
-                                QScriptEngine::ExcludeSuperClassContents );
+    QQmlEngine::setObjectOwnership( s_selection.data(), QQmlEngine::CppOwnership);
+    return m_engine->newQObject( s_selection.data() );
+
 }
 
 Selection*
@@ -208,7 +216,10 @@ AmarokCollectionViewScript::setLevel( int level, int type )
         m_collectionWidget->currentView()->setLevel( level, CategoryId::CatMenuId( type ) );
         return;
     }
-    m_engine->currentContext()->throwError( QScriptContext::TypeError, QStringLiteral("Invalid category!") );
+    /* TODO - Use commented code once QT versions >= 5.12
+    m_engine->throwError( QJSValue::TypeError, QStringLiteral("Invalid category!") );
+    */
+    m_engine->evaluate("throw new TypeError('Invalid category!')");
 }
 
 void
@@ -219,7 +230,10 @@ AmarokCollectionViewScript::setLevels( const QList<int> &levels )
     {
         if( !m_categoryEnum.valueToKey( level ) )
         {
-            m_engine->currentContext()->throwError( QScriptContext::TypeError, QStringLiteral("Invalid category!") );
+            /* TODO - Use commented code once QT versions >= 5.12
+            m_engine->throwError( QJSValue::TypeError, QStringLiteral("Invalid category!") );
+            */
+            m_engine->evaluate("throw new TypeError('Invalid category!')");
             return;
         }
         catLevels << CategoryId::CatMenuId( level );
@@ -296,12 +310,11 @@ CollectionViewItem::data() const
     return m_item;
 }
 
-QScriptValue
-CollectionViewItem::toScriptValue( QScriptEngine *engine, CollectionTreeItem* const &item )
+QJSValue
+CollectionViewItem::toScriptValue( QJSEngine *engine, CollectionTreeItem* const &item )
 {
     CollectionViewItem *proto = new CollectionViewItem( item, AmarokCollectionViewScript::selection() );
-    QScriptValue val = engine->newQObject( proto, QScriptEngine::AutoOwnership,
-                                            QScriptEngine::ExcludeSuperClassContents );
+    QJSValue val = engine->newQObject( proto );
     return val;
 }
 
diff --git a/src/scripting/scriptengine/AmarokCollectionViewScript.h b/src/scripting/scriptengine/AmarokCollectionViewScript.h
index 58872fc4d4..3011d01cb8 100644
--- a/src/scripting/scriptengine/AmarokCollectionViewScript.h
+++ b/src/scripting/scriptengine/AmarokCollectionViewScript.h
@@ -27,7 +27,7 @@
 #include <QMetaEnum>
 #include <QMetaType>
 #include <QModelIndexList>
-#include <QScriptValue>
+#include <QJSValue>
 
 class CollectionTreeItemModelBase;
 class CollectionWidget;
@@ -38,7 +38,6 @@ namespace Collections
     class QueryMaker;
 }
 class QMenu;
-class QScriptEngine;
 typedef QList<QAction*> QActionList;
 
 namespace AmarokScript
@@ -56,7 +55,7 @@ namespace AmarokScript
         Q_OBJECT
 
         Q_PROPERTY( QString filter READ filter WRITE setFilter )
-        Q_PROPERTY( QScriptValue selection READ selectionScriptValue )
+        Q_PROPERTY( QJSValue selection READ selectionScriptValue )
         Q_PROPERTY( bool showYears READ showYears WRITE setShowYears )
         Q_PROPERTY( bool showTrackNumbers READ showTrackNumbers WRITE setShowTrackNumbers )
         Q_PROPERTY( bool showCovers READ showCovers WRITE setShowCovers )
@@ -96,7 +95,7 @@ namespace AmarokScript
             /**
              * Set a function returning a QActionList here.
              */
-            void setAction( const QScriptValue &value );
+            void setAction( const QJSValue &value );
 
         Q_SIGNALS:
             void filterChanged( QString );
@@ -106,7 +105,7 @@ namespace AmarokScript
             void setFilter( const QString &filter );
             QList<int> levels() const;
             void setLevels( const QList<int> &levels );
-            QScriptValue selectionScriptValue();
+            QJSValue selectionScriptValue();
             void setShowYears( bool shown );
             void setShowTrackNumbers( bool shown );
             void setShowCovers( bool shown );
@@ -118,7 +117,7 @@ namespace AmarokScript
 
             static QMap<QString, AmarokCollectionViewScript*> s_instances;
             static QPointer<Selection> s_selection;
-            QScriptValue m_actionFunction;
+            QJSValue m_actionFunction;
             CollectionWidget *m_collectionWidget;
             AmarokScriptEngine *m_engine;
             QString m_scriptName;
@@ -155,7 +154,7 @@ namespace AmarokScript
         public:
             explicit CollectionViewItem( CollectionTreeItem *item, QObject *parent = nullptr );
             CollectionTreeItem* data() const;
-            static QScriptValue toScriptValue( QScriptEngine *engine, CollectionTreeItem* const &item );
+            static QJSValue toScriptValue( QJSEngine *engine, CollectionTreeItem* const &item );
 
             /**
              * @return QueryMaker representing this item's descendant tracks ( or just the item if a track )
diff --git a/src/scripting/scriptengine/AmarokEngineScript.cpp b/src/scripting/scriptengine/AmarokEngineScript.cpp
index 5283ac6922..b8d10bd0ef 100644
--- a/src/scripting/scriptengine/AmarokEngineScript.cpp
+++ b/src/scripting/scriptengine/AmarokEngineScript.cpp
@@ -24,15 +24,14 @@
 #include "playlist/PlaylistActions.h"
 #include "playlist/PlaylistModel.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-AmarokEngineScript::AmarokEngineScript( QScriptEngine* scriptEngine )
+AmarokEngineScript::AmarokEngineScript( QJSEngine* scriptEngine )
     : QObject( scriptEngine )
 {
-    QScriptValue scriptObject = scriptEngine->newQObject( this, QScriptEngine::AutoOwnership
-                                                        , QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = scriptEngine->newQObject( this );
     scriptEngine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Engine"), scriptObject );
 
     EngineController *engine = The::engineController();
diff --git a/src/scripting/scriptengine/AmarokEngineScript.h b/src/scripting/scriptengine/AmarokEngineScript.h
index c6483ae42e..0cf982a394 100644
--- a/src/scripting/scriptengine/AmarokEngineScript.h
+++ b/src/scripting/scriptengine/AmarokEngineScript.h
@@ -22,7 +22,7 @@
 #include <QHash>
 #include <QObject>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -38,7 +38,7 @@ namespace AmarokScript
         Q_PROPERTY( int fadeoutLength READ fadeoutLength WRITE setFadeoutLength )
 
         public:
-            explicit AmarokEngineScript( QScriptEngine* scriptEngine );
+            explicit AmarokEngineScript( QJSEngine* scriptEngine );
 
             enum PlayerStatus
             {
diff --git a/src/scripting/scriptengine/AmarokEqualizerScript.cpp b/src/scripting/scriptengine/AmarokEqualizerScript.cpp
index f9835ad2d0..84787aa6c7 100644
--- a/src/scripting/scriptengine/AmarokEqualizerScript.cpp
+++ b/src/scripting/scriptengine/AmarokEqualizerScript.cpp
@@ -20,15 +20,14 @@
 #include "EngineController.h"
 #include "equalizer/EqualizerPresets.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-AmarokEqualizerScript::AmarokEqualizerScript( QScriptEngine *scriptEngine )
+AmarokEqualizerScript::AmarokEqualizerScript( QJSEngine *scriptEngine )
 : QObject( scriptEngine )
 {
-    QScriptValue scriptObject = scriptEngine->newQObject( this, QScriptEngine::AutoOwnership
-                                                        , QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = scriptEngine->newQObject( this );
     scriptEngine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Engine") ).setProperty( QStringLiteral("Equalizer"), scriptObject );
 
     EqualizerController *equalizer  = The::engineController()->equalizerController();
diff --git a/src/scripting/scriptengine/AmarokEqualizerScript.h b/src/scripting/scriptengine/AmarokEqualizerScript.h
index c3af7aa540..f55275434d 100644
--- a/src/scripting/scriptengine/AmarokEqualizerScript.h
+++ b/src/scripting/scriptengine/AmarokEqualizerScript.h
@@ -19,7 +19,7 @@
 
 #include <QObject>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -119,7 +119,7 @@ namespace AmarokScript
             void equalizerPresetApplied( int index );
 
         private:
-            AmarokEqualizerScript( QScriptEngine* scriptEngine );
+            AmarokEqualizerScript( QJSEngine* scriptEngine );
             bool enabled();
             void setEqualizerPreset( const QString &name ) const;
             QStringList bandFrequencies() const;
diff --git a/src/scripting/scriptengine/AmarokInfoScript.cpp b/src/scripting/scriptengine/AmarokInfoScript.cpp
index e11cb0c60a..831a6f6a14 100644
--- a/src/scripting/scriptengine/AmarokInfoScript.cpp
+++ b/src/scripting/scriptengine/AmarokInfoScript.cpp
@@ -24,7 +24,7 @@
 #include <KIconLoader>
 
 #include <QMetaEnum>
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
@@ -32,8 +32,7 @@ InfoScript::InfoScript( const QUrl &scriptUrl, AmarokScriptEngine *engine )
     : QObject( engine )
     , m_scriptUrl( scriptUrl )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Info"), scriptObject );
 
     const QMetaEnum iconEnum = metaObject()->enumerator( metaObject()->indexOfEnumerator("IconSizes") );
diff --git a/src/scripting/scriptengine/AmarokKNotifyScript.cpp b/src/scripting/scriptengine/AmarokKNotifyScript.cpp
index 994f073a55..7eff5aac3d 100644
--- a/src/scripting/scriptengine/AmarokKNotifyScript.cpp
+++ b/src/scripting/scriptengine/AmarokKNotifyScript.cpp
@@ -20,18 +20,17 @@
 #include "App.h"
 #include "KNotificationBackend.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 #define kNotify Amarok::KNotificationBackend::instance()
 
 using namespace AmarokScript;
 
-AmarokKNotifyScript::AmarokKNotifyScript( QScriptEngine *engine )
+AmarokKNotifyScript::AmarokKNotifyScript( QJSEngine *engine )
     : QObject( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
-    QScriptValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
+    QJSValue scriptObject = engine->newQObject( this );
+    QJSValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
     windowObject.setProperty( QStringLiteral("KNotify"), scriptObject );
 }
 
diff --git a/src/scripting/scriptengine/AmarokKNotifyScript.h b/src/scripting/scriptengine/AmarokKNotifyScript.h
index b444f1fade..fc415ecd27 100644
--- a/src/scripting/scriptengine/AmarokKNotifyScript.h
+++ b/src/scripting/scriptengine/AmarokKNotifyScript.h
@@ -20,7 +20,7 @@
 #include <QObject>
 #include <QPixmap>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -38,7 +38,7 @@ namespace AmarokScript
         Q_PROPERTY( bool kNotifyEnabled READ kNotifyEnabled WRITE setKNotifyEnabled )
 
         public:
-            explicit AmarokKNotifyScript( QScriptEngine* scriptEngine );
+            explicit AmarokKNotifyScript( QJSEngine* scriptEngine );
 
             /**
              * Show notifications for the currently playing track.
diff --git a/src/scripting/scriptengine/AmarokLyricsScript.cpp b/src/scripting/scriptengine/AmarokLyricsScript.cpp
new file mode 100644
index 0000000000..d4b5eedd5a
--- /dev/null
+++ b/src/scripting/scriptengine/AmarokLyricsScript.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************************
+ * Copyright (c) 2008 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2008 Peter ZHOU <peterzhoulei@gmail.com>                               *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 2 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+
+#define DEBUG_PREFIX "AmarokLyricsScript"
+
+#include "AmarokLyricsScript.h"
+
+#include "EngineController.h"
+#include "scripting/scriptmanager/ScriptManager.h"
+#include "lyrics/LyricsManager.h"
+#include "core/meta/Meta.h"
+#include "core/support/Amarok.h"
+#include "core/support/Debug.h"
+
+#include <QApplication>
+#include <QByteArray>
+#include <QJSEngine>
+#include <QTextCodec>
+
+using namespace AmarokScript;
+
+
+AmarokLyricsScript::AmarokLyricsScript( QJSEngine *engine )
+    : QObject( engine )
+{
+    QJSValue scriptObject = engine->newQObject( this );
+    engine->globalObject().property( "Amarok" ).setProperty( "Lyrics", scriptObject );
+    connect( ScriptManager::instance(), &ScriptManager::fetchLyrics,
+             this, &AmarokLyricsScript::fetchLyrics );
+}
+
+void
+AmarokLyricsScript::showLyrics( const QString &lyrics ) const
+{
+    DEBUG_BLOCK
+    Meta::TrackPtr track = The::engineController()->currentTrack();
+    if( !track )
+        return;
+    LyricsManager::instance()->lyricsResult( lyrics.toUtf8(), track ) ;
+}
+
+void
+AmarokLyricsScript::showLyricsHtml( const QString &lyrics ) const
+{
+    showLyrics( lyrics );
+    /*
+    DEBUG_BLOCK
+    Meta::TrackPtr track = The::engineController()->currentTrack();
+    if( !track )
+        return;
+    LyricsManager::instance()->lyricsResultHtml( lyrics, false );
+    */
+}
+
+void
+AmarokLyricsScript::showLyricsError( const QString &error ) const
+{
+    /*
+    DEBUG_BLOCK
+    LyricsManager::instance()->lyricsError( error );
+    */
+    Q_UNUSED( error );
+}
+
+
+void
+AmarokLyricsScript::showLyricsNotFound( const QString &msg ) const
+{
+    /*
+    DEBUG_BLOCK
+    LyricsManager::instance()->lyricsNotFound( msg );
+    */
+    Q_UNUSED( msg );
+}
+ 
+
+QString
+AmarokLyricsScript::escape( const QString &str )
+{
+    return str.toHtmlEscaped();
+}
+
+void
+AmarokLyricsScript::setLyricsForTrack( const QString &trackUrl, const QString &lyrics ) const
+{
+    /* TODO - convert method invocation below
+    LyricsManager::instance()->setLyricsForTrack( trackUrl, lyrics );
+    */
+}
+
+QString
+AmarokLyricsScript::toUtf8( const QByteArray &lyrics, const QString &encoding )
+{
+    QTextCodec* codec = QTextCodec::codecForName( encoding.toUtf8() );
+    if( !codec )
+        return QString();
+    return codec->toUnicode( lyrics );
+}
+
+QString
+AmarokLyricsScript::QStringtoUtf8( const QString &lyrics, const QString &encoding )
+{
+    QTextCodec* codec = QTextCodec::codecForName( encoding.toUtf8() );
+    if( !codec )
+        return QString();
+    return codec->toUnicode( lyrics.toLatin1() );
+}
+
+QByteArray
+AmarokLyricsScript::fromUtf8( const QString &str, const QString &encoding )
+{
+    QTextCodec* codec = QTextCodec::codecForName( encoding.toUtf8() );
+    if( !codec )
+        return QByteArray();
+
+    return codec->fromUnicode( str );
+}
diff --git a/src/scripting/scriptengine/AmarokLyricsScript.h b/src/scripting/scriptengine/AmarokLyricsScript.h
new file mode 100644
index 0000000000..0ba6e9f0f2
--- /dev/null
+++ b/src/scripting/scriptengine/AmarokLyricsScript.h
@@ -0,0 +1,56 @@
+/****************************************************************************************
+ * Copyright (c) 2008 Leo Franchi <lfranchi@kde.org>                                    *
+ * Copyright (c) 2008 Peter ZHOU <peterzhoulei@gmail.com>                               *
+ *                                                                                      *
+ * This program is free software; you can redistribute it and/or modify it under        *
+ * the terms of the GNU General Public License as published by the Free Software        *
+ * Foundation; either version 2 of the License, or (at your option) any later           *
+ * version.                                                                             *
+ *                                                                                      *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY      *
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A      *
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.             *
+ *                                                                                      *
+ * You should have received a copy of the GNU General Public License along with         *
+ * this program.  If not, see <http://www.gnu.org/licenses/>.                           *
+ ****************************************************************************************/
+
+#ifndef AMAROK_LYRICS_SCRIPT_H
+#define AMAROK_LYRICS_SCRIPT_H
+
+#include "core/meta/forward_declarations.h"
+
+#include <QObject>
+
+class QJSEngine;
+class QByteArray;
+
+namespace AmarokScript
+{
+    // SCRIPTDOX Amarok.Lyrics
+    class AmarokLyricsScript : public QObject
+    {
+        Q_OBJECT
+
+        public:
+            explicit AmarokLyricsScript( QJSEngine* scriptEngine );
+
+            Q_INVOKABLE void showLyrics( const QString& lyrics ) const;
+
+            Q_INVOKABLE void showLyricsHtml( const QString& lyrics ) const;
+            Q_INVOKABLE void showLyricsError( const QString& error ) const;
+            Q_INVOKABLE void showLyricsNotFound( const QString& msg ) const;
+
+            Q_INVOKABLE QString escape( const QString& str );
+
+            Q_INVOKABLE void setLyricsForTrack( const QString& trackUrl , const QString& lyrics ) const;
+            Q_INVOKABLE QString toUtf8( const QByteArray& lyrics, const QString& encoding = "UTF-8" );
+            Q_INVOKABLE QString QStringtoUtf8( const QString& lyrics, const QString& encoding = "UTF-8" );
+            Q_INVOKABLE QByteArray fromUtf8( const QString& str, const QString& encoding );
+
+        Q_SIGNALS:
+            void fetchLyrics( const QString& artist, const QString& title, const QString&, Meta::TrackPtr );
+    };
+}
+
+#endif
diff --git a/src/scripting/scriptengine/AmarokNetworkScript.cpp b/src/scripting/scriptengine/AmarokNetworkScript.cpp
index 7c13a31f7d..ad56a89409 100644
--- a/src/scripting/scriptengine/AmarokNetworkScript.cpp
+++ b/src/scripting/scriptengine/AmarokNetworkScript.cpp
@@ -22,7 +22,7 @@
 #include "App.h"
 #include "core/support/Debug.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QTextCodec>
 
 #include <KLocalizedString>
@@ -31,64 +31,44 @@ using namespace AmarokScript;
 
 AmarokDownloadHelper *AmarokDownloadHelper::s_instance = nullptr;
 
-Downloader::Downloader( QScriptEngine* engine )
+Downloader::Downloader( QJSEngine* engine )
     : QObject( engine )
     , m_scriptEngine( engine )
 {
-    engine->setDefaultPrototype( qMetaTypeId<Downloader*>(), QScriptValue() );
-    const QScriptValue stringCtor = engine->newFunction( stringDownloader_prototype_ctor );
-    engine->globalObject().setProperty( QStringLiteral("Downloader"), stringCtor ); //kept for compat
-    engine->globalObject().setProperty( QStringLiteral("StringDownloader"), stringCtor ); //added for clarity
-    const QScriptValue dataCtor = engine->newFunction( dataDownloader_prototype_ctor );
-    engine->globalObject().setProperty( QStringLiteral("DataDownloader"), dataCtor );
+    QJSValue scriptObj = engine->newQObject( this );
+    scriptObj.setPrototype( QJSValue() );
+    const QJSValue stringDownloadCtor = scriptObj.property( "downloader_prototype_ctor" );
+    engine->globalObject().setProperty( QStringLiteral("Downloader"), stringDownloadCtor); //kept for compat
+    engine->globalObject().setProperty( QStringLiteral("StringDownloader"), stringDownloadCtor ); //added for clarity
+    const QJSValue dataDownloadCtor = scriptObj.property( "dataDownloader_prototype_ctor(" );
+    engine->globalObject().setProperty( QStringLiteral("DataDownloader"), dataDownloadCtor );
 }
 
-QScriptValue
-Downloader::stringDownloader_prototype_ctor( QScriptContext* context, QScriptEngine* engine )
+QJSValue
+Downloader::stringDownloader_prototype_ctor( QString urlString, QJSValue callable, QString encoding )
 {
-    return init( context, engine, true );
+    return init( urlString, callable, true, encoding );
 }
 
-QScriptValue
-Downloader::dataDownloader_prototype_ctor( QScriptContext* context, QScriptEngine* engine )
+QJSValue
+Downloader::dataDownloader_prototype_ctor( QString urlString, QJSValue callable )
 {
-    if( engine->importedExtensions().contains( QStringLiteral("qt.core") ) )
-        return init( context, engine, false );
-    else
-    {
-        context->throwError( i18nc("do not translate 'DataDownloader' or 'qt.core'", "qt.core must be loaded to use DataDownloader" ) );
-        return engine->toScriptValue( false );
-    }
+    return init( urlString, callable, false );
 }
 
-QScriptValue
-Downloader::init( QScriptContext* context, QScriptEngine *engine, bool stringResult )
+QJSValue
+Downloader::init( const QString &urlString, const QJSValue &callable, bool stringResult, QString encoding )
 {
-    // from QtScript API docs
     DEBUG_BLOCK
-    QScriptValue object;
-
-    if( context->isCalledAsConstructor() )
-        object = context->thisObject();
-    else
-    {
-        object = engine->newObject();
-        object.setPrototype( context->callee().property(QStringLiteral("prototype")) );
-    }
-
-    if( context->argumentCount() < 2 )
-    {
-        debug() << "ERROR! Constructor not called with enough arguments:" << context->argumentCount();
-        return object;
-    }
+    QJSValue object = m_scriptEngine->newQObject( new QObject() );
 
-    if( !context->argument( 1 ).isFunction() ) //TODO: check QUrl
+    if( callable.isCallable() )
     {
         debug() << "ERROR! Constructor not called with a Url and function!";
         return object;
     }
 
-    QUrl url = QUrl::fromEncoded( context->argument( 0 ).toString().toLatin1(), QUrl::StrictMode );
+    QUrl url = QUrl::fromEncoded( urlString.toLatin1(), QUrl::StrictMode );
 
     if( !url.isValid() )
     {
@@ -99,16 +79,14 @@ Downloader::init( QScriptContext* context, QScriptEngine *engine, bool stringRes
     // start download, and connect to it
     if( stringResult )
     {
-        QString encoding = QStringLiteral("UTF-8");
-        if( context->argumentCount() == 3 ) // encoding specified
-            encoding = context->argument( 2 ).toString();
-        AmarokDownloadHelper::instance()->newStringDownload( url, engine, context->argument( 1 ), encoding );
+        AmarokDownloadHelper::instance()->newStringDownload( url, m_scriptEngine, callable, encoding );
     }
     else
-        AmarokDownloadHelper::instance()->newDataDownload( url, engine, context->argument( 1 ) );
+        AmarokDownloadHelper::instance()->newDataDownload( url, m_scriptEngine, callable );
     // connect to a local slot to extract the qstring
     //qScriptConnect( job, SIGNAL(result(KJob*)), object, fetchResult( job ) );
-    return object;
+
+    return m_scriptEngine->newQObject( new QObject() );
 }
 
 ///////
@@ -123,14 +101,14 @@ AmarokDownloadHelper::AmarokDownloadHelper()
 }
 
 void
-AmarokDownloadHelper::newStringDownload( const QUrl &url, QScriptEngine* engine, const QScriptValue &obj, const QString &encoding )
+AmarokDownloadHelper::newStringDownload( const QUrl &url, QJSEngine* engine, const QJSValue &obj, const QString &encoding )
 {
     m_encodings[ url ] = encoding;
     newDownload( url, engine, obj, &AmarokDownloadHelper::resultString );
 }
 
 void
-AmarokDownloadHelper::newDataDownload( const QUrl &url, QScriptEngine* engine, const QScriptValue &obj )
+AmarokDownloadHelper::newDataDownload( const QUrl &url, QJSEngine* engine, const QJSValue &obj )
 {
     newDownload( url, engine, obj, &AmarokDownloadHelper::resultData );
 }
@@ -141,8 +119,8 @@ AmarokDownloadHelper::requestRedirected( const QUrl &sourceUrl, const QUrl &targ
     DEBUG_BLOCK
 
     // Move all entries from "url" to "targetUrl".
-    updateUrl< QScriptEngine* >( m_engines, sourceUrl, targetUrl );
-    updateUrl< QScriptValue >( m_values, sourceUrl, targetUrl );
+    updateUrl< QJSEngine* >( m_engines, sourceUrl, targetUrl );
+    updateUrl< QJSValue >( m_values, sourceUrl, targetUrl );
     updateUrl< QString >( m_encodings, sourceUrl, targetUrl );
 }
 
@@ -155,12 +133,12 @@ AmarokDownloadHelper::resultData( const QUrl &url, const QByteArray &data, const
     if( e.code != QNetworkReply::NoError )
         warning() << "Error fetching data:" << e.description;
 
-    QScriptValue obj = m_values.value( url );
-    QScriptEngine* engine = m_engines.value( url );
+    QJSValue obj = m_values.value( url );
+    QJSEngine* engine = m_engines.value( url );
     cleanUp( url );
 
     // now send the data to the associated script object
-    if( !obj.isFunction() )
+    if( !obj.isCallable() )
     {
         debug() << "script object is valid but not a function!!";
         return;
@@ -172,9 +150,9 @@ AmarokDownloadHelper::resultData( const QUrl &url, const QByteArray &data, const
         return;
     }
 
-    QScriptValueList args;
+    QJSValueList args;
     args << engine->toScriptValue( data );
-    obj.call( obj, args );
+    obj.call( args );
 }
 
 
@@ -187,8 +165,8 @@ AmarokDownloadHelper::resultString( const QUrl &url, const QByteArray &data, con
     if( e.code != QNetworkReply::NoError )
         warning() << "Error fetching string:" << e.description;
 
-    QScriptValue obj = m_values.value( url );
-    QScriptEngine* engine = m_engines.value( url );
+    QJSValue obj = m_values.value( url );
+    QJSEngine* engine = m_engines.value( url );
     QString encoding = m_encodings.value( url );
     cleanUp( url );
 
@@ -204,7 +182,7 @@ AmarokDownloadHelper::resultString( const QUrl &url, const QByteArray &data, con
     }
 
     // now send the data to the associated script object
-    if( !obj.isFunction() )
+    if( !obj.isCallable() )
     {
         debug() << "script object is valid but not a function!!";
         return;
@@ -216,9 +194,9 @@ AmarokDownloadHelper::resultString( const QUrl &url, const QByteArray &data, con
         return;
     }
 
-    QScriptValueList args;
+    QJSValueList args;
     args << engine->toScriptValue( str );
-    obj.call( obj, args );
+    obj.call( args );
 }
 
 void
diff --git a/src/scripting/scriptengine/AmarokNetworkScript.h b/src/scripting/scriptengine/AmarokNetworkScript.h
index a4f3914ea8..c2d4e17aa1 100644
--- a/src/scripting/scriptengine/AmarokNetworkScript.h
+++ b/src/scripting/scriptengine/AmarokNetworkScript.h
@@ -23,12 +23,11 @@
 #include <QUrl>
 
 #include <QHash>
+#include <QJSValue>
 #include <QList>
 #include <QObject>
-#include <QScriptValue>
 
-class QScriptContext;
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -37,14 +36,14 @@ namespace AmarokScript
         Q_OBJECT
 
         public:
-            explicit Downloader( QScriptEngine* scriptEngine );
+            explicit Downloader( QJSEngine* scriptEngine );
+            Q_INVOKABLE QJSValue stringDownloader_prototype_ctor( QString urlString, QJSValue callable, QString encoding = QStringLiteral("UTF-8") );
+            Q_INVOKABLE QJSValue dataDownloader_prototype_ctor( QString urlString, QJSValue callable);
 
         private:
-            static QScriptValue dataDownloader_prototype_ctor( QScriptContext* context, QScriptEngine* engine );
-            static QScriptValue stringDownloader_prototype_ctor( QScriptContext* context, QScriptEngine* engine );
-            static QScriptValue init( QScriptContext* context, QScriptEngine* engine, bool stringResult );
+            QJSValue init( const QString &urlString, const QJSValue &callable, bool stringResult, QString encoding = QStringLiteral("UTF-8") );
 
-            QScriptEngine* m_scriptEngine;
+            QJSEngine* m_scriptEngine;
     };
 
     // this internal class manages multiple downloads from a script.
@@ -61,8 +60,8 @@ namespace AmarokScript
             static AmarokDownloadHelper *instance();
 
             // called by the wrapper class to register a new download
-            void newStringDownload( const QUrl &url, QScriptEngine* engine, const QScriptValue &obj, const QString &encoding = QStringLiteral("UTF-8") );
-            void newDataDownload( const QUrl &url, QScriptEngine* engine, const QScriptValue &obj );
+            void newStringDownload( const QUrl &url, QJSEngine* engine, const QJSValue &obj, const QString &encoding = QStringLiteral("UTF-8") );
+            void newDataDownload( const QUrl &url, QJSEngine* engine, const QJSValue &obj );
 
         private Q_SLOTS:
             void resultString( const QUrl &url, const QByteArray &data, const NetworkAccessManagerProxy::Error &e );
@@ -74,7 +73,7 @@ namespace AmarokScript
             void cleanUp( const QUrl &url );
 
             template<typename Function>
-            void newDownload( const QUrl &url, QScriptEngine* engine, const QScriptValue &obj, Function slot )
+            void newDownload( const QUrl &url, QJSEngine* engine, const QJSValue &obj, Function slot )
             {
                 m_values[ url ] = obj;
                 m_engines[ url ] = engine;
@@ -108,8 +107,8 @@ namespace AmarokScript
                 hash.remove( sourceUrl );
             };
 
-            QHash<QUrl, QScriptEngine *> m_engines;
-            QHash<QUrl, QScriptValue> m_values;
+            QHash<QUrl, QJSEngine *> m_engines;
+            QHash<QUrl, QJSValue> m_values;
             QHash<QUrl, QString> m_encodings;
     };
 }
diff --git a/src/scripting/scriptengine/AmarokOSDScript.cpp b/src/scripting/scriptengine/AmarokOSDScript.cpp
index 7f824a4f0b..9b52a41629 100644
--- a/src/scripting/scriptengine/AmarokOSDScript.cpp
+++ b/src/scripting/scriptengine/AmarokOSDScript.cpp
@@ -20,16 +20,15 @@
 #include "amarokconfig.h"
 #include "widgets/Osd.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-AmarokOSDScript::AmarokOSDScript( QScriptEngine *engine )
+AmarokOSDScript::AmarokOSDScript( QJSEngine *engine )
     : QObject( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
-    QScriptValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
+    QJSValue scriptObject = engine->newQObject( this) ;
+    QJSValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
     windowObject.setProperty( QStringLiteral("OSD"), scriptObject );
 }
 
diff --git a/src/scripting/scriptengine/AmarokOSDScript.h b/src/scripting/scriptengine/AmarokOSDScript.h
index 5f45e0b054..fc4559d271 100644
--- a/src/scripting/scriptengine/AmarokOSDScript.h
+++ b/src/scripting/scriptengine/AmarokOSDScript.h
@@ -21,7 +21,7 @@
 
 class QColor;
 class QImage;
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -33,7 +33,7 @@ namespace AmarokScript
         Q_PROPERTY ( bool osdEnabled READ osdEnabled WRITE setOsdEnabled )
 
         public:
-            explicit AmarokOSDScript( QScriptEngine* scriptEngine );
+            explicit AmarokOSDScript( QJSEngine* scriptEngine );
 
             /**
              * Show an OSD for the currently playing track, even if the OSD
diff --git a/src/scripting/scriptengine/AmarokPlaylistManagerScript.cpp b/src/scripting/scriptengine/AmarokPlaylistManagerScript.cpp
index ca97879b4d..273f11fea6 100644
--- a/src/scripting/scriptengine/AmarokPlaylistManagerScript.cpp
+++ b/src/scripting/scriptengine/AmarokPlaylistManagerScript.cpp
@@ -22,15 +22,14 @@
 #include "scripting/scriptengine/ScriptingDefines.h"
 
 #include <QMetaEnum>
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
 AmarokPlaylistManagerScript::AmarokPlaylistManagerScript( AmarokScriptEngine* engine )
     : QObject( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("PlaylistManager"), scriptObject );
 
     const QMetaObject *metaObject = &PlaylistManager::staticMetaObject;
diff --git a/src/scripting/scriptengine/AmarokPlaylistScript.cpp b/src/scripting/scriptengine/AmarokPlaylistScript.cpp
index dab798a109..1a21498c94 100644
--- a/src/scripting/scriptengine/AmarokPlaylistScript.cpp
+++ b/src/scripting/scriptengine/AmarokPlaylistScript.cpp
@@ -30,7 +30,7 @@
 #include "playlist/PlaylistDock.h"
 #include "ScriptingDefines.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
@@ -38,7 +38,7 @@ AmarokPlaylistScript::AmarokPlaylistScript( AmarokScriptEngine *engine )
     : QObject( engine )
     , m_scriptEngine( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership, QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Playlist"), scriptObject );
     connect( The::playlist()->qaim(), &QAbstractItemModel::rowsInserted, this, &AmarokPlaylistScript::slotTrackInserted );
     connect( The::playlist()->qaim(), &QAbstractItemModel::rowsRemoved, this, &AmarokPlaylistScript::slotTrackRemoved );
diff --git a/src/scripting/scriptengine/AmarokScript.cpp b/src/scripting/scriptengine/AmarokScript.cpp
index 76cd8229e0..2b5053ad21 100644
--- a/src/scripting/scriptengine/AmarokScript.cpp
+++ b/src/scripting/scriptengine/AmarokScript.cpp
@@ -24,14 +24,13 @@
 
 #include <KMessageBox>
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
-AmarokScript::AmarokScript::AmarokScript( const QString &name, QScriptEngine *engine )
+AmarokScript::AmarokScript::AmarokScript( const QString &name, QJSEngine *engine )
     : QObject( engine )
     , m_name( name )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     engine->globalObject().setProperty( QStringLiteral("Amarok"), scriptObject );
     if( ScriptManager::instance()->m_scripts.contains( name ) )
         connect( ScriptManager::instance()->m_scripts[name], &ScriptItem::uninstalled, this, &AmarokScript::uninstalled );
diff --git a/src/scripting/scriptengine/AmarokScript.h b/src/scripting/scriptengine/AmarokScript.h
index ff5302dfad..1069b64def 100644
--- a/src/scripting/scriptengine/AmarokScript.h
+++ b/src/scripting/scriptengine/AmarokScript.h
@@ -21,7 +21,7 @@
 #include <QStringList>
 #include <QObject>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -31,7 +31,7 @@ namespace AmarokScript
         Q_OBJECT
 
         public:
-            AmarokScript( const QString &name, QScriptEngine *engine );
+            AmarokScript( const QString &name, QJSEngine *engine );
 
             /** Shuts down Amarok completely. */
             Q_INVOKABLE void quitAmarok();
diff --git a/src/scripting/scriptengine/AmarokScriptConfig.cpp b/src/scripting/scriptengine/AmarokScriptConfig.cpp
index f30981fce5..d72e2034b7 100644
--- a/src/scripting/scriptengine/AmarokScriptConfig.cpp
+++ b/src/scripting/scriptengine/AmarokScriptConfig.cpp
@@ -21,16 +21,15 @@
 #include <KConfigGroup>
 #include <KSharedConfig>
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-AmarokScriptConfig::AmarokScriptConfig( const QString &name, QScriptEngine *engine )
+AmarokScriptConfig::AmarokScriptConfig( const QString &name, QJSEngine *engine )
     : QObject( engine )
     , m_name( name )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     //better name?
     engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Script"), scriptObject );
 }
diff --git a/src/scripting/scriptengine/AmarokScriptConfig.h b/src/scripting/scriptengine/AmarokScriptConfig.h
index 2160baba1e..91a43a2bba 100644
--- a/src/scripting/scriptengine/AmarokScriptConfig.h
+++ b/src/scripting/scriptengine/AmarokScriptConfig.h
@@ -21,7 +21,7 @@
 
 #include <QVariant>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -31,7 +31,7 @@ namespace AmarokScript
         Q_OBJECT
 
         public:
-            AmarokScriptConfig( const QString& name, QScriptEngine *engine );
+            AmarokScriptConfig( const QString& name, QJSEngine *engine );
 
             Q_INVOKABLE QVariant readConfig( const QString &name, const QVariant &defaultValue ) const;
             Q_INVOKABLE void writeConfig( const QString &name, const QVariant &content );
diff --git a/src/scripting/scriptengine/AmarokScriptXml.cpp b/src/scripting/scriptengine/AmarokScriptXml.cpp
index f7aaf66266..8f89732f4f 100644
--- a/src/scripting/scriptengine/AmarokScriptXml.cpp
+++ b/src/scripting/scriptengine/AmarokScriptXml.cpp
@@ -22,18 +22,17 @@
 #include "core/support/Debug.h"
 
 #include <QDomDocument>
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QXmlStreamReader>
 
 using namespace AmarokScript;
 
-AmarokScriptXml::AmarokScriptXml( QScriptEngine *engine )
+AmarokScriptXml::AmarokScriptXml( QJSEngine *engine )
     : QObject( engine )
     , m_reader( nullptr )
     , m_domDocument( new QDomDocument )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Xml"), scriptObject );
 }
 
diff --git a/src/scripting/scriptengine/AmarokScriptXml.h b/src/scripting/scriptengine/AmarokScriptXml.h
index 4b1e2a90a5..a03b187f41 100644
--- a/src/scripting/scriptengine/AmarokScriptXml.h
+++ b/src/scripting/scriptengine/AmarokScriptXml.h
@@ -23,7 +23,7 @@
 #include <QObject>
 
 class QDomDocument;
-class QScriptEngine;
+class QJSEngine;
 class QXmlStreamReader;
 
 namespace AmarokScript
@@ -34,7 +34,7 @@ class AmarokScriptXml : public QObject
     Q_OBJECT
 
 public:
-    explicit AmarokScriptXml( QScriptEngine *engine );
+    explicit AmarokScriptXml( QJSEngine *engine );
     ~AmarokScriptXml() override;
 
     Q_INVOKABLE void setReaderData( const QString &data );
diff --git a/src/scripting/scriptengine/AmarokScriptableServiceScript.cpp b/src/scripting/scriptengine/AmarokScriptableServiceScript.cpp
index 02ceb837e8..df30ed7e4d 100644
--- a/src/scripting/scriptengine/AmarokScriptableServiceScript.cpp
+++ b/src/scripting/scriptengine/AmarokScriptableServiceScript.cpp
@@ -25,48 +25,47 @@
 #include "scripting/scriptengine/AmarokStreamItemScript.h"
 #include "scripting/scriptmanager/ScriptManager.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-ScriptableServiceScript::ScriptableServiceScript( QScriptEngine* engine )
+ScriptableServiceScript::ScriptableServiceScript( QJSEngine* engine )
     : QObject( engine )
     , m_scriptEngine( engine )
 {
     DEBUG_BLOCK
-    m_scriptEngine = engine;
-    engine->setDefaultPrototype( qMetaTypeId<ScriptableServiceScript*>(), QScriptValue() );
-    const QScriptValue ctor = engine->newFunction( ScriptableServiceScript_prototype_ctor );
-    engine->globalObject().setProperty( QStringLiteral("ScriptableServiceScript"), ctor );
+    QJSValue scriptObj = engine->newQObject( this );
+    scriptObj.setPrototype( QJSValue() );
+    const QJSValue ctor = scriptObj.property("ScriptableServiceScript_prototype_ctor");
+    engine->globalObject().setProperty( QStringLiteral("ScriptableServiceScript_prototype_ctor"), ctor );
+    // Simulates creation of ScriptableServiceScript object of QTScript
+    engine->evaluate( QStringLiteral("function ScriptableServiceScript( serviceName, levels, shortDescription, rootHtml, showSearchBar) {"
+        "Object.assign( this, ScriptableServiceScript_prototype_ctor(serviceName, levels, shortDescription, rootHtml, showSearchBar) ); }")
+    );
 }
 
-QScriptValue
-ScriptableServiceScript::ScriptableServiceScript_prototype_ctor( QScriptContext *context, QScriptEngine *engine )
+QObject*
+ScriptableServiceScript::ScriptableServiceScript_prototype_ctor( QString serviceName, int levels, QString shortDescription, QString rootHtml, bool showSearchBar )
 {
     DEBUG_BLOCK
-    QString serviceName = context->argument(0).toString();
-    int levels = context->argument(1).toInt32();
-    QString shortDescription = context->argument(2).toString();
-    QString rootHtml = context->argument(3).toString();
-    bool showSearchBar = context->argument(4).toBoolean();
     if( !ScriptManager::instance()->m_scripts.contains( serviceName ) )
     {
         error() << "The name of the scriptable script should be the same with the one in the script.spec file!";
-        return engine->undefinedValue();
+        return nullptr;
     }
-    QScriptValue obj = engine->newQObject( context->thisObject(), ScriptManager::instance()->m_scripts.value(serviceName)->service(),
-                                           QScriptEngine::AutoOwnership, QScriptEngine::ExcludeSuperClassContents );
-    engine->globalObject().setProperty( QStringLiteral("ScriptableServiceScript"), obj );
+    QObject* qObj = ScriptManager::instance()->m_scripts.value(serviceName)->service();
+    QJSValue scriptObj = m_scriptEngine->newQObject( qObj );
+    m_scriptEngine->globalObject().setProperty( QStringLiteral("ScriptableServiceScript"), scriptObj );
     The::scriptableServiceManager()->initService( serviceName, levels, shortDescription, rootHtml, showSearchBar );
-    return engine->undefinedValue();
+    return qObj;
 }
 
-QScriptValue
-ScriptableServiceScript::ScriptableServiceScript_prototype_populate( QScriptContext *context, QScriptEngine *engine )
+QJSValue
+ScriptableServiceScript::ScriptableServiceScript_prototype_populate( QJSEngine *engine )
 {
-    Q_UNUSED( context );
+    Q_UNUSED( engine );
     debug() << "prototype populating here!";
-    return engine->undefinedValue();
+    return QJSValue( QJSValue::UndefinedValue );
 }
 
 int
diff --git a/src/scripting/scriptengine/AmarokScriptableServiceScript.h b/src/scripting/scriptengine/AmarokScriptableServiceScript.h
index 5d13f7ea59..31ef0bfcff 100644
--- a/src/scripting/scriptengine/AmarokScriptableServiceScript.h
+++ b/src/scripting/scriptengine/AmarokScriptableServiceScript.h
@@ -20,26 +20,25 @@
 
 #include <QMetaType> // for Q_DECLARE_METATYPE
 #include <QObject>
-#include <QScriptable>
+#include <QJSValue>
 
 class StreamItem;
 class QPixmap;
-class QScriptContext;
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
     // SCRIPTDOX: ScriptableServiceScript
     /**
-     * Usage: First create the sciprtable service using a call to
+     * Usage: First create the scriptable service using a call to
      * ScriptableServiceScript( string name, int levels, string shortDescription,  string rootHtml, bool showSearchBar )
      */
-    class ScriptableServiceScript : public QObject, public QScriptable
+    class ScriptableServiceScript : public QObject
     {
         Q_OBJECT
 
         public:
-            explicit ScriptableServiceScript( QScriptEngine* engine );
+            explicit ScriptableServiceScript( QJSEngine* engine );
 
             void slotPopulate(const QString &name, int level, int parent_id, const QString &callbackData, const QString &filter );
             void slotRequestInfo(const QString &name, int level, const QString &callbackData );
@@ -56,12 +55,14 @@ namespace AmarokScript
             Q_INVOKABLE void setEmblem( const QPixmap &icon );
             Q_INVOKABLE void setScalableEmblem( const QString &emblemPath );
 
+            Q_INVOKABLE QObject *ScriptableServiceScript_prototype_ctor( QString serviceName, int levels, QString shortDescription, QString rootHtml, bool showSearchBar );
+
+
         private:
-            QScriptEngine* m_scriptEngine;
+            QJSEngine* m_scriptEngine;
             int m_currentId;
             QString m_serviceName;
-            static QScriptValue ScriptableServiceScript_prototype_ctor( QScriptContext *context, QScriptEngine *engine );
-            static QScriptValue ScriptableServiceScript_prototype_populate( QScriptContext *context, QScriptEngine *engine );
+            static QJSValue ScriptableServiceScript_prototype_populate( QJSEngine *engine );
 
         Q_SIGNALS:
             void populate( int, const QString&, const QString& );
diff --git a/src/scripting/scriptengine/AmarokServicePluginManagerScript.cpp b/src/scripting/scriptengine/AmarokServicePluginManagerScript.cpp
index 284a36e603..964cadcfd3 100644
--- a/src/scripting/scriptengine/AmarokServicePluginManagerScript.cpp
+++ b/src/scripting/scriptengine/AmarokServicePluginManagerScript.cpp
@@ -19,15 +19,14 @@
 #include "App.h"
 #include "services/ServicePluginManager.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-AmarokServicePluginManagerScript::AmarokServicePluginManagerScript( QScriptEngine *engine )
+AmarokServicePluginManagerScript::AmarokServicePluginManagerScript( QJSEngine *engine )
     : QObject( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = engine->newQObject( this );
     engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("ServicePluginManager"), scriptObject );
 }
 
diff --git a/src/scripting/scriptengine/AmarokServicePluginManagerScript.h b/src/scripting/scriptengine/AmarokServicePluginManagerScript.h
index 80713ac05a..09af4154fe 100644
--- a/src/scripting/scriptengine/AmarokServicePluginManagerScript.h
+++ b/src/scripting/scriptengine/AmarokServicePluginManagerScript.h
@@ -21,7 +21,7 @@
 #include <QStringList>
 
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -31,7 +31,7 @@ namespace AmarokScript
         Q_OBJECT
 
         public:
-            explicit AmarokServicePluginManagerScript( QScriptEngine* scriptEngine );
+            explicit AmarokServicePluginManagerScript( QJSEngine* scriptEngine );
 
             Q_INVOKABLE QStringList loadedServices();
             Q_INVOKABLE QStringList loadedServiceNames();
diff --git a/src/scripting/scriptengine/AmarokStatusbarScript.cpp b/src/scripting/scriptengine/AmarokStatusbarScript.cpp
index 28b34d5c32..6a0f40d6bf 100644
--- a/src/scripting/scriptengine/AmarokStatusbarScript.cpp
+++ b/src/scripting/scriptengine/AmarokStatusbarScript.cpp
@@ -19,16 +19,15 @@
 #include "core/logger/Logger.h"
 #include "core/support/Components.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 using namespace AmarokScript;
 
-AmarokStatusbarScript::AmarokStatusbarScript( QScriptEngine *engine )
+AmarokStatusbarScript::AmarokStatusbarScript( QJSEngine *engine )
     : QObject( engine )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
-    QScriptValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
+    QJSValue scriptObject = engine->newQObject( this );
+    QJSValue windowObject = engine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") );
     windowObject.setProperty( QStringLiteral("Statusbar"), scriptObject );
 }
 
diff --git a/src/scripting/scriptengine/AmarokStatusbarScript.h b/src/scripting/scriptengine/AmarokStatusbarScript.h
index 133b270843..dabf595476 100644
--- a/src/scripting/scriptengine/AmarokStatusbarScript.h
+++ b/src/scripting/scriptengine/AmarokStatusbarScript.h
@@ -19,7 +19,7 @@
 
 #include <QObject>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -29,7 +29,7 @@ namespace AmarokScript
         Q_OBJECT
 
         public:
-            explicit AmarokStatusbarScript( QScriptEngine* scriptEngine );
+            explicit AmarokStatusbarScript( QJSEngine* scriptEngine );
 
             Q_INVOKABLE void longMessage( const QString &text );
             Q_INVOKABLE void shortMessage( const QString &text );
diff --git a/src/scripting/scriptengine/AmarokStreamItemScript.cpp b/src/scripting/scriptengine/AmarokStreamItemScript.cpp
index f2e92739c8..e95e6a4258 100644
--- a/src/scripting/scriptengine/AmarokStreamItemScript.cpp
+++ b/src/scripting/scriptengine/AmarokStreamItemScript.cpp
@@ -19,18 +19,18 @@
 
 #include "core/support/Debug.h"
 
-#include <QScriptEngine>
+#include <QJSEngine>
 
 //using namespace AmarokScript;
 
-StreamItem::StreamItem( QScriptEngine *engine )
+StreamItem::StreamItem( QJSEngine *engine )
     : QObject( engine )
     , m_year( 0 )
 {
-    QScriptValue scriptObject = engine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                    QScriptEngine::ExcludeSuperClassContents );
-    engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("StreamItem"), scriptObject );
-    engine->setDefaultPrototype( qMetaTypeId<StreamItem*>(), QScriptValue() );
+    qRegisterMetaType<StreamItem*>();
+    QJSValue scriptObj = engine->newQObject( this );
+    scriptObj.setPrototype( QJSValue() );
+    engine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("StreamItem"), scriptObj );
 }
 
 QString
diff --git a/src/scripting/scriptengine/AmarokStreamItemScript.h b/src/scripting/scriptengine/AmarokStreamItemScript.h
index b42649080c..058a29ad85 100644
--- a/src/scripting/scriptengine/AmarokStreamItemScript.h
+++ b/src/scripting/scriptengine/AmarokStreamItemScript.h
@@ -21,7 +21,7 @@
 #include <QMetaType> // for Q_DECLARE_METATYPE
 #include <QObject>
 
-class QScriptEngine;
+class QJSEngine;
 
 //namespace AmarokScript{
 
@@ -44,7 +44,7 @@ class QScriptEngine;
         Q_PROPERTY( QString coverUrl WRITE setCoverUrl READ coverUrl )
 
         public:
-            explicit StreamItem( QScriptEngine *engine );
+            explicit StreamItem( QJSEngine *engine );
 
             QString itemName() const;
             QString infoHtml() const;
diff --git a/src/scripting/scriptengine/AmarokWindowScript.cpp b/src/scripting/scriptengine/AmarokWindowScript.cpp
index d9f2dccfc4..58ffa48a7b 100644
--- a/src/scripting/scriptengine/AmarokWindowScript.cpp
+++ b/src/scripting/scriptengine/AmarokWindowScript.cpp
@@ -76,8 +76,7 @@ AmarokWindowScript::AmarokWindowScript( AmarokScriptEngine* scriptEngine )
     , m_settingsMenu( The::mainWindow()->SettingsMenu() )
     , m_scriptEngine( scriptEngine )
 {
-    QScriptValue windowObject = scriptEngine->newQObject( this, QScriptEngine::AutoOwnership,
-                                                            QScriptEngine::ExcludeSuperClassContents );
+    QJSValue windowObject = scriptEngine->newQObject( this );
     scriptEngine->globalObject().property( QStringLiteral("Amarok") ).setProperty( QStringLiteral("Window"), windowObject );
 
     windowObject.setProperty( QStringLiteral("ToolsMenu"), scriptEngine->newObject() );
@@ -87,45 +86,32 @@ AmarokWindowScript::AmarokWindowScript( AmarokScriptEngine* scriptEngine )
 }
 
 void
-AmarokWindowScript::addToolsMenu( const QString &name )
+AmarokWindowScript::addToolsMenu( QMenu *menu )
 {
-    if( m_customMenus.contains( name ) )
-        return;
-
-    QMenu *menu = new QMenu( name );
-    m_customMenus.insert( name, menu );
-    m_toolsMenu->addMenu( menu );
-    QScriptValue scriptMenu = m_scriptEngine->newQObject( menu );
-    m_scriptEngine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") ).setProperty( name, scriptMenu );
+    m_toolsMenu.data()->addMenu( menu );
 }
 
 void
-AmarokWindowScript::addSettingsMenu( const QString &name )
+AmarokWindowScript::addSettingsMenu( QMenu *menu )
 {
-    if( m_customMenus.contains( name ) )
-        return;
+    m_settingsMenu.data()->addMenu( menu );
 
-    QMenu *menu = new QMenu( name );
-    m_customMenus.insert( name, menu );
-    m_settingsMenu->addMenu( menu );
-    QScriptValue scriptMenu = m_scriptEngine->newQObject( menu );
-    m_scriptEngine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") ).setProperty( name, scriptMenu );
 }
 
 bool
-AmarokWindowScript::addToolsAction( const QString &id, const QString &actionName, const QString &icon )
+AmarokWindowScript::addToolsMenu( const QString &id, const QString &menuTitle, const QString &icon )
 {
-    return addMenuAction( m_toolsMenu, id, actionName, QStringLiteral("ToolsMenu"), icon );
+    return addMenuAction( m_toolsMenu, id, menuTitle, QStringLiteral("ToolsMenu"), icon );
 }
 
 void
 AmarokWindowScript::addToolsSeparator()
 {
-    m_toolsMenu->addSeparator();
+    m_toolsMenu.data()->addSeparator();
 }
 
 bool
-AmarokWindowScript::addSettingsAction( const QString &id, const QString &actionName, const QString &icon )
+AmarokWindowScript::addSettingsMenu( const QString &id, const QString &actionName, const QString &icon )
 {
     return addMenuAction( m_settingsMenu, id, actionName, QStringLiteral("SettingsMenu"), icon );
 }
@@ -162,7 +148,7 @@ AmarokWindowScript::addMenuAction( QMenu *menu, const QString &id, const QString
     // add the action to the given menu
     menu->addAction( ac->action( id ) );
 
-    QScriptValue newMenu = m_scriptEngine->newQObject( action );
+    QJSValue newMenu = m_scriptEngine->newQObject( action );
     m_scriptEngine->globalObject().property( QStringLiteral("Amarok") ).property( QStringLiteral("Window") ).property( menuProperty ).setProperty( id, newMenu );
     return true;
 }
diff --git a/src/scripting/scriptengine/AmarokWindowScript.h b/src/scripting/scriptengine/AmarokWindowScript.h
index 97e5f169a1..9b69d06628 100644
--- a/src/scripting/scriptengine/AmarokWindowScript.h
+++ b/src/scripting/scriptengine/AmarokWindowScript.h
@@ -51,11 +51,11 @@ namespace AmarokScript
         public:
             explicit AmarokWindowScript( AmarokScriptEngine* scriptEngine );
 
-            Q_INVOKABLE void addToolsMenu( const QString &name );
-            Q_INVOKABLE void addSettingsMenu( const QString &name );
-            Q_INVOKABLE bool addToolsAction( const QString &id, const QString &actionName, const QString &icon = QStringLiteral("amarok") );
+            Q_INVOKABLE void addToolsMenu( QMenu *menu );
+            Q_INVOKABLE void addSettingsMenu( QMenu *menu );
+            Q_INVOKABLE bool addToolsMenu( const QString &id, const QString &menuTitle, const QString &icon = QStringLiteral("amarok") );
             Q_INVOKABLE void addToolsSeparator();
-            Q_INVOKABLE bool addSettingsAction( const QString &id, const QString &actionName, const QString &icon = QStringLiteral("amarok") );
+            Q_INVOKABLE bool addSettingsMenu( const QString &id, const QString &actionName, const QString &icon = QStringLiteral("amarok") );
             Q_INVOKABLE bool addCustomAction( const QString &menuName, const QString &id, const QString &actionName, const QString &icon = QStringLiteral("amarok") );
             Q_INVOKABLE void addSettingsSeparator();
             Q_INVOKABLE void showTrayIcon( bool show );
diff --git a/src/scripting/scriptengine/ScriptImporter.cpp b/src/scripting/scriptengine/ScriptImporter.cpp
index e1789c219f..3277d2e394 100644
--- a/src/scripting/scriptengine/ScriptImporter.cpp
+++ b/src/scripting/scriptengine/ScriptImporter.cpp
@@ -18,6 +18,12 @@
 
 #include "App.h"
 #include "AmarokBookmarkScript.h"
+#include "qtbindings/Core.h"
+#include "qtbindings/Sql.h"
+#ifdef WITH_QT_UITOOLS
+ #include "qtbindings/UiTools.h"
+#endif
+#include "qtbindings/Gui.h"
 #include "AmarokCollectionViewScript.h"
 #include "config.h"
 #include "core/support/Debug.h"
@@ -27,18 +33,24 @@
 
 #include <KIO/Global>
 
+#include <QFile>
 #include <QSet>
 #include <QUrl>
+#include <QTextStream>
+#include <QCheckBox>
+#include <QLabel>
+#include <QRegularExpression>
+
+
 
 using namespace AmarokScript;
 
 ScriptImporter::ScriptImporter( AmarokScriptEngine *scriptEngine, const QUrl &url )
     : QObject( scriptEngine )
     , m_scriptUrl( url )
-    , m_scriptEngine( scriptEngine )
+    , m_engine(scriptEngine )
 {
-    QScriptValue scriptObject = scriptEngine->newQObject( this, QScriptEngine::AutoOwnership
-                                                        , QScriptEngine::ExcludeSuperClassContents );
+    QJSValue scriptObject = scriptEngine->newQObject( this );
     scriptEngine->globalObject().setProperty( QStringLiteral("Importer"), scriptObject );
 }
 
@@ -46,15 +58,64 @@ void
 ScriptImporter::loadExtension( const QString& src )
 {
     DEBUG_BLOCK
-    m_scriptEngine->importExtension( "amarok/" + src );
+    /* TODO - Use commented code once QT versions >= 5.12
+    m_engine->importModule( "amarok/" + src );
+    */
+    QFile extensionFile( "amarok/" + src );
+    m_engine->evaluate( QTextStream(&extensionFile ).readAll() );
 }
 
 bool
 ScriptImporter::loadQtBinding( const QString& binding )
 {
-    Q_UNUSED( binding )
+    if (m_qtScriptCompat) {
+        QJSValue scriptObj;
 
-    error() << __PRETTY_FUNCTION__ << "Loading Qt bindings in scripts not available in Qt5!";
+        /* Export QT classes for script only if requested */
+        if (binding == "qt.core") {
+            debug() << __PRETTY_FUNCTION__ << "QT Bindings[qt.core] imported";
+            QtBindings::Core::ByteArray::installJSType( m_engine );
+            QtBindings::Core::CoreApplication::installJSType( m_engine );
+            QtBindings::Core::Dir::installJSType( m_engine );
+            QtBindings::Core::FileInfo::installJSType( m_engine );
+            QtBindings::Core::File::installJSType( m_engine );
+            QtBindings::Core::IODevice::installJSType( m_engine );
+            QtBindings::Core::Locale::installJSType( m_engine );
+            QtBindings::Core::Resource::installJSType( m_engine );
+            QtBindings::Core::TextCodec::installJSType( m_engine );
+            QtBindings::Core::TextStream::installJSType( m_engine );
+            QtBindings::Core::Translator::installJSType( m_engine );
+            QtBindings::Core::Url::installJSType( m_engine );
+        } else if (binding == "qt.network") {
+            QString message(binding +
+                            " not available in Qt5 and no wrapper yet for this Amarok version");
+            warning() << __PRETTY_FUNCTION__ << message;
+            m_engine->evaluate("console.warn(" + message + ")");
+        } else if (binding == "qt.xml") {
+            QString message(binding +
+                            " not available in Qt5 and no wrapper yet for this Amarok version");
+            warning() << __PRETTY_FUNCTION__ << message;
+            m_engine->evaluate("console.warn(" + message + ")");
+        } else if (binding == "qt.gui") {
+            debug() << __PRETTY_FUNCTION__ << "QT Bindings[qt.gui] imported";
+            QtBindings::Gui::CheckBox::installJSType( m_engine );
+            QtBindings::Gui::Label::installJSType( m_engine );
+            QtBindings::Gui::DialogButtonBox::installJSType( m_engine );
+        } else if (binding == "qt.sql") {
+            debug() << __PRETTY_FUNCTION__ << "QT Bindings[qt.sql] imported";
+            QtBindings::Sql::SqlQuery::installJSType( m_engine );
+#ifdef WITH_QT_UITOOLS
+        } else if (binding == "qt.uitools") {
+            debug() << __PRETTY_FUNCTION__ << "QT Bindings[qt.uitools] imported";
+            QtBindings::UiTools::UiLoader::installJSType( m_engine );
+#endif
+        } else {
+            error() << __PRETTY_FUNCTION__ << "Requested QT binding not available: " << binding;
+            return false;
+        }
+        return true;
+    }
+    error() << __PRETTY_FUNCTION__ << "Loading Qt bindings in scripts not enabled.!";
     return false;
 }
 
@@ -63,34 +124,56 @@ ScriptImporter::include( const QString& relativeFilename )
 {
     QUrl includeUrl = KIO::upUrl(m_scriptUrl);
     includeUrl = includeUrl.adjusted(QUrl::StripTrailingSlash);
-    includeUrl.setPath(includeUrl.path() + QLatin1Char('/') + ( relativeFilename ));
-    QFile file( includeUrl.toLocalFile() );
-    if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
-    {
-        warning() << "cannot open the include file!";
+    includeUrl.setPath(includeUrl.path() + QLatin1Char('/') + (relativeFilename));
+    QFile file(includeUrl.toLocalFile());
+    warning() << "Include file: " << file.fileName();
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        warning() << "cannot open the include file: " << file.fileName();
+        return false;
+    }
+    QString importScript(QString(file.readAll()));
+    if (m_qtScriptCompat) {
+        //QTBUG-69408 - const is not supported by ES5. Replace it with 'var'
+        QRegularExpression removeConst(
+                "const ([_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*) *=",
+                QRegularExpression::DotMatchesEverythingOption );
+        importScript.replace( removeConst, "var \\1 =");
+    }
+    QJSValue result = m_engine->evaluate(importScript, relativeFilename);
+    if (result.isError()) {
+        error() << "Uncaught exception at " << result.property("name").toString() << ":";
+        error() << result.property("filename").toString() << ":" << result.property("lineNumber").toInt();
+        error() << result.property("message").toString();
+        error() << result.property("stack").toString();
         return false;
     }
-    m_scriptEngine->currentContext()->setActivationObject(
-                            m_scriptEngine->currentContext()->parentContext()->activationObject() );
-    m_scriptEngine->evaluate( file.readAll(), relativeFilename );
     return true;
 }
 
 QStringList
 ScriptImporter::availableBindings() const
 {
-    return m_scriptEngine->availableExtensions();
+    return QStringList()
+    << "qt.core"
+    << "qt.network"
+    << "qt.xml"
+    << "qt.gui"
+    << "qt.sql"
+#ifdef WITH_QT_UITOOLS
+    << "qt.uitools"
+#endif
+    ;
 }
 
 bool
 ScriptImporter::loadAmarokBinding( const QString &name )
 {
     if( name == QLatin1String("bookmarks") )
-        new AmarokBookmarkScript( m_scriptEngine );
+        new AmarokBookmarkScript(m_engine );
     else if( name == QLatin1String("collectionview") )
-        new AmarokCollectionViewScript( m_scriptEngine, ScriptManager::instance()->scriptNameForEngine( m_scriptEngine ) );
+        new AmarokCollectionViewScript(m_engine, ScriptManager::instance()->scriptNameForEngine(m_engine ) );
     else if( name == QLatin1String("playlistmanager") )
-        new AmarokPlaylistManagerScript( m_scriptEngine );
+        new AmarokPlaylistManagerScript(m_engine );
     else
     {
         warning() << "\"" << name << "\" doesn't exist!";
@@ -98,3 +181,4 @@ ScriptImporter::loadAmarokBinding( const QString &name )
     }
     return true;
 }
+
diff --git a/src/scripting/scriptengine/ScriptImporter.h b/src/scripting/scriptengine/ScriptImporter.h
index e43b973603..0669bc254d 100644
--- a/src/scripting/scriptengine/ScriptImporter.h
+++ b/src/scripting/scriptengine/ScriptImporter.h
@@ -45,8 +45,9 @@ namespace AmarokScript
 
         private:
             const QUrl m_scriptUrl;
-            AmarokScriptEngine *m_scriptEngine;
+            AmarokScriptEngine *m_engine;
             QSet<QString> m_importedBindings;
+            bool m_qtScriptCompat = true;
     };
 }
 
diff --git a/src/scripting/scriptengine/ScriptingDefines.cpp b/src/scripting/scriptengine/ScriptingDefines.cpp
index 93f2c6d998..bc8d214647 100644
--- a/src/scripting/scriptengine/ScriptingDefines.cpp
+++ b/src/scripting/scriptengine/ScriptingDefines.cpp
@@ -19,28 +19,30 @@
 #include "core/support/Debug.h"
 
 #include <QMetaEnum>
+#include <QQmlEngine>
 #include <QTimer>
 
 using namespace AmarokScript;
 
 AmarokScriptEngine::AmarokScriptEngine( QObject *parent )
-: QScriptEngine(parent)
+: QJSEngine(parent)
 , internalObject( QStringLiteral("UndocumentedAmarokScriptingInternals") )
 {
-    QScriptValue scriptObject = newQObject( this, QtOwnership,
-                                            ExcludeChildObjects | ExcludeSuperClassContents );
-    globalObject().setProperty( internalObject, scriptObject, QScriptValue::ReadOnly );
-    QScriptValue setTimeoutObject = scriptObject.property( QStringLiteral("setTimeout") );
+    installExtensions(QJSEngine::TranslationExtension | QJSEngine::ConsoleExtension);
+    QJSValue scriptObject = newQObject( this );
+    QQmlEngine::setObjectOwnership( this, QQmlEngine::CppOwnership);
+    globalObject().setProperty( internalObject, scriptObject );
+    QJSValue setTimeoutObject = scriptObject.property( QStringLiteral("setTimeout") );
     Q_ASSERT( !setTimeoutObject.isUndefined() );
     Q_ASSERT( !globalObject().property( internalObject ).property( "invokableDeprecatedCall" ).isUndefined() );
     globalObject().setProperty( QStringLiteral("setTimeout"), setTimeoutObject );
 }
 
 void
-AmarokScriptEngine::setDeprecatedProperty( const QString &parent, const QString &name, const QScriptValue &property )
+AmarokScriptEngine::setDeprecatedProperty( const QString &parent, const QString &name, const QJSValue &property )
 {
     const QString objName = QStringLiteral( "%1%2" ).arg( name, QString::number( qrand() ) );
-    globalObject().property( internalObject ).setProperty( objName, property, QScriptValue::ReadOnly | QScriptValue::SkipInEnumeration );
+    globalObject().property( internalObject ).setProperty( objName, property );
     const QString command = QString( "Object.defineProperty( %1, \"%2\", {get : function(){ var iobj= %3; iobj.invokableDeprecatedCall(\""
                                                                             " %1.%2 \"); return iobj.%4; },\
                                                                             enumerable : true,\
@@ -57,12 +59,12 @@ AmarokScriptEngine::invokableDeprecatedCall( const QString &call )
 }
 
 void
-AmarokScriptEngine::setTimeout( const QScriptValue &function, int time, const QScriptValue &thisObject, const QScriptValue &args )
+AmarokScriptEngine::setTimeout( const QJSValue &function, int time, const QJSValue &thisObject, const QJSValue &args )
 {
     QTimer *timer = new QTimer( this );
     timer->setSingleShot( true );
     timer->setInterval( time );
-    m_callbacks[timer] = QScriptValueList() << function << thisObject << args;
+    m_callbacks[timer] = QJSValueList() << function << thisObject << args;
     connect( timer, &QTimer::timeout, this, &AmarokScriptEngine::slotTimeout );
     timer->start();
 }
@@ -74,26 +76,26 @@ AmarokScriptEngine::slotTimeout()
     if( !timer )
         return;
 
-    QScriptValueList args;
-    QScriptValue thisObject;
+    QJSValueList args;
+    QJSValue thisObject;
     if( m_callbacks[timer].size() > 1 )
     {
         thisObject = m_callbacks[timer][1];
         if( m_callbacks[timer].size() == 3 )
-            for ( quint32 i = 0; i < m_callbacks[timer][2].property(QStringLiteral("length")).toUInt32(); ++i )
+            for ( quint32 i = 0; i < m_callbacks[timer][2].property(QStringLiteral("length")).toUInt(); ++i )
                 args << m_callbacks[timer][2].property( i );
     }
-    m_callbacks[timer][0].call( thisObject, args );
+    m_callbacks[timer][0].callWithInstance( thisObject, args );
     m_callbacks.remove( timer );
     timer->deleteLater();
 }
 
-QScriptValue
+QJSValue
 AmarokScriptEngine::enumObject( const QMetaEnum &metaEnum )
 {
-    QScriptValue enumObj = newObject();
+    QJSValue enumObj = newObject();
     for( int i = 0; i< metaEnum.keyCount(); ++i )
-        enumObj.setProperty( metaEnum.key(i), QScriptEngine::toScriptValue( metaEnum.value(i) ) );
+        enumObj.setProperty( metaEnum.key(i), QJSEngine::toScriptValue( metaEnum.value(i) ) );
     return enumObj;
 }
 
diff --git a/src/scripting/scriptengine/ScriptingDefines.h b/src/scripting/scriptengine/ScriptingDefines.h
index f97b84bab8..196f4c23d2 100644
--- a/src/scripting/scriptengine/ScriptingDefines.h
+++ b/src/scripting/scriptengine/ScriptingDefines.h
@@ -19,16 +19,16 @@
 
 #include <QHash>
 #include <QObject>
-#include <QScriptEngine>
-#include <QScriptValue>
-#include <QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 
 class QMetaEnum;
 
 namespace AmarokScript
 {
     template <class type, class WrapperType>
-    void fromScriptValue( const QScriptValue &obj, type &object )
+    void fromScriptValue( const QJSValue &obj, type &object )
     {
         const WrapperType *wrapper = dynamic_cast<WrapperType*>( obj.toQObject() );
         if( wrapper )
@@ -38,17 +38,16 @@ namespace AmarokScript
     }
 
     template <class type, class WrapperType>
-    QScriptValue toScriptValue( QScriptEngine *engine, type const &object )
+    QJSValue toScriptValue( QJSEngine *engine, type const &object )
     {
         WrapperType *wrapper = new WrapperType( object );
-        return engine->newQObject( wrapper, QScriptEngine::ScriptOwnership,
-                                                QScriptEngine::ExcludeSuperClassContents );
+        return engine->newQObject( wrapper );
     }
 
     template <class Container>
-    QScriptValue toScriptArray( QScriptEngine *engine, const Container &container )
+    QJSValue toScriptArray( QJSEngine *engine, const Container &container )
     {
-        QScriptValue scriptArray = engine->newArray();
+        QJSValue scriptArray = engine->newArray();
         typename Container::const_iterator begin = container.begin();
         typename Container::const_iterator end = container.end();
         typename Container::const_iterator it;
@@ -58,41 +57,41 @@ namespace AmarokScript
     }
 
     template <class Container>
-    void fromScriptArray( const QScriptValue &value, Container &container )
+    void fromScriptArray( const QJSValue &value, Container &container )
     {
-        quint32 len = value.property( QStringLiteral("length") ).toUInt32();
+        quint32 len = value.property( QStringLiteral("length") ).toUInt();
         for( quint32 i = 0; i < len; ++i )
         {
-            QScriptValue item = value.property( i );
+            QJSValue item = value.property( i );
             typedef typename Container::value_type ContainerValue;
-            container.push_back( qscriptvalue_cast<ContainerValue>(item) );
+            container.push_back( qjsvalue_cast<ContainerValue>(item) );
         }
     }
 
     template <class Map>
-    QScriptValue toScriptMap( QScriptEngine *engine, const Map &map )
+    QJSValue toScriptMap( QJSEngine *engine, const Map &map )
     {
-        QScriptValue scriptMap = engine->newObject();
+        QJSValue scriptMap = engine->newObject();
         for( typename Map::const_iterator it( map.begin() ); it != map.end(); ++it )
             scriptMap.setProperty( it.key(), engine->toScriptValue( it.value() ) );
         return scriptMap;
     }
 
     template <class Map>
-    void fromScriptMap( const QScriptValue &value, Map &map )
+    void fromScriptMap( const QJSValue &value, Map &map )
     {
-        QScriptValueIterator it( value );
+        QJSValueIterator it( value );
         while( it.hasNext() )
         {
             it.next();
-            map[it.name()] = qscriptvalue_cast<typename Map::mapped_type>( it.value() );
+            map[it.name()] = qjsvalue_cast<typename Map::mapped_type>( it.value() );
         }
     }
 
     /**
      * SCRIPTDOX _
      */
-    class AmarokScriptEngine : public QScriptEngine
+    class AmarokScriptEngine : public QJSEngine
     {
         Q_OBJECT
 
@@ -100,19 +99,31 @@ namespace AmarokScript
             explicit AmarokScriptEngine( QObject *parent );
             ~AmarokScriptEngine() override;
 
-            void setDeprecatedProperty( const QString &parent, const QString &name, const QScriptValue &property );
+            void setDeprecatedProperty( const QString &parent, const QString &name, const QJSValue &property );
             // exposing the metaobject directly also exposes >900 other values
-            QScriptValue enumObject( const QMetaEnum &metaEnum );
+            QJSValue enumObject( const QMetaEnum &metaEnum );
 
             template <class T>
             void registerArrayType()
             {
-                qScriptRegisterMetaType<T>( this, toScriptArray, fromScriptArray );
+                qRegisterMetaType<T>();
+                QMetaType::registerConverter<QJSValue,T>( [] (QJSValue scriptObj) {
+                    T arrayObj;
+                    fromScriptArray( scriptObj, arrayObj );
+                    return arrayObj;
+                });
+                QMetaType::registerConverter<T,QJSValue>( [this] (T arrayObj) { return toScriptArray( this, arrayObj ); } );
             }
             template <class Map>
             void registerMapType()
             {
-                qScriptRegisterMetaType<Map>( this, toScriptMap, fromScriptMap );
+                qRegisterMetaType<Map>();
+                QMetaType::registerConverter<QJSValue,Map>( [] (QJSValue scriptObj) {
+                    Map mapObj;
+                    fromScriptMap( scriptObj, mapObj );
+                    return mapObj;
+                });
+                QMetaType::registerConverter<Map,QJSValue>( [this] (Map mapObj) { return toScriptMap( this, mapObj ); } );
             }
 
             // SCRIPTDOX exclude
@@ -123,9 +134,9 @@ namespace AmarokScript
              * @param thisObject [Optional] The this object this function is invoked with.
              * @param args [Optional] An array containing arguments this function is to be invoked with.
              */
-            Q_INVOKABLE void setTimeout( const QScriptValue &function, int time,
-                             const QScriptValue &thisObject = QScriptValue(),
-                             const QScriptValue &args = QScriptValue() );
+            Q_INVOKABLE void setTimeout( const QJSValue &function, int time,
+                             const QJSValue &thisObject = QJSValue(),
+                             const QJSValue &args = QJSValue() );
 
         private Q_SLOTS:
             void slotTimeout();
@@ -135,7 +146,7 @@ namespace AmarokScript
 
         private:
             const QString internalObject;
-            QHash<QObject*, QScriptValueList> m_callbacks;
+            QHash<QObject*, QJSValueList> m_callbacks;
     };
 }
 
diff --git a/src/scripting/scriptengine/exporters/CollectionTypeExporter.cpp b/src/scripting/scriptengine/exporters/CollectionTypeExporter.cpp
index 48ada37390..89b938dfbe 100644
--- a/src/scripting/scriptengine/exporters/CollectionTypeExporter.cpp
+++ b/src/scripting/scriptengine/exporters/CollectionTypeExporter.cpp
@@ -25,8 +25,8 @@
 #include "scripting/scriptengine/ScriptingDefines.h"
 
 #include <QIcon>
-#include <QScriptEngine>
-#include <QScriptValue>
+#include <QJSEngine>
+#include <QJSValue>
 
 using namespace AmarokScript;
 
@@ -36,10 +36,29 @@ using Collections::QueryMaker;
 #define GET_COLLECTION( returnVal ) Collection *collection = m_collection.data(); if( !collection ) return returnVal;
 
 void
-CollectionPrototype::init( QScriptEngine *engine )
+CollectionPrototype::init( QJSEngine *engine )
 {
-    qScriptRegisterMetaType<Collection*>( engine, toScriptValue<Collection*,CollectionPrototype>, fromScriptValue<Collection*,CollectionPrototype> );
-    qScriptRegisterMetaType<Collections::CollectionList>( engine, toScriptArray, fromScriptArray );
+    qRegisterMetaType<Collection*>();
+    QMetaType::registerConverter<Collection*, QJSValue>( [=] (Collection* collection) {
+        return toScriptValue<Collection*, CollectionPrototype>( engine, collection );
+    } );
+    QMetaType::registerConverter<QJSValue, Collection*>( [] (QJSValue jsValue) {
+        Collection* collection;
+        fromScriptValue<Collection*, CollectionPrototype>( jsValue, collection );
+        return collection;
+    } );
+
+    qRegisterMetaType<Collections::CollectionList>();
+    QMetaType::registerConverter<Collections::CollectionList,QJSValue>( [=] (Collections::CollectionList collectionList) {
+        return toScriptArray<Collections::CollectionList>( engine, collectionList);
+
+    } );
+    QMetaType::registerConverter<QJSValue,Collections::CollectionList>( [] (QJSValue jsValue) {
+        Collections::CollectionList collectionList;
+        fromScriptArray<Collections::CollectionList>( jsValue, collectionList );
+        return collectionList;
+    } );
+
 }
 
 //script invokable
diff --git a/src/scripting/scriptengine/exporters/CollectionTypeExporter.h b/src/scripting/scriptengine/exporters/CollectionTypeExporter.h
index 7a258af1e0..0fa276dae1 100644
--- a/src/scripting/scriptengine/exporters/CollectionTypeExporter.h
+++ b/src/scripting/scriptengine/exporters/CollectionTypeExporter.h
@@ -33,7 +33,7 @@ namespace Collections
     class Collection;
     class QueryMaker;
 }
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -120,7 +120,7 @@ namespace AmarokScript
         Q_PROPERTY( QStringList actualLocation READ actualLocation )
 
         public:
-            static void init( QScriptEngine *engine );
+            static void init( QJSEngine *engine );
             CollectionPrototype( Collections::Collection *collection );
             Collections::Collection* data() const { return m_collection.data(); }
 
diff --git a/src/scripting/scriptengine/exporters/MetaTypeExporter.cpp b/src/scripting/scriptengine/exporters/MetaTypeExporter.cpp
index b539950402..d9a6fc5396 100644
--- a/src/scripting/scriptengine/exporters/MetaTypeExporter.cpp
+++ b/src/scripting/scriptengine/exporters/MetaTypeExporter.cpp
@@ -31,8 +31,7 @@
 #include <ThreadWeaver/Queue>
 #include <ThreadWeaver/Job>
 
-#include <QScriptContext>
-#include <QScriptEngine>
+#include <QJSEngine>
 
 Q_DECLARE_METATYPE( StringMap )
 
@@ -46,31 +45,72 @@ using namespace AmarokScript;
                               X; \
                           }
 
-void
-MetaTrackPrototype::init( QScriptEngine *engine )
+MetaTrackPrototypeWrapper::MetaTrackPrototypeWrapper( QJSEngine *engine )
+: QObject( engine )
+, m_engine( engine )
 {
-    qScriptRegisterMetaType<Meta::TrackPtr>( engine, toScriptValue<Meta::TrackPtr, MetaTrackPrototype>, fromScriptValue<Meta::TrackPtr, MetaTrackPrototype> );
-    qScriptRegisterMetaType<Meta::TrackList>( engine, toScriptArray, fromScriptArray );
-    qScriptRegisterMetaType<StringMap>( engine, toScriptMap, fromScriptMap );
-    qScriptRegisterMetaType<Meta::FieldHash>( engine, toScriptTagMap, fromScriptTagMap );
-    engine->globalObject().setProperty( QStringLiteral("Track"), engine->newFunction( trackCtor ) );
 }
 
-QScriptValue
-MetaTrackPrototype::trackCtor( QScriptContext *context, QScriptEngine *engine )
+QJSValue
+MetaTrackPrototypeWrapper::trackCtor( QJSValue arg )
 {
-    if( context->argumentCount() < 1 )
-        return context->throwError( QScriptContext::SyntaxError, QStringLiteral("Not enough arguments! Pass the track url.") );
-
-    QUrl url( qscriptvalue_cast<QUrl>( context->argument( 0 ) ) );
-    if( !url.isValid() )
-        return context->throwError( QScriptContext::TypeError, QStringLiteral("Invalid QUrl") );
+    QUrl url( qjsvalue_cast<QUrl>( arg ) );
+    if( !url.isValid() ) {
+        /* TODO - Use commented code once QT versions >= 5.12
+        QJSValue errorObj = m_engine->newErrorObject( QJSValue::TypeError, QStringLiteral("Invalid QUrl") );
+        m_engine->throwError( errorObj.errorType(), errorObj.toString() );
+        return errorObj;
+        */
+        return m_engine->evaluate("throw new TypeError('Invalid QUrl')");
+    }
 
     MetaProxy::TrackPtr proxyTrack( new MetaProxy::Track( url ) );
     proxyTrack->setTitle( url.fileName() ); // set temporary name
-    return engine->newQObject( new MetaTrackPrototype( Meta::TrackPtr( proxyTrack.data() ) )
-                                                , QScriptEngine::ScriptOwnership
-                                                , QScriptEngine::ExcludeSuperClassContents );
+    return m_engine->newQObject( new MetaTrackPrototype( Meta::TrackPtr( proxyTrack.data() ) ) );
+}
+
+MetaTrackPrototypeWrapper *MetaTrackPrototype::s_wrapper = nullptr;
+
+void
+MetaTrackPrototype::init( QJSEngine *engine )
+{
+    qRegisterMetaType<Meta::TrackPtr>();
+    QMetaType::registerConverter<Meta::TrackPtr, QJSValue>( [=] (Meta::TrackPtr trackPtr) { return toScriptValue<Meta::TrackPtr, MetaTrackPrototype>( engine, trackPtr ); } );
+    QMetaType::registerConverter<QJSValue, Meta::TrackPtr>( [] (QJSValue jsValue) {
+        Meta::TrackPtr trackPtr;
+        fromScriptValue<Meta::TrackPtr, MetaTrackPrototype>( jsValue, trackPtr );
+        return trackPtr;
+    } );
+
+    qRegisterMetaType<Meta::TrackList>();
+    QMetaType::registerConverter<Meta::TrackList,QJSValue>( [=] (Meta::TrackList trackList) { return toScriptArray<Meta::TrackList>( engine, trackList); } );
+    QMetaType::registerConverter<QJSValue,Meta::TrackList>( [] (QJSValue jsValue) {
+        Meta::TrackList trackList;
+        fromScriptArray<Meta::TrackList>( jsValue, trackList );
+        return trackList;
+    } );
+
+    qRegisterMetaType<StringMap>();
+    QMetaType::registerConverter<StringMap,QJSValue>( [=] (StringMap stringMap) { return toScriptMap<StringMap>( engine, stringMap); } );
+    QMetaType::registerConverter<QJSValue,StringMap>( [] (QJSValue jsValue) {
+        StringMap stringMap;
+        fromScriptMap<StringMap>( jsValue, stringMap );
+        return stringMap;
+    } );
+
+    qRegisterMetaType<Meta::FieldHash>();
+    QMetaType::registerConverter<Meta::FieldHash,QJSValue>( [=] (Meta::FieldHash fieldHash) { return toScriptTagMap( engine, fieldHash); } );
+    QMetaType::registerConverter<QJSValue,Meta::FieldHash>( [] (QJSValue jsValue) {
+        Meta::FieldHash fieldHash;
+        fromScriptTagMap( jsValue, fieldHash );
+        return fieldHash;
+    } );
+
+    if (s_wrapper == nullptr)
+        s_wrapper = new MetaTrackPrototypeWrapper( engine );
+    QJSValue scriptObj = engine->newQObject( s_wrapper );
+
+    engine->globalObject().setProperty( QStringLiteral("Track"),  scriptObj.property("trackCtor"));
 }
 
 MetaTrackPrototype::MetaTrackPrototype( const Meta::TrackPtr &track )
@@ -261,11 +301,11 @@ MetaTrackPrototype::isLoaded() const
     return true;
 }
 
-QScriptValue
+QJSValue
 MetaTrackPrototype::imagePixmap( int size ) const
 {
-    CHECK_TRACK( QScriptValue() )
-    return m_track->album() ? m_engine->toScriptValue( m_track->album()->image( size ) ) : QScriptValue();
+    CHECK_TRACK( QJSValue() )
+    return m_track->album() ? m_engine->toScriptValue( m_track->album()->image( size ) ) : QJSValue();
 }
 
 bool
@@ -380,9 +420,9 @@ MetaTrackPrototype::metadataChanged(const Meta::TrackPtr &track )
 }
 
 void
-MetaTrackPrototype::fromScriptTagMap( const QScriptValue &value, Meta::FieldHash &map )
+MetaTrackPrototype::fromScriptTagMap( const QJSValue &value, Meta::FieldHash &map )
 {
-    QScriptValueIterator it( value );
+    QJSValueIterator it( value );
     while( it.hasNext() )
     {
         it.next();
@@ -390,10 +430,10 @@ MetaTrackPrototype::fromScriptTagMap( const QScriptValue &value, Meta::FieldHash
     }
 }
 
-QScriptValue
-MetaTrackPrototype::toScriptTagMap( QScriptEngine *engine, const Meta::FieldHash &map )
+QJSValue
+MetaTrackPrototype::toScriptTagMap( QJSEngine *engine, const Meta::FieldHash &map )
 {
-    QScriptValue scriptMap = engine->newObject();
+    QJSValue scriptMap = engine->newObject();
     for( typename Meta::FieldHash::const_iterator it( map.constBegin() ); it != map.constEnd(); ++it )
         scriptMap.setProperty( Meta::nameForField( it.key() ), engine->toScriptValue( it.value() ) );
     return scriptMap;
diff --git a/src/scripting/scriptengine/exporters/MetaTypeExporter.h b/src/scripting/scriptengine/exporters/MetaTypeExporter.h
index 33ac1f1b30..14026f7ccb 100644
--- a/src/scripting/scriptengine/exporters/MetaTypeExporter.h
+++ b/src/scripting/scriptengine/exporters/MetaTypeExporter.h
@@ -23,12 +23,10 @@
 #include "core/meta/Observer.h"
 
 #include <QObject>
-#include <QScriptable>
 #include <QString>
+#include <QJSValue>
 
-class QScriptContext;
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
 
 typedef QMap<QString,QString> StringMap;
 namespace Meta
@@ -38,6 +36,21 @@ namespace Meta
 
 namespace AmarokScript
 {
+    /**
+     * Wraps MetaTrackPrototype Ctor
+     */
+    class MetaTrackPrototypeWrapper : public QObject
+    {
+        Q_OBJECT
+    public:
+        MetaTrackPrototypeWrapper(QJSEngine *engine);
+        Q_INVOKABLE QJSValue trackCtor( QJSValue arg );
+
+    private:
+        QJSEngine *m_engine;
+    };
+
+    // SCRIPTDOX BiasFactory
     // SCRIPTDOX PROTOTYPE Meta::TrackPtr Track
     /**
      * Represents track objects.
@@ -103,18 +116,17 @@ namespace AmarokScript
         Q_PROPERTY( QImage embeddedCover READ embeddedCover WRITE setEmbeddedCover )
 
         public:
-            static void init( QScriptEngine *engine );
+            static void init( QJSEngine *engine );
             Meta::TrackPtr data() const { return m_track; }
             MetaTrackPrototype( const Meta::TrackPtr &track );
-            static QScriptValue trackCtor( QScriptContext *context, QScriptEngine *engine );
-            static QScriptValue toScriptTagMap( QScriptEngine *engine, const Meta::FieldHash &map );
-            static void fromScriptTagMap( const QScriptValue &value, Meta::FieldHash &map );
+            static QJSValue toScriptTagMap( QJSEngine *engine, const Meta::FieldHash &map );
+            static void fromScriptTagMap( const QJSValue &value, Meta::FieldHash &map );
 
             /**
              * Returns the image for the album, usually the cover image, if it has one,
              * or an undefined value otherwise.
              */
-            Q_INVOKABLE QScriptValue imagePixmap( int size = 1 ) const;
+            Q_INVOKABLE QJSValue imagePixmap( int size = 1 ) const;
 
             /**
              * Asynchronously write the passed tags to the track.
@@ -141,6 +153,7 @@ namespace AmarokScript
             void loaded( Meta::TrackPtr );
 
         private:
+            static MetaTrackPrototypeWrapper* s_wrapper;
             Meta::TrackPtr m_track;
 
             void metadataChanged( const Meta::TrackPtr &track ) override;
@@ -150,7 +163,7 @@ namespace AmarokScript
             void metadataChanged( const Meta::ComposerPtr &composer ) override {  Q_UNUSED( composer ) }
             void metadataChanged( const Meta::YearPtr &year ) override {  Q_UNUSED( year ) }
 
-            QScriptEngine *m_engine;
+            QJSEngine *m_engine;
 
             int sampleRate() const;
             int bitrate() const;
diff --git a/src/scripting/scriptengine/exporters/PlaylistExporter.cpp b/src/scripting/scriptengine/exporters/PlaylistExporter.cpp
index 51fad6417e..d31075abcb 100644
--- a/src/scripting/scriptengine/exporters/PlaylistExporter.cpp
+++ b/src/scripting/scriptengine/exporters/PlaylistExporter.cpp
@@ -21,18 +21,34 @@
 #include "core/playlists/PlaylistProvider.h"
 #include "scripting/scriptengine/ScriptingDefines.h"
 
-#include <QScriptValue>
+#include <QJSValue>
 #include <core-impl/support/TrackLoader.h>
 
 using namespace AmarokScript;
 
 void
-PlaylistPrototype::init( QScriptEngine *engine )
+PlaylistPrototype::init( QJSEngine *engine )
 {
-    qScriptRegisterMetaType<Playlists::PlaylistPtr>( engine,
-                                                     toScriptValue<Playlists::PlaylistPtr,PlaylistPrototype>,
-                                                     fromScriptValue<Playlists::PlaylistPtr,PlaylistPrototype> );
-    qScriptRegisterMetaType<Playlists::PlaylistList>( engine, toScriptArray, fromScriptArray );
+    qRegisterMetaType<Playlists::PlaylistPtr>();
+    QMetaType::registerConverter<Playlists::PlaylistPtr,QJSValue>( [=] (Playlists::PlaylistPtr playlistPtr) {
+        return toScriptValue<Playlists::PlaylistPtr,PlaylistPrototype>( engine, playlistPtr );
+    } );
+    QMetaType::registerConverter<QJSValue,Playlists::PlaylistPtr>( [] (QJSValue jsValue) {
+        Playlists::PlaylistPtr playlistPtr;
+        fromScriptValue<Playlists::PlaylistPtr,PlaylistPrototype>( jsValue, playlistPtr );
+        return playlistPtr;
+    } );
+
+    qRegisterMetaType<Playlists::PlaylistList>();
+    QMetaType::registerConverter<Playlists::PlaylistList,QJSValue>( [=] (Playlists::PlaylistList playlistList) {
+        return toScriptArray<Playlists::PlaylistList>( engine, playlistList );
+
+    } );
+    QMetaType::registerConverter<QJSValue,Playlists::PlaylistList>( [] (QJSValue jsValue) {
+        Playlists::PlaylistList playlistList;
+        fromScriptArray<Playlists::PlaylistList>( jsValue, playlistList );
+        return playlistList;
+    } );
 }
 
 // script invokable
diff --git a/src/scripting/scriptengine/exporters/PlaylistExporter.h b/src/scripting/scriptengine/exporters/PlaylistExporter.h
index 6ede1b9014..6110db224e 100644
--- a/src/scripting/scriptengine/exporters/PlaylistExporter.h
+++ b/src/scripting/scriptengine/exporters/PlaylistExporter.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QUrl>
 
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -59,7 +59,7 @@ namespace AmarokScript
         Q_PROPERTY( Playlists::PlaylistProvider* provider READ provider )
 
     public:
-        static void init( QScriptEngine *engine );
+        static void init( QJSEngine *engine );
         explicit PlaylistPrototype( Playlists::PlaylistPtr playlist );
         Playlists::PlaylistPtr data() const { return m_playlist; }
 
@@ -114,7 +114,7 @@ namespace AmarokScript
         int trackCount() const;
         Playlists::PlaylistProvider *provider() const;
 
-        QScriptEngine *m_engine;
+        QJSEngine *m_engine;
         Playlists::PlaylistPtr m_playlist;
 
     Q_SIGNALS:
diff --git a/src/scripting/scriptengine/exporters/PlaylistProviderExporter.cpp b/src/scripting/scriptengine/exporters/PlaylistProviderExporter.cpp
index 18e2be8569..b9bd7ae6ee 100644
--- a/src/scripting/scriptengine/exporters/PlaylistProviderExporter.cpp
+++ b/src/scripting/scriptengine/exporters/PlaylistProviderExporter.cpp
@@ -23,8 +23,8 @@
 
 #include <QIcon>
 
-#include <QScriptEngine>
-#include <QScriptValue>
+#include <QJSEngine>
+#include <QJSValue>
 
 using namespace AmarokScript;
 
@@ -34,11 +34,26 @@ PlaylistProviderPrototype::PlaylistProviderPrototype( Playlists::PlaylistProvide
 {}
 
 void
-PlaylistProviderPrototype::init( QScriptEngine *engine )
+PlaylistProviderPrototype::init( QJSEngine *engine )
 {
-    qScriptRegisterMetaType<Playlists::PlaylistProvider*>( engine, toScriptValue<Playlists::PlaylistProvider*,PlaylistProviderPrototype>,
-                                                           fromScriptValue<Playlists::PlaylistProvider*,PlaylistProviderPrototype> );
-    qScriptRegisterMetaType< PlaylistProviderList >( engine, toScriptArray, fromScriptArray );
+    qRegisterMetaType<Playlists::PlaylistProvider*>();
+    QMetaType::registerConverter<Playlists::PlaylistProvider*,QJSValue>( [=] (Playlists::PlaylistProvider* providerPtr) {
+        return toScriptValue<Playlists::PlaylistProvider*,PlaylistProviderPrototype>( engine, providerPtr);
+
+    } );
+    QMetaType::registerConverter<QJSValue,Playlists::PlaylistProvider*>( [] (QJSValue jsValue) {
+        Playlists::PlaylistProvider* providerPtr;
+        fromScriptValue<Playlists::PlaylistProvider*,PlaylistProviderPrototype>( jsValue, providerPtr );
+        return providerPtr;
+    } );
+
+    qRegisterMetaType<PlaylistProviderList>();
+    QMetaType::registerConverter<PlaylistProviderList,QJSValue>( [=] (PlaylistProviderList providerList) { return toScriptArray<PlaylistProviderList>( engine, providerList); } );
+    QMetaType::registerConverter<QJSValue,PlaylistProviderList>( [] (QJSValue jsValue) {
+        PlaylistProviderList providerList;
+        fromScriptArray<PlaylistProviderList>( jsValue, providerList );
+        return providerList;
+    } );
 }
 
 // script invokable
diff --git a/src/scripting/scriptengine/exporters/PlaylistProviderExporter.h b/src/scripting/scriptengine/exporters/PlaylistProviderExporter.h
index d25fd3bd84..5526983eb3 100644
--- a/src/scripting/scriptengine/exporters/PlaylistProviderExporter.h
+++ b/src/scripting/scriptengine/exporters/PlaylistProviderExporter.h
@@ -25,7 +25,7 @@
 #include <QString>
 #include <QPointer>
 
-class QScriptEngine;
+class QJSEngine;
 
 
 namespace Playlists
@@ -80,7 +80,7 @@ namespace AmarokScript
         Q_PROPERTY( int playlistCount READ playlistCount )
 
         public:
-            static void init( QScriptEngine *engine );
+            static void init( QJSEngine *engine );
             explicit PlaylistProviderPrototype( Playlists::PlaylistProvider *provider );
             Playlists::PlaylistProvider* data() const { return m_provider.data(); }
 
diff --git a/src/scripting/scriptengine/exporters/QueryMakerExporter.cpp b/src/scripting/scriptengine/exporters/QueryMakerExporter.cpp
index 3f44b4ed5e..2d4bebbe1a 100644
--- a/src/scripting/scriptengine/exporters/QueryMakerExporter.cpp
+++ b/src/scripting/scriptengine/exporters/QueryMakerExporter.cpp
@@ -19,8 +19,8 @@
 #include "core-impl/collections/support/TextualQueryFilter.h"
 #include "scripting/scriptengine/ScriptingDefines.h"
 
-#include <QScriptEngine>
-#include <QScriptValue>
+#include <QJSEngine>
+#include <QJSValue>
 #include <QEventLoop>
 
 using namespace AmarokScript;
@@ -28,9 +28,15 @@ using namespace AmarokScript;
 using Collections::QueryMaker;
 
 void
-QueryMakerPrototype::init( QScriptEngine *engine )
+QueryMakerPrototype::init( QJSEngine *engine )
 {
-    qScriptRegisterMetaType<QueryMaker*>( engine, toScriptValue<QueryMaker*,QueryMakerPrototype>, fromScriptValue<QueryMaker*,QueryMakerPrototype> );
+    qRegisterMetaType<QueryMaker*>();
+    QMetaType::registerConverter<QueryMaker*,QJSValue>( [=] (QueryMaker* queryMaker) { return toScriptValue<QueryMaker*, QueryMakerPrototype>( engine, queryMaker ); } );
+    QMetaType::registerConverter<QJSValue,QueryMaker*>( [] (QJSValue jsValue) {
+            QueryMaker* queryMaker;
+            fromScriptValue<QueryMaker*, QueryMakerPrototype>( jsValue, queryMaker );
+            return queryMaker;
+    } );
 }
 
 // script invokable
diff --git a/src/scripting/scriptengine/exporters/QueryMakerExporter.h b/src/scripting/scriptengine/exporters/QueryMakerExporter.h
index ccabb08007..e618951775 100644
--- a/src/scripting/scriptengine/exporters/QueryMakerExporter.h
+++ b/src/scripting/scriptengine/exporters/QueryMakerExporter.h
@@ -29,7 +29,7 @@ namespace Collections
 {
     class QueryMaker;
 }
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
@@ -54,7 +54,7 @@ namespace AmarokScript
         Q_PROPERTY( QString filter READ filter )
 
     public:
-        static void init( QScriptEngine *engine );
+        static void init( QJSEngine *engine );
         QueryMakerPrototype( Collections::QueryMaker *collection );
         ~QueryMakerPrototype() override;
         Collections::QueryMaker *data() const { return m_querymaker; }
diff --git a/src/scripting/scriptengine/exporters/ScriptableBiasExporter.cpp b/src/scripting/scriptengine/exporters/ScriptableBiasExporter.cpp
index 4b1c33617f..a5ed4f7039 100644
--- a/src/scripting/scriptengine/exporters/ScriptableBiasExporter.cpp
+++ b/src/scripting/scriptengine/exporters/ScriptableBiasExporter.cpp
@@ -24,45 +24,46 @@
 
 #include <QApplication>
 #include <QCoreApplication>
-#include <QScriptEngine>
+#include <QJSEngine>
+#include <QQmlEngine>
 #include <QThread>
 #include <QXmlStreamReader>
 #include <QXmlStreamWriter>
 
 using namespace AmarokScript;
 
-void
-ScriptableBiasFactory::init( QScriptEngine *engine )
+ScriptableBiasFactoryWrapper::ScriptableBiasFactoryWrapper(QJSEngine *engine)
+: QObject( engine )
+, m_engine( engine )
 {
-    TrackSetExporter::init( engine );
-    engine->globalObject().setProperty( QStringLiteral("BiasFactory"), engine->newFunction( biasCtor ),
-                                        QScriptValue:: Undeletable | QScriptValue::ReadOnly );
-    engine->globalObject().setProperty( QStringLiteral("GroupBiasFactory"), engine->newFunction( groupBiasCtor ),
-                                        QScriptValue:: Undeletable | QScriptValue::ReadOnly );
 }
 
-QScriptValue
-ScriptableBiasFactory::biasCtor( QScriptContext *context, QScriptEngine *engine )
+QJSValue
+ScriptableBiasFactoryWrapper::biasCtor()
+{
+    return m_engine->newQObject( new ScriptableBiasFactory( m_engine ) );
+}
+
+QJSValue
+ScriptableBiasFactoryWrapper::groupBiasCtor()
 {
-    Q_UNUSED( context )
-    const QScriptValue biasFactoryObject = engine->newQObject( new ScriptableBiasFactory( engine )
-                                            , QScriptEngine::ScriptOwnership
-                                            , QScriptEngine::ExcludeSuperClassContents | QScriptEngine::ExcludeChildObjects );
-    return biasFactoryObject;
+    return m_engine->newQObject( new ScriptableBiasFactory( m_engine, true ) );
 }
 
-QScriptValue
-ScriptableBiasFactory::groupBiasCtor( QScriptContext *context, QScriptEngine *engine )
+ScriptableBiasFactoryWrapper* ScriptableBiasFactory::s_wrapper = nullptr;
+
+void
+ScriptableBiasFactory::init( QJSEngine *engine )
 {
-    Q_UNUSED( context )
-    ScriptableBiasFactory *factory = new ScriptableBiasFactory( engine, true );
-    QScriptValue biasFactoryObject = engine->newQObject( factory
-                                            , QScriptEngine::ScriptOwnership
-                                            , QScriptEngine::ExcludeSuperClassContents | QScriptEngine::ExcludeChildObjects );
-    return biasFactoryObject;
+    TrackSetExporter::init( engine );
+    if (s_wrapper == nullptr)
+        s_wrapper = new ScriptableBiasFactoryWrapper( engine );
+    QJSValue scriptObj = engine->newQObject( s_wrapper );
+    engine->globalObject().setProperty( QStringLiteral("BiasFactory"),  scriptObj.property("biasCtor") );
+    engine->globalObject().setProperty( QStringLiteral("GroupBiasFactory"), scriptObj.property("groupBiasCtor") );
 }
 
-ScriptableBiasFactory::ScriptableBiasFactory( QScriptEngine *engine, bool groupBias )
+ScriptableBiasFactory::ScriptableBiasFactory( QJSEngine *engine, bool groupBias )
 : QObject( engine )
 , m_groupBias( groupBias )
 , m_engine( engine )
@@ -83,16 +84,14 @@ ScriptableBiasFactory::createBias()
     //else
     bias = new ScriptableBias( this );
     Dynamic::BiasPtr biasPtr = Dynamic::BiasPtr( bias );
-    QScriptValue biasObject = bias->scriptObject();
-    if( m_initFunction.isFunction() )
-        m_initFunction.call( biasObject, QScriptValueList() << biasObject );
+    QJSValue biasObject = bias->scriptObject();
+    if( m_initFunction.isCallable() )
+        m_initFunction.callWithInstance( biasObject, QJSValueList() << biasObject );
 
     return biasPtr;
 }
 
-// private
-
-QScriptEngine*
+QJSEngine*
 ScriptableBiasFactory::engine() const
 {
     return m_engine;
@@ -141,14 +140,14 @@ ScriptableBiasFactory::i18nDescription() const
     return m_description;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::initFunction() const
 {
     return m_initFunction;
 }
 
 void
-ScriptableBiasFactory::setInitFunction( const QScriptValue &value )
+ScriptableBiasFactory::setInitFunction( const QJSValue &value )
 {
     m_initFunction = value;
 }
@@ -165,14 +164,14 @@ ScriptableBiasFactory::setI18nName( const QString &i18nName )
     m_i18nName = i18nName;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::widgetFunction() const
 {
     return m_widgetFunction;
 }
 
 void
-ScriptableBiasFactory::setWidgetFunction( const QScriptValue &value )
+ScriptableBiasFactory::setWidgetFunction( const QJSValue &value )
 {
     // throw exception?
     //if( !value.isFunction() )
@@ -180,60 +179,60 @@ ScriptableBiasFactory::setWidgetFunction( const QScriptValue &value )
 }
 
 void
-ScriptableBiasFactory::setFromXmlFunction( const QScriptValue &value )
+ScriptableBiasFactory::setFromXmlFunction( const QJSValue &value )
 {
     m_fromXmlFunction = value;
 }
 
 void
-ScriptableBiasFactory::setToXmlFunction( const QScriptValue &value )
+ScriptableBiasFactory::setToXmlFunction( const QJSValue &value )
 {
     m_toXmlFunction = value;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::fromXmlFunction() const
 {
     return m_fromXmlFunction;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::toXmlFunction() const
 {
     return m_toXmlFunction;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::matchingTracksFunction() const
 {
     return m_matchingTracksFunction;
 }
 
 void
-ScriptableBiasFactory::setMatchingTracksFunction( const QScriptValue &value )
+ScriptableBiasFactory::setMatchingTracksFunction( const QJSValue &value )
 {
     m_matchingTracksFunction = value;
 }
 
 void
-ScriptableBiasFactory::setTrackMatchesFunction( const QScriptValue &value )
+ScriptableBiasFactory::setTrackMatchesFunction( const QJSValue &value )
 {
     m_trackMatchesFunction = value;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::trackMatchesFunction() const
 {
     return m_trackMatchesFunction;
 }
 
 void
-ScriptableBiasFactory::setToStringFunction( const QScriptValue &value )
+ScriptableBiasFactory::setToStringFunction( const QJSValue &value )
 {
     m_toStringFunction = value;
 }
 
-QScriptValue
+QJSValue
 ScriptableBiasFactory::toStringFunction() const
 {
     return m_toStringFunction;
@@ -245,9 +244,9 @@ ScriptableBiasFactory::toStringFunction() const
 void
 ScriptableBias::toXml( QXmlStreamWriter *writer ) const
 {
-    if( m_scriptBias->toXmlFunction().isFunction() )
-        m_scriptBias->fromXmlFunction().call( m_biasObject,
-                                              QScriptValueList() << m_engine->toScriptValue<QXmlStreamWriter*>( writer ) );
+    if( m_scriptBias->toXmlFunction().isCallable() )
+        m_scriptBias->fromXmlFunction().callWithInstance( m_biasObject,
+                                              QJSValueList() << m_engine->toScriptValue<QXmlStreamWriter*>( writer ) );
     else
         Dynamic::AbstractBias::toXml( writer );
 }
@@ -255,9 +254,9 @@ ScriptableBias::toXml( QXmlStreamWriter *writer ) const
 void
 ScriptableBias::fromXml( QXmlStreamReader *reader )
 {
-    if( m_scriptBias->fromXmlFunction().isFunction() )
-        m_scriptBias->fromXmlFunction().call( m_biasObject,
-                                              QScriptValueList() << m_engine->toScriptValue<QXmlStreamReader*>( reader ) );
+    if( m_scriptBias->fromXmlFunction().isCallable() )
+        m_scriptBias->fromXmlFunction().callWithInstance( m_biasObject,
+                                              QJSValueList() << m_engine->toScriptValue<QXmlStreamReader*>( reader ) );
     else
         Dynamic::AbstractBias::fromXml( reader );
 }
@@ -265,8 +264,8 @@ ScriptableBias::fromXml( QXmlStreamReader *reader )
 QWidget*
 ScriptableBias::widget( QWidget *parent )
 {
-    QWidget *widget = dynamic_cast<QWidget*>( m_scriptBias->widgetFunction().call( m_biasObject,
-                                                                                   m_scriptBias->engine()->newQObject( parent ) ).toQObject() );
+    QWidget *widget = dynamic_cast<QWidget*>( m_scriptBias->widgetFunction().callWithInstance( m_biasObject,
+                                                                                  QJSValueList() << m_scriptBias->engine()->newQObject( parent ) ).toQObject() );
     if( widget )
         return widget;
     return Dynamic::AbstractBias::widget( parent );
@@ -301,10 +300,10 @@ Dynamic::TrackSet
 ScriptableBias::slotMatchingTracks( const Meta::TrackList &playlist, int contextCount, int finalCount, const Dynamic::TrackCollectionPtr &universe ) const
 {
     Q_ASSERT( QThread::currentThread() == QCoreApplication::instance()->thread() );
-    if( m_scriptBias->matchingTracksFunction().isFunction() )
+    if( m_scriptBias->matchingTracksFunction().isCallable() )
     {
-        QScriptValue trackSetVal = m_scriptBias->matchingTracksFunction().call( m_biasObject,
-                                                                                QScriptValueList() << m_engine->toScriptValue<Meta::TrackList>( playlist )
+        QJSValue trackSetVal = m_scriptBias->matchingTracksFunction().callWithInstance( m_biasObject,
+                                                                                QJSValueList() << m_engine->toScriptValue<Meta::TrackList>( playlist )
                                                                                                    << contextCount
                                                                                                    << finalCount
                                                                                                    << m_engine->toScriptValue<QStringList>( universe->uids() ) );
@@ -347,15 +346,15 @@ ScriptableBias::replace(const Dynamic::BiasPtr &newBias )
 QString
 ScriptableBias::toString() const
 {
-    return m_scriptBias->toStringFunction().call( m_biasObject ).toString();
+    return m_scriptBias->toStringFunction().call( QJSValueList() << m_biasObject ).toString();
 }
 
 bool
 ScriptableBias::trackMatches( int position, const Meta::TrackList& playlist, int contextCount ) const
 {
-    if( m_scriptBias->trackMatchesFunction().isFunction() )
-        return m_scriptBias->trackMatchesFunction().call( m_biasObject,
-                                                          QScriptValueList() << position
+    if( m_scriptBias->trackMatchesFunction().isCallable() )
+        return m_scriptBias->trackMatchesFunction().callWithInstance( m_biasObject,
+                                                          QJSValueList() << position
                                                                              << m_engine->toScriptValue<Meta::TrackList>( playlist )
                                                                              << contextCount
                                                         ).toBool();
@@ -366,7 +365,8 @@ ScriptableBias::ScriptableBias( ScriptableBiasFactory *biasProto )
 : m_scriptBias( biasProto )
 , m_engine( biasProto->engine() )
 {
-    m_biasObject = m_engine->newQObject( this, QScriptEngine::QtOwnership, QScriptEngine::ExcludeDeleteLater );
+    m_biasObject = m_engine->newQObject( this );
+    QQmlEngine::setObjectOwnership( this, QQmlEngine::CppOwnership );
     connect( m_engine, &QObject::destroyed, this, &ScriptableBias::removeBias );
 }
 
@@ -379,20 +379,86 @@ ScriptableBias::removeBias()
     replace( Dynamic::BiasPtr( new Dynamic::ReplacementBias( name() ) ) );
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+// TrackSetExporterWrapper
+/////////////////////////////////////////////////////////////////////////////////////////
+
+TrackSetExporterWrapper *TrackSetExporter::s_wrapper = nullptr;
+TrackSetExporterWrapper::TrackSetExporterWrapper( QJSEngine* engine )
+: QObject( engine )
+, m_engine (engine )
+ {
+}
+QJSValue
+TrackSetExporterWrapper::trackSetConstructor( QJSValue arg0, QJSValue arg1 )
+{
+    DEBUG_BLOCK
+
+    TrackSetExporter *trackSetExporter = nullptr;
+    // Called with 1 argument
+    if ( !arg0.isUndefined() && arg1.isUndefined() )
+    {
+        TrackSetExporter *trackSetPrototype = dynamic_cast<TrackSetExporter*>( arg0.toQObject() );
+        if( trackSetPrototype ) {
+            trackSetExporter = new TrackSetExporter( Dynamic::TrackSet( *trackSetPrototype ) );
+        }
+    // Called with 2 arguments
+    } else if ( !arg0.isUndefined() && arg1.isBool() ) {
+        bool isFull = arg1.toBool();
+        QStringList uidList;
+        Meta::TrackList trackList;
+        if( arg0.toVariant().canConvert<QStringList>() )
+        {
+            uidList = arg0.toVariant().toStringList();
+            Q_ASSERT( !arg0.toVariant().canConvert<Meta::TrackList>() );
+            trackSetExporter =  new TrackSetExporter( Dynamic::TrackSet( Dynamic::TrackCollectionPtr( new Dynamic::TrackCollection( uidList ) ), isFull ) );
+        }
+        else if( arg0.toVariant().canConvert<Meta::TrackList>() )
+        {
+            debug() << "In Meta::Tracklist TrackSet ctor";
+            trackList = qjsvalue_cast<Meta::TrackList>( arg0 );
+            foreach( const Meta::TrackPtr &track, trackList )
+            {
+                if( track )
+                    uidList << track->uidUrl();
+            }
+            trackSetExporter = new TrackSetExporter( Dynamic::TrackSet( Dynamic::TrackCollectionPtr( new Dynamic::TrackCollection( uidList ) ), isFull  ) );
+        }
+    }
+    if( trackSetExporter == nullptr )
+    {
+        /* TODO - Use commented code once QT versions >= 5.12
+        m_engine->throwError( QJSValue::SyntaxError, QStringLiteral("Invalid arguments for TrackSet!") );
+        return QJSValue(QJSValue::UndefinedValue);
+        */
+        return m_engine->evaluate("throw new TypeError('Invalid arguments for TrackSet!')");
+    }
+
+    const QJSValue trackSetObject = m_engine->newQObject( trackSetExporter );
+    return trackSetObject;
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // TrackSetExporter
 /////////////////////////////////////////////////////////////////////////////////////////
 
 void
-TrackSetExporter::init( QScriptEngine *engine )
+TrackSetExporter::init( QJSEngine *engine )
 {
-    qScriptRegisterMetaType<Dynamic::TrackSet>( engine, toScriptValue, fromScriptValue );
-    engine->globalObject().setProperty( QStringLiteral("TrackSet"), engine->newFunction( trackSetConstructor ),
-                                        QScriptValue:: Undeletable | QScriptValue::ReadOnly );
+    qRegisterMetaType<Dynamic::TrackSet>();
+    QMetaType::registerConverter<Dynamic::TrackSet, QJSValue>( [=] (Dynamic::TrackSet trackSet) { return toScriptValue( engine, trackSet ); } );
+    QMetaType::registerConverter<QJSValue, Dynamic::TrackSet>( [] (QJSValue jsValue) {
+        Dynamic::TrackSet trackSet;
+        fromScriptValue( jsValue, trackSet );
+        return trackSet;
+    } );
+    if (s_wrapper == nullptr)
+        s_wrapper = new TrackSetExporterWrapper( engine );
+    engine->globalObject().setProperty( QStringLiteral("TrackSet"), engine->newQObject( s_wrapper ).property( "trackSetConstructor" ) );
 }
 
 void
-TrackSetExporter::fromScriptValue( const QScriptValue &obj, Dynamic::TrackSet &trackSet )
+TrackSetExporter::fromScriptValue( const QJSValue &obj, Dynamic::TrackSet &trackSet )
 {
     DEBUG_BLOCK
     TrackSetExporter *trackSetProto = dynamic_cast<TrackSetExporter*>( obj.toQObject() );
@@ -402,13 +468,13 @@ TrackSetExporter::fromScriptValue( const QScriptValue &obj, Dynamic::TrackSet &t
         trackSet = *trackSetProto;
 }
 
-QScriptValue
-TrackSetExporter::toScriptValue( QScriptEngine *engine, const Dynamic::TrackSet &trackSet )
+QJSValue
+TrackSetExporter::toScriptValue( QJSEngine *engine, const Dynamic::TrackSet &trackSet )
 {
     DEBUG_BLOCK
     TrackSetExporter *trackProto = new TrackSetExporter( trackSet );
-    QScriptValue val = engine->newQObject( trackProto, QScriptEngine::ScriptOwnership,
-                                            QScriptEngine::ExcludeSuperClassContents );
+    QJSValue val = engine->newQObject( trackProto );
+    QQmlEngine::setObjectOwnership( trackProto, QQmlEngine::JavaScriptOwnership);
     return val;
 }
 
@@ -419,75 +485,6 @@ TrackSetExporter::containsUid( const QString &uid ) const
 }
 
 
-QScriptValue
-TrackSetExporter::trackSetConstructor( QScriptContext *context, QScriptEngine *engine )
-{
-    DEBUG_BLOCK
-
-    // if( !context->isCalledAsConstructor() ) throw exception?
-    Dynamic::TrackSet trackSet;
-    bool invalid = false;
-    switch( context->argumentCount() )
-    {
-        case 0:
-            break;
-
-        case 1:
-        {
-            TrackSetExporter *trackSetPrototype = dynamic_cast<TrackSetExporter*>( context->argument( 0 ).toQObject() );
-            if( trackSetPrototype )
-                trackSet = Dynamic::TrackSet( *trackSetPrototype );
-            else
-                invalid = true;
-            break;
-        }
-
-        case 2:
-            if( context->argument( 1 ).isBool() )
-            {
-                bool isFull = context->argument( 1 ).toBool();
-                QScriptValue arg0 = context->argument( 0 );
-                QStringList uidList;
-                Meta::TrackList trackList;
-                if( arg0.toVariant().canConvert<QStringList>() )
-                {
-                    uidList = arg0.toVariant().toStringList();
-                    Q_ASSERT( !arg0.toVariant().canConvert<Meta::TrackList>() );
-                    trackSet = Dynamic::TrackSet( Dynamic::TrackCollectionPtr( new Dynamic::TrackCollection( uidList ) ), isFull );
-                }
-                else if( arg0.toVariant().canConvert<Meta::TrackList>() )
-                {
-                    debug() << "In Meta::Tracklist TrackSet ctor";
-                    trackList = qscriptvalue_cast<Meta::TrackList>( arg0 );
-                    foreach( const Meta::TrackPtr &track, trackList )
-                    {
-                        if( track )
-                            uidList << track->uidUrl();
-                    }
-                    trackSet = Dynamic::TrackSet( Dynamic::TrackCollectionPtr( new Dynamic::TrackCollection( uidList ) ), isFull  );
-                }
-                else
-                    invalid = true;
-            }
-            else
-                invalid = true;
-            break;
-
-        default:
-            invalid = true;
-    }
-    if( invalid )
-    {
-        context->throwError( QScriptContext::SyntaxError, QStringLiteral("Invalid arguments for TrackSet!") );
-        return engine->undefinedValue();
-    }
-
-    const QScriptValue trackSetObject = engine->newQObject( new TrackSetExporter( trackSet )
-                                                , QScriptEngine::ScriptOwnership
-                                                , QScriptEngine::ExcludeSuperClassContents );
-    return trackSetObject;
-}
-
 void
 TrackSetExporter::reset( bool value )
 {
diff --git a/src/scripting/scriptengine/exporters/ScriptableBiasExporter.h b/src/scripting/scriptengine/exporters/ScriptableBiasExporter.h
index 44c22c197f..877fd20f2a 100644
--- a/src/scripting/scriptengine/exporters/ScriptableBiasExporter.h
+++ b/src/scripting/scriptengine/exporters/ScriptableBiasExporter.h
@@ -22,15 +22,29 @@
 
 #include <QObject>
 #include <QPointer>
-#include <QScriptValue>
+#include <QJSValue>
 #include <QString>
 #include <QXmlStreamReader>
 
-class QScriptContext;
-class QScriptEngine;
+class QJSEngine;
 
 namespace AmarokScript
 {
+    /**
+     * Wraps ScriptableBiasFactory Ctors
+     */
+    class ScriptableBiasFactoryWrapper : public QObject
+    {
+        Q_OBJECT
+    public:
+        ScriptableBiasFactoryWrapper(QJSEngine *engine);
+        Q_INVOKABLE QJSValue groupBiasCtor();
+        Q_INVOKABLE QJSValue biasCtor();
+
+    private:
+        QJSEngine *m_engine;
+    };
+
     // SCRIPTDOX BiasFactory
     class ScriptableBiasFactory : public QObject, public Dynamic::AbstractBiasFactory
     {
@@ -60,49 +74,49 @@ namespace AmarokScript
          * Set a function returning widget appropriate for editing the bias, if needed.
          * var obj = new ScriptableBias(); obj.widget = function( a ) { return new QLabel(\"dfdsf\"); }"
          */
-        Q_PROPERTY( QScriptValue widget READ widgetFunction WRITE setWidgetFunction )
+        Q_PROPERTY( QJSValue widget READ widgetFunction WRITE setWidgetFunction )
 
-        Q_PROPERTY( QScriptValue fromXml READ fromXmlFunction WRITE setFromXmlFunction )
+        Q_PROPERTY( QJSValue fromXml READ fromXmlFunction WRITE setFromXmlFunction )
 
-        Q_PROPERTY( QScriptValue toXml READ toXmlFunction WRITE setToXmlFunction )
+        Q_PROPERTY( QJSValue toXml READ toXmlFunction WRITE setToXmlFunction )
 
         /**
          * Set this to a function of signature:
          * TrackSet ( const Meta::TrackList &playlist, int contextCount, int finalCount, QStringList universeUids )
          */
-        Q_PROPERTY( QScriptValue matchingTracks READ matchingTracksFunction WRITE setMatchingTracksFunction )
+        Q_PROPERTY( QJSValue matchingTracks READ matchingTracksFunction WRITE setMatchingTracksFunction )
 
         /**
          * bool trackMatches( int position, TrackList playlist, int contextCount )
          */
-        Q_PROPERTY( QScriptValue trackMatches READ trackMatchesFunction WRITE setTrackMatchesFunction )
+        Q_PROPERTY( QJSValue trackMatches READ trackMatchesFunction WRITE setTrackMatchesFunction )
 
-        Q_PROPERTY( QScriptValue toStringFunction READ toStringFunction WRITE setToStringFunction )
+        Q_PROPERTY( QJSValue toStringFunction READ toStringFunction WRITE setToStringFunction )
 
-        Q_PROPERTY( QScriptValue init READ initFunction WRITE setInitFunction )
+        Q_PROPERTY( QJSValue init READ initFunction WRITE setInitFunction )
 
         public:
-            static void init( QScriptEngine *engine );
+            static void init( QJSEngine *engine );
 
             QString i18nName() const override;
             QString name() const override;
             QString i18nDescription() const override;
-            QScriptValue initFunction() const;
-            QScriptValue fromXmlFunction() const;
-            QScriptValue matchingTracksFunction() const;
-            QScriptValue toXmlFunction() const;
-            QScriptValue toStringFunction() const;
-            QScriptValue trackMatchesFunction() const;
-            QScriptValue widgetFunction() const;
-            QScriptEngine *engine() const;
+            QJSValue initFunction() const;
+            QJSValue fromXmlFunction() const;
+            QJSValue matchingTracksFunction() const;
+            QJSValue toXmlFunction() const;
+            QJSValue toStringFunction() const;
+            QJSValue trackMatchesFunction() const;
+            QJSValue widgetFunction() const;
+            QJSEngine *engine() const;
 
         public Q_SLOTS:
             Dynamic::BiasPtr createBias() override;
 
         private:
-            static QScriptValue groupBiasCtor( QScriptContext *context, QScriptEngine *engine );
-            static QScriptValue biasCtor( QScriptContext *context, QScriptEngine *engine );
-            ScriptableBiasFactory( QScriptEngine *engine = 0, bool groupBias = false );
+            friend QJSValue ScriptableBiasFactoryWrapper::groupBiasCtor();
+            friend QJSValue ScriptableBiasFactoryWrapper::biasCtor();
+            ScriptableBiasFactory( QJSEngine *engine = nullptr, bool groupBias = false );
             ~ScriptableBiasFactory() override;
 
             bool enabled() const;
@@ -110,27 +124,28 @@ namespace AmarokScript
             void setName( const QString &name );
             void setI18nName( const QString &i18nName );
             void setI18nDescription( const QString &description );
-            void setInitFunction( const QScriptValue &value );
-            void setWidgetFunction( const QScriptValue &value );
-            void setFromXmlFunction( const QScriptValue &value );
-            void setToXmlFunction( const QScriptValue &value );
-            void setTrackMatchesFunction( const QScriptValue &value );
-            void setMatchingTracksFunction( const QScriptValue &value );
-            void setToStringFunction( const QScriptValue &value );
-
-            QScriptValue m_initFunction;
+            void setInitFunction( const QJSValue &value );
+            void setWidgetFunction( const QJSValue &value );
+            void setFromXmlFunction( const QJSValue &value );
+            void setToXmlFunction( const QJSValue &value );
+            void setTrackMatchesFunction( const QJSValue &value );
+            void setMatchingTracksFunction( const QJSValue &value );
+            void setToStringFunction( const QJSValue &value );
+
+            QJSValue m_initFunction;
             QString m_name;
             QString m_i18nName;
             QString m_description;
-            QScriptValue m_widgetFunction;
-            QScriptValue m_fromXmlFunction;
-            QScriptValue m_toXmlFunction;
-            QScriptValue m_matchingTracksFunction;
-            QScriptValue m_trackMatchesFunction;
-            QScriptValue m_toStringFunction;
+            QJSValue m_widgetFunction;
+            QJSValue m_fromXmlFunction;
+            QJSValue m_toXmlFunction;
+            QJSValue m_matchingTracksFunction;
+            QJSValue m_trackMatchesFunction;
+            QJSValue m_toStringFunction;
             bool m_groupBias;
-            QScriptEngine *m_engine;
+            QJSEngine *m_engine;
             bool m_enabled;
+            static ScriptableBiasFactoryWrapper* s_wrapper;
     };
 
     class ScriptableBias : public Dynamic::AbstractBias
@@ -140,7 +155,7 @@ namespace AmarokScript
         public:
             explicit ScriptableBias( ScriptableBiasFactory *biasProto );
             ~ScriptableBias() override;
-            QScriptValue scriptObject() { return m_biasObject; }
+            QJSValue scriptObject() { return m_biasObject; }
 
         public:
             void fromXml( QXmlStreamReader *reader ) override;
@@ -179,8 +194,22 @@ namespace AmarokScript
 
         private:
             QPointer<ScriptableBiasFactory> m_scriptBias;
-            QScriptEngine *m_engine;
-            QScriptValue m_biasObject;
+            QJSEngine *m_engine;
+            QJSValue m_biasObject;
+    };
+
+    /**
+     * Wraps TrackSetExporter Ctors
+     */
+    class TrackSetExporterWrapper : public QObject
+    {
+        Q_OBJECT
+        public:
+            TrackSetExporterWrapper(QJSEngine *engine);
+            Q_INVOKABLE QJSValue trackSetConstructor( QJSValue arg0, QJSValue arg1 = QJSValue(QJSValue::UndefinedValue) );
+
+        private:
+            QJSEngine *m_engine;
     };
 
     /**
@@ -212,9 +241,8 @@ namespace AmarokScript
         Q_PROPERTY( bool isEmpty READ isEmpty )
 
         public:
-            static QScriptValue toScriptValue( QScriptEngine *engine, Dynamic::TrackSet const &trackSet );
-            static void fromScriptValue( const QScriptValue &obj, Dynamic::TrackSet &trackSet );
-            static QScriptValue trackSetConstructor( QScriptContext* context, QScriptEngine* engine );
+            static QJSValue toScriptValue( QJSEngine *engine, Dynamic::TrackSet const &trackSet );
+            static void fromScriptValue( const QJSValue &obj, Dynamic::TrackSet &trackSet );
 
             /**
              * Includes or excludes all tracks in the set.
@@ -279,8 +307,11 @@ namespace AmarokScript
             Q_INVOKABLE void subtractUids( const QStringList &uids );
 
         private:
-            static void init( QScriptEngine *engine );
+            static void init( QJSEngine *engine );
             explicit TrackSetExporter( const Dynamic::TrackSet &trackSet );
+            friend QJSValue TrackSetExporterWrapper::trackSetConstructor( QJSValue arg0, QJSValue arg1 );
+
+            static TrackSetExporterWrapper *s_wrapper;
 
             friend class ScriptableBiasFactory;
     };
diff --git a/src/scripting/scriptengine/qtbindings/Core.h b/src/scripting/scriptengine/qtbindings/Core.h
new file mode 100644
index 0000000000..8d4e289d81
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/Core.h
@@ -0,0 +1,36 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORE_H
+#define CORE_H
+
+// Groups includes by namespace
+#include "CoreByteArray.h"
+#include "CoreCoreApplication.h"
+#include "CoreDir.h"
+#include "CoreFile.h"
+#include "CoreFileInfo.h"
+#include "CoreIODevice.h"
+#include "CoreLocale.h"
+#include "CoreResource.h"
+#include "CoreTextCodec.h"
+#include "CoreTextStream.h"
+#include "CoreTranslator.h"
+#include "CoreUrl.h"
+
+#endif //CORE_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreByteArray.cpp b/src/scripting/scriptengine/qtbindings/CoreByteArray.cpp
new file mode 100644
index 0000000000..c1d7493d6b
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreByteArray.cpp
@@ -0,0 +1,760 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedro.gomes@ipsoft.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreByteArray.h"
+
+#include <QJSEngine>
+
+using namespace QtBindings::Core;
+
+ByteArray::ByteArray()
+{
+}
+
+ByteArray::ByteArray(const char *data, int size) : QByteArray(data, size)
+{
+}
+
+ByteArray::ByteArray(int size, char ch) : QByteArray(size, ch)
+{
+}
+
+ByteArray::ByteArray(const QByteArray &other) : QObject(), QByteArray(other)
+{
+}
+
+ByteArray::ByteArray(const ByteArray &other) : QObject(), QByteArray(other)
+{
+}
+
+ByteArray::ByteArray(ByteArray &&other) noexcept : QByteArray(other)
+{
+}
+
+ByteArray::ByteArray(const QString &other) : QByteArray( other.toLatin1() )
+{
+}
+
+ByteArray &ByteArray::append(const QByteArray &ba)
+{
+    QByteArray::append(ba);
+    return *this;
+}
+
+ByteArray &ByteArray::append(int count, char ch)
+{
+    QByteArray::append(count, ch);
+    return *this;
+}
+
+ByteArray &ByteArray::append(const char *str)
+{
+    QByteArray::append(str);
+    return *this;
+}
+
+ByteArray &ByteArray::append(const char *str, int len)
+{
+    QByteArray::append(str, len);
+    return *this;
+}
+
+ByteArray &ByteArray::append(char ch)
+{
+    QByteArray::append(ch);
+    return *this;
+}
+
+ByteArray &ByteArray::append(const QString &str)
+{
+    QByteArray::append(str);
+    return *this;
+}
+
+char ByteArray::at(int i) const
+{
+    return QByteArray::at(i);
+}
+
+QByteArray::iterator ByteArray::begin()
+{
+    return QByteArray::begin();
+}
+
+QByteArray::const_iterator ByteArray::begin() const
+{
+    return QByteArray::begin();
+}
+
+int ByteArray::capacity() const
+{
+    return QByteArray::capacity();
+}
+
+QByteArray::const_iterator ByteArray::cbegin() const
+{
+    return QByteArray::cbegin();
+}
+
+QByteArray::const_iterator ByteArray::cend() const
+{
+    return QByteArray::cend();
+}
+
+void ByteArray::chop(int n)
+{
+    QByteArray::chop(n);
+}
+
+void ByteArray::clear()
+{
+    QByteArray::clear();
+}
+
+QByteArray::const_iterator ByteArray::constBegin() const
+{
+    return QByteArray::constBegin();
+}
+
+const char *ByteArray::constData() const
+{
+    return QByteArray::constData();
+}
+
+QByteArray::const_iterator ByteArray::constEnd() const
+{
+    return QByteArray::constEnd();
+}
+
+bool ByteArray::contains(const QByteArray &ba) const
+{
+    return QByteArray::contains(ba);
+}
+
+bool ByteArray::contains(const char *str) const
+{
+    return QByteArray::contains(str);
+}
+
+bool ByteArray::contains(char ch) const
+{
+    return QByteArray::contains(ch);
+}
+
+int ByteArray::count(const QByteArray &ba) const
+{
+    return QByteArray::count(ba);
+}
+
+int ByteArray::count(const char *str) const
+{
+    return QByteArray::count(str);
+}
+
+int ByteArray::count(char ch) const
+{
+    return QByteArray::count(ch);
+}
+
+int ByteArray::count() const
+{
+    return QByteArray::count();
+}
+
+QByteArray::const_reverse_iterator ByteArray::crbegin() const
+{
+    return QByteArray::crbegin();
+}
+
+QByteArray::const_reverse_iterator ByteArray::crend() const
+{
+    return QByteArray::crend();
+}
+
+char *ByteArray::data()
+{
+    return QByteArray::data();
+}
+
+const char *ByteArray::data() const
+{
+    return QByteArray::data();
+}
+
+QByteArray::iterator ByteArray::end()
+{
+    return QByteArray::end();
+}
+
+QByteArray::const_iterator ByteArray::end() const
+{
+    return QByteArray::end();
+}
+
+bool ByteArray::endsWith(const QByteArray &ba) const
+{
+    return QByteArray::endsWith(ba);
+}
+
+bool ByteArray::endsWith(char ch) const
+{
+    return QByteArray::endsWith(ch);
+}
+
+bool ByteArray::endsWith(const char *str) const
+{
+    return QByteArray::endsWith(str);
+}
+
+QByteArray &ByteArray::fill(char ch, int size)
+{
+    return QByteArray::fill(ch, size);
+}
+
+int ByteArray::indexOf(const QByteArray &ba, int from) const
+{
+    return QByteArray::indexOf(ba, from);
+}
+
+int ByteArray::indexOf(const char *str, int from) const
+{
+    return QByteArray::indexOf(str, from);
+}
+
+int ByteArray::indexOf(char ch, int from) const
+{
+    return QByteArray::indexOf(ch, from);
+}
+
+int ByteArray::indexOf(const QString &str, int from) const
+{
+    return QByteArray::indexOf(str, from);
+}
+
+ByteArray &ByteArray::insert(int i, const QByteArray &ba)
+{
+    QByteArray::insert(i, ba);
+    return *this;
+}
+
+ByteArray &ByteArray::insert(int i, int count, char ch)
+{
+    QByteArray::insert(i, count, ch);
+    return *this;
+}
+
+ByteArray &ByteArray::insert(int i, const char *str)
+{
+    QByteArray::insert(i, str);
+    return *this;
+}
+
+ByteArray &ByteArray::insert(int i, const char *str, int len)
+{
+    QByteArray::insert(i, str, len);
+    return *this;
+}
+
+ByteArray &ByteArray::insert(int i, char ch)
+{
+    QByteArray::insert(i, ch);
+    return *this;
+}
+
+ByteArray &ByteArray::insert(int i, const QString &str)
+{
+    QByteArray::insert(i, str);
+    return *this;
+}
+
+bool ByteArray::isEmpty() const
+{
+    return QByteArray::isEmpty();
+}
+
+bool ByteArray::isNull() const
+{
+    return QByteArray::isNull();
+}
+
+int ByteArray::lastIndexOf(const QByteArray &ba, int from) const
+{
+    return QByteArray::lastIndexOf(ba, from);
+}
+
+int ByteArray::lastIndexOf(const char *str, int from) const
+{
+    return QByteArray::lastIndexOf(str, from);
+}
+
+int ByteArray::lastIndexOf(char ch, int from) const
+{
+    return QByteArray::lastIndexOf(ch, from);
+}
+
+int ByteArray::lastIndexOf(const QString &str, int from) const
+{
+    return QByteArray::lastIndexOf(str, from);
+}
+
+QByteArray ByteArray::left(int len) const
+{
+    return QByteArray::left(len);
+}
+
+QByteArray ByteArray::leftJustified(int width, char fill, bool truncate) const
+{
+    return QByteArray::leftJustified(width, fill, truncate);
+}
+
+int ByteArray::length() const
+{
+    return QByteArray::length();
+}
+
+QByteArray ByteArray::mid(int pos, int len) const
+{
+    return QByteArray::mid(pos, len);
+}
+
+ByteArray &ByteArray::prepend(const QByteArray &ba)
+{
+    QByteArray::prepend(ba);
+    return *this;
+}
+
+ByteArray &ByteArray::prepend(int count, char ch)
+{
+    QByteArray::prepend(count, ch);
+    return *this;
+}
+
+ByteArray &ByteArray::prepend(const char *str)
+{
+    QByteArray::prepend(str);
+    return *this;
+}
+
+ByteArray &ByteArray::prepend(const char *str, int len)
+{
+    QByteArray::prepend(str, len);
+    return *this;
+}
+
+ByteArray &ByteArray::prepend(char ch)
+{
+    QByteArray::prepend(ch);
+    return *this;
+}
+
+void ByteArray::push_back(const QByteArray &other)
+{
+    QByteArray::push_back(other);
+}
+
+void ByteArray::push_back(const char *str)
+{
+    QByteArray::push_back(str);
+}
+
+void ByteArray::push_back(char ch)
+{
+    QByteArray::push_back(ch);
+}
+
+void ByteArray::push_front(const QByteArray &other)
+{
+    QByteArray::push_front(other);
+}
+
+void ByteArray::push_front(const char *str)
+{
+    QByteArray::push_front(str);
+}
+
+void ByteArray::push_front(char ch)
+{
+    QByteArray::push_front(ch);
+}
+
+QByteArray::reverse_iterator ByteArray::rbegin()
+{
+    return QByteArray::rbegin();
+}
+
+QByteArray::const_reverse_iterator ByteArray::rbegin() const
+{
+    return QByteArray::rbegin();
+}
+
+QByteArray &ByteArray::remove(int pos, int len)
+{
+    return QByteArray::remove(pos, len);
+}
+
+QByteArray::reverse_iterator ByteArray::rend()
+{
+    return QByteArray::rend();
+}
+
+QByteArray::const_reverse_iterator ByteArray::rend() const
+{
+    return QByteArray::rend();
+}
+
+QByteArray ByteArray::repeated(int times) const
+{
+    return QByteArray::repeated(times);
+}
+
+QByteArray &ByteArray::replace(int pos, int len, const QByteArray &after)
+{
+    return QByteArray::replace(pos, len, after);
+}
+
+QByteArray &ByteArray::replace(int pos, int len, const char *after, int alen)
+{
+    return QByteArray::replace(pos, len, after, alen);
+}
+
+QByteArray &ByteArray::replace(int pos, int len, const char *after)
+{
+    return QByteArray::replace(pos, len, after);
+}
+
+QByteArray &ByteArray::replace(char before, const char *after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(char before, const QByteArray &after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(const char *before, const char *after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(const char *before, int bsize, const char *after, int asize)
+{
+    return QByteArray::replace(before, bsize, after, asize);
+}
+
+QByteArray &ByteArray::replace(const QByteArray &before, const QByteArray &after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(const QByteArray &before, const char *after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(const char *before, const QByteArray &after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(char before, char after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(const QString &before, const char *after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(char before, const QString &after)
+{
+    return QByteArray::replace(before, after);
+}
+
+QByteArray &ByteArray::replace(const QString &before, const QByteArray &after)
+{
+    return QByteArray::replace(before, after);
+}
+
+void ByteArray::reserve(int size)
+{
+    QByteArray::reserve(size);
+}
+
+void ByteArray::resize(int size)
+{
+    QByteArray::resize(size);
+}
+
+QByteArray ByteArray::right(int len) const
+{
+    return QByteArray::right(len);
+}
+
+QByteArray ByteArray::rightJustified(int width, char fill, bool truncate) const
+{
+    return QByteArray::rightJustified(width, fill, truncate);
+}
+
+QByteArray &ByteArray::setNum(int n, int base)
+{
+    return QByteArray::setNum(n, base);
+}
+
+QByteArray &ByteArray::setNum(ushort n, int base)
+{
+    return QByteArray::setNum(n, base);
+}
+
+QByteArray &ByteArray::setNum(short n, int base)
+{
+    return QByteArray::setNum(n, base);
+}
+
+QByteArray &ByteArray::setNum(uint n, int base)
+{
+    return QByteArray::setNum(n, base);
+}
+
+QByteArray &ByteArray::setNum(qlonglong n, int base)
+{
+    return QByteArray::setNum(n, base);
+}
+
+QByteArray &ByteArray::setNum(qulonglong n, int base)
+{
+    return QByteArray::setNum(n, base);
+}
+
+QByteArray &ByteArray::setNum(float n, char f, int prec)
+{
+    return QByteArray::setNum(n, f, prec);
+}
+
+QByteArray &ByteArray::setNum(double n, char f, int prec)
+{
+    return QByteArray::setNum(n, f, prec);
+}
+
+QByteArray &ByteArray::setRawData(const char *data, uint size)
+{
+    return QByteArray::setRawData(data, size);
+}
+
+QByteArray ByteArray::simplified() const
+{
+    return QByteArray::simplified();
+}
+
+int ByteArray::size() const
+{
+    return QByteArray::size();
+}
+
+QList<QByteArray> ByteArray::split(char sep) const
+{
+    return QByteArray::split(sep);
+}
+
+void ByteArray::squeeze()
+{
+    QByteArray::squeeze();
+}
+
+bool ByteArray::startsWith(const QByteArray &ba) const
+{
+    return QByteArray::startsWith(ba);
+}
+
+bool ByteArray::startsWith(char ch) const
+{
+    return QByteArray::startsWith(ch);
+}
+
+bool ByteArray::startsWith(const char *str) const
+{
+    return QByteArray::startsWith(str);
+}
+
+void ByteArray::swap(QByteArray &other)
+{
+    QByteArray::swap(other);
+}
+
+QByteArray ByteArray::toBase64() const
+{
+    return QByteArray::toBase64();
+}
+
+QByteArray ByteArray::toBase64(QByteArray::Base64Options options) const
+{
+    return QByteArray::toBase64(options);
+}
+
+double ByteArray::toDouble(bool *ok) const
+{
+    return QByteArray::toDouble(ok);
+}
+
+float ByteArray::toFloat(bool *ok) const
+{
+    return QByteArray::toFloat(ok);
+}
+
+QByteArray ByteArray::toHex() const
+{
+    return QByteArray::toHex();
+}
+
+QByteArray ByteArray::toHex(char separator) const
+{
+    return QByteArray::toHex(separator);
+}
+
+int ByteArray::toInt(bool *ok, int base) const
+{
+    return QByteArray::toInt(ok, base);
+}
+
+long ByteArray::toLong(bool *ok, int base) const
+{
+    return QByteArray::toLong(ok, base);
+}
+
+qlonglong ByteArray::toLongLong(bool *ok, int base) const
+{
+    return QByteArray::toLongLong(ok, base);
+}
+
+QByteArray ByteArray::toLower() const
+{
+    return QByteArray::toLower();
+}
+
+QByteArray ByteArray::toPercentEncoding(const QByteArray &exclude, const QByteArray &include, char percent) const
+{
+    return QByteArray::toPercentEncoding(exclude, include, percent);
+}
+
+short ByteArray::toShort(bool *ok, int base) const
+{
+    return QByteArray::toShort(ok, base);
+}
+
+std::string ByteArray::toStdString() const
+{
+    return QByteArray::toStdString();
+}
+
+uint ByteArray::toUInt(bool *ok, int base) const
+{
+    return QByteArray::toUInt(ok, base);
+}
+
+ulong ByteArray::toULong(bool *ok, int base) const
+{
+    return QByteArray::toULong(ok, base);
+}
+
+qulonglong ByteArray::toULongLong(bool *ok, int base) const
+{
+    return QByteArray::toULongLong(ok, base);
+}
+
+ushort ByteArray::toUShort(bool *ok, int base) const
+{
+    return QByteArray::toUShort(ok, base);
+}
+
+QByteArray ByteArray::toUpper() const
+{
+    return QByteArray::toUpper();
+}
+
+QByteArray ByteArray::trimmed() const
+{
+    return QByteArray::trimmed();
+}
+
+void ByteArray::truncate(int pos)
+{
+    QByteArray::truncate(pos);
+}
+
+ByteArray ByteArray::fromBase64(const QByteArray &base64)
+{
+    return ByteArray( QByteArray::fromBase64(base64) );
+}
+
+ByteArray ByteArray::fromBase64(const QByteArray &base64, QByteArray::Base64Options options)
+{
+    return ByteArray( QByteArray::fromBase64(base64,options) );
+}
+
+ByteArray ByteArray::fromHex(const QByteArray &hexEncoded)
+{
+    return ByteArray( QByteArray::fromHex(hexEncoded) );
+}
+
+ByteArray ByteArray::fromPercentEncoding(const QByteArray &input, char percent)
+{
+    return ByteArray( QByteArray::fromPercentEncoding(input,percent) );
+}
+
+ByteArray ByteArray::fromRawData(const char *data, int size)
+{
+    return ByteArray( QByteArray::fromRawData(data,size) );
+}
+
+ByteArray ByteArray::fromStdString(const std::string &str)
+{
+    return ByteArray( QByteArray::fromStdString(str) );
+}
+
+ByteArray ByteArray::number(int n, int base)
+{
+    return ByteArray( QByteArray::number(n,base) );
+}
+
+ByteArray ByteArray::number(uint n, int base)
+{
+    return ByteArray( QByteArray::number(n,base) );
+}
+
+ByteArray ByteArray::number(qlonglong n, int base)
+{
+    return ByteArray( QByteArray::number(n,base) );
+}
+
+ByteArray ByteArray::number(qulonglong n, int base)
+{
+    return ByteArray( QByteArray::number(n,base) );
+}
+
+ByteArray ByteArray::number(double n, char f, int prec)
+{
+    return ByteArray( QByteArray::number(n,f,prec) );
+}
+
+ByteArray &ByteArray::operator=(const ByteArray &other)
+{
+    if (this != &other)
+        QByteArray::operator=(other);
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreByteArray.h b/src/scripting/scriptengine/qtbindings/CoreByteArray.h
new file mode 100644
index 0000000000..e49eef615e
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreByteArray.h
@@ -0,0 +1,186 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedro.gomes@ipsoft.com>
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef COREBYTEARRAY_H 
+#define COREBYTEARRAY_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QByteArray>
+
+class QJSEngine;
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class ByteArray : public QObject, public QByteArray, public QtBindings::Base<ByteArray>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE ByteArray();
+            Q_INVOKABLE explicit ByteArray(const char *data, int size = -1);
+            Q_INVOKABLE ByteArray(int size, char ch);
+            Q_INVOKABLE explicit ByteArray(const QByteArray &other);
+            Q_INVOKABLE ByteArray(const ByteArray &other);
+            Q_INVOKABLE ByteArray(ByteArray &&other) noexcept;
+            Q_INVOKABLE explicit ByteArray(const QString &other);
+            Q_INVOKABLE static ByteArray fromBase64(const QByteArray &base64);
+            Q_INVOKABLE static ByteArray fromBase64(const QByteArray &base64, QByteArray::Base64Options options);
+            Q_INVOKABLE static ByteArray fromHex(const QByteArray &hexEncoded);
+            Q_INVOKABLE static ByteArray fromPercentEncoding(const QByteArray &input, char percent = '%');
+            Q_INVOKABLE static ByteArray fromRawData(const char *data, int size);
+            Q_INVOKABLE static ByteArray fromStdString(const std::string &str);
+            Q_INVOKABLE static ByteArray number(int n, int base = 10);
+            Q_INVOKABLE static ByteArray number(uint n, int base = 10);
+            Q_INVOKABLE static ByteArray number(qlonglong n, int base = 10);
+            Q_INVOKABLE static ByteArray number(qulonglong n, int base = 10);
+            Q_INVOKABLE static ByteArray number(double n, char f = 'g', int prec = 6);
+            ByteArray &operator=(const ByteArray &other);
+        public slots:
+            ByteArray &append(const QByteArray &ba);
+            ByteArray &append(int count, char ch);
+            ByteArray &append(const char *str);
+            ByteArray &append(const char *str, int len);
+            ByteArray &append(char ch);
+            ByteArray &append(const QString &str);
+            char at(int i) const;
+            QByteArray::iterator begin();
+            QByteArray::const_iterator begin() const;
+            int capacity() const;
+            QByteArray::const_iterator cbegin() const;
+            QByteArray::const_iterator cend() const;
+            void chop(int n);
+            void clear();
+            QByteArray::const_iterator constBegin() const;
+            const char *constData() const;
+            QByteArray::const_iterator constEnd() const;
+            bool contains(const QByteArray &ba) const;
+            bool contains(const char *str) const;
+            bool contains(char ch) const;
+            int count(const QByteArray &ba) const;
+            int count(const char *str) const;
+            int count(char ch) const;
+            int count() const;
+            QByteArray::const_reverse_iterator crbegin() const;
+            QByteArray::const_reverse_iterator crend() const;
+            char *data();
+            const char *data() const;
+            QByteArray::iterator end();
+            QByteArray::const_iterator end() const;
+            bool endsWith(const QByteArray &ba) const;
+            bool endsWith(char ch) const;
+            bool endsWith(const char *str) const;
+            QByteArray &fill(char ch, int size = -1);
+            int indexOf(const QByteArray &ba, int from = 0) const;
+            int indexOf(const char *str, int from = 0) const;
+            int indexOf(char ch, int from = 0) const;
+            int indexOf(const QString &str, int from = 0) const;
+            ByteArray &insert(int i, const QByteArray &ba);
+            ByteArray &insert(int i, int count, char ch);
+            ByteArray &insert(int i, const char *str);
+            ByteArray &insert(int i, const char *str, int len);
+            ByteArray &insert(int i, char ch);
+            ByteArray &insert(int i, const QString &str);
+            bool isEmpty() const;
+            bool isNull() const;
+            int lastIndexOf(const QByteArray &ba, int from = -1) const;
+            int lastIndexOf(const char *str, int from = -1) const;
+            int lastIndexOf(char ch, int from = -1) const;
+            int lastIndexOf(const QString &str, int from = -1) const;
+            QByteArray left(int len) const;
+            QByteArray leftJustified(int width, char fill = ' ', bool truncate = false) const;
+            int length() const;
+            QByteArray mid(int pos, int len = -1) const;
+            ByteArray &prepend(const QByteArray &ba);
+            ByteArray &prepend(int count, char ch);
+            ByteArray &prepend(const char *str);
+            ByteArray &prepend(const char *str, int len);
+            ByteArray &prepend(char ch);
+            void push_back(const QByteArray &other);
+            void push_back(const char *str);
+            void push_back(char ch);
+            void push_front(const QByteArray &other);
+            void push_front(const char *str);
+            void push_front(char ch);
+            QByteArray::reverse_iterator rbegin();
+            QByteArray::const_reverse_iterator rbegin() const;
+            QByteArray &remove(int pos, int len);
+            QByteArray::reverse_iterator rend();
+            QByteArray::const_reverse_iterator rend() const;
+            QByteArray repeated(int times) const;
+            QByteArray &replace(int pos, int len, const QByteArray &after);
+            QByteArray &replace(int pos, int len, const char *after, int alen);
+            QByteArray &replace(int pos, int len, const char *after);
+            QByteArray &replace(char before, const char *after);
+            QByteArray &replace(char before, const QByteArray &after);
+            QByteArray &replace(const char *before, const char *after);
+            QByteArray &replace(const char *before, int bsize, const char *after, int asize);
+            QByteArray &replace(const QByteArray &before, const QByteArray &after);
+            QByteArray &replace(const QByteArray &before, const char *after);
+            QByteArray &replace(const char *before, const QByteArray &after);
+            QByteArray &replace(char before, char after);
+            QByteArray &replace(const QString &before, const char *after);
+            QByteArray &replace(char before, const QString &after);
+            QByteArray &replace(const QString &before, const QByteArray &after);
+            void reserve(int size);
+            void resize(int size);
+            QByteArray right(int len) const;
+            QByteArray rightJustified(int width, char fill = ' ', bool truncate = false) const;
+            QByteArray &setNum(int n, int base = 10);
+            QByteArray &setNum(ushort n, int base = 10);
+            QByteArray &setNum(short n, int base = 10);
+            QByteArray &setNum(uint n, int base = 10);
+            QByteArray &setNum(qlonglong n, int base = 10);
+            QByteArray &setNum(qulonglong n, int base = 10);
+            QByteArray &setNum(float n, char f = 'g', int prec = 6);
+            QByteArray &setNum(double n, char f = 'g', int prec = 6);
+            QByteArray &setRawData(const char *data, uint size);
+            QByteArray simplified() const;
+            int size() const;
+            QList<QByteArray> split(char sep) const;
+            void squeeze();
+            bool startsWith(const QByteArray &ba) const;
+            bool startsWith(char ch) const;
+            bool startsWith(const char *str) const;
+            void swap(QByteArray &other);
+            QByteArray toBase64() const;
+            QByteArray toBase64(QByteArray::Base64Options options) const;
+            double toDouble(bool *ok = Q_NULLPTR) const;
+            float toFloat(bool *ok = Q_NULLPTR) const;
+            QByteArray toHex() const;
+            QByteArray toHex(char separator) const;
+            int toInt(bool *ok = Q_NULLPTR, int base = 10) const;
+            long toLong(bool *ok = Q_NULLPTR, int base = 10) const;
+            qlonglong toLongLong(bool *ok = Q_NULLPTR, int base = 10) const;
+            QByteArray toLower() const;
+            QByteArray toPercentEncoding(const QByteArray &exclude = QByteArray(), const QByteArray &include = QByteArray(), char percent = '%') const;
+            short toShort(bool *ok = Q_NULLPTR, int base = 10) const;
+            std::string toStdString() const;
+            uint toUInt(bool *ok = Q_NULLPTR, int base = 10) const;
+            ulong toULong(bool *ok = Q_NULLPTR, int base = 10) const;
+            qulonglong toULongLong(bool *ok = Q_NULLPTR, int base = 10) const;
+            ushort toUShort(bool *ok = Q_NULLPTR, int base = 10) const;
+            QByteArray toUpper() const;
+            QByteArray trimmed() const;
+            void truncate(int pos);
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::ByteArray)
+#endif // COREBYTEARRAY_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreCoreApplication.cpp b/src/scripting/scriptengine/qtbindings/CoreCoreApplication.cpp
new file mode 100644
index 0000000000..71484cd68d
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreCoreApplication.cpp
@@ -0,0 +1,50 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreCoreApplication.h"
+
+#include <QCoreApplication>
+
+using namespace QtBindings::Core;
+
+CoreApplication::CoreApplication()
+{
+}
+
+CoreApplication::CoreApplication(const CoreApplication &other) : QObject()
+{
+    Q_UNUSED(other);
+}
+
+bool CoreApplication::installTranslator(Translator *messageFile)
+{
+    return QCoreApplication::installTranslator(messageFile);
+}
+
+QString CoreApplication::translate(QString context, QString key)
+{
+    return QCoreApplication::translate(context.toLocal8Bit().constData(),
+            key.toLocal8Bit().constData());
+}
+
+CoreApplication &CoreApplication::operator=(const CoreApplication &other)
+{
+    Q_UNUSED(other);
+    /* Nothing to do here */
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreCoreApplication.h b/src/scripting/scriptengine/qtbindings/CoreCoreApplication.h
new file mode 100644
index 0000000000..3b9909344f
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreCoreApplication.h
@@ -0,0 +1,48 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORECOREAPPLICATION_H
+#define CORECOREAPPLICATION_H
+
+#include "QtBinding.h"
+#include "CoreTranslator.h"
+#include <QObject>
+
+class QJSEngine;
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        /* This class exceptionally does not inherit from its QT respective
+         * because its a singleton.
+         * */
+        class CoreApplication : public QObject, public QtBindings::Base<CoreApplication>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE CoreApplication();
+            Q_INVOKABLE CoreApplication(const CoreApplication& other);
+            Q_INVOKABLE static bool installTranslator(Translator *messageFile);
+            Q_INVOKABLE static QString translate(QString context, QString key);
+            CoreApplication &operator=(const CoreApplication &other);
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::CoreApplication)
+#endif //CORECOREAPPLICATION_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreDir.cpp b/src/scripting/scriptengine/qtbindings/CoreDir.cpp
new file mode 100644
index 0000000000..a20276b5be
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreDir.cpp
@@ -0,0 +1,351 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedro.gomes@ipsoft.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreDir.h"
+
+using namespace QtBindings::Core;
+
+Dir::Dir(const QDir &path) : QDir(path)
+{
+}
+
+Dir::Dir(const Dir &path) : QObject(), QDir(path)
+{
+}
+
+Dir::Dir(const QString &path) : QDir(path)
+{
+}
+
+Dir::Dir(const QString &path, const QString &nameFilter,
+        QDir::SortFlags sort, QDir::Filters filter) : QDir(path, nameFilter, sort, filter)
+{
+}
+
+bool Dir::cd(const QString &dirName)
+{
+    return QDir::cd(dirName);
+}
+
+bool Dir::cdUp()
+{
+    return QDir::cdUp();
+}
+
+bool Dir::exists() const
+{
+    return QDir::exists();
+}
+
+bool Dir::exists(const QString &name) const
+{
+    return QDir::exists(name);
+}
+
+bool Dir::isEmpty(QDir::Filters filters) const
+{
+    return QDir::isEmpty(filters);
+}
+
+bool Dir::isReadable() const
+{
+    return QDir::isReadable();
+}
+
+bool Dir::isRelative() const
+{
+    return QDir::isRelative();
+}
+
+bool Dir::isRoot() const
+{
+    return QDir::isRoot();
+}
+
+bool Dir::makeAbsolute()
+{
+    return QDir::makeAbsolute();
+}
+
+bool Dir::mkdir(const QString &dirName) const
+{
+    return QDir::mkdir(dirName);
+}
+
+bool Dir::mkpath(const QString &dirPath) const
+{
+    return QDir::mkpath(dirPath);
+}
+
+bool Dir::remove(const QString &fileName)
+{
+    return QDir::remove(fileName);
+}
+
+bool Dir::removeRecursively()
+{
+    return QDir::removeRecursively();
+}
+
+bool Dir::rename(const QString &oldName, const QString &newName)
+{
+    return QDir::rename(oldName, newName);
+}
+
+bool Dir::rmdir(const QString &dirName) const
+{
+    return QDir::rmdir(dirName);
+}
+
+bool Dir::rmpath(const QString &dirPath) const
+{
+    return QDir::rmpath(dirPath);
+}
+
+QDir::Filters Dir::filter() const
+{
+    return QDir::filter();
+}
+
+QFileInfoList Dir::entryInfoList(const QStringList &nameFilters, QDir::Filters filters, QDir::SortFlags sort) const
+{
+    return QDir::entryInfoList(nameFilters, filters, sort);
+}
+
+QFileInfoList Dir::entryInfoList(QDir::Filters filters, QDir::SortFlags sort) const
+{
+    return QDir::entryInfoList(filters, sort);
+}
+
+QString Dir::absoluteFilePath(const QString &fileName) const
+{
+    return QDir::absoluteFilePath(fileName);
+}
+
+QString Dir::absolutePath() const
+{
+    return QDir::absolutePath();
+}
+
+QString Dir::canonicalPath() const
+{
+    return QDir::canonicalPath();
+}
+
+QString Dir::dirName() const
+{
+    return QDir::dirName();
+}
+
+QString Dir::filePath(const QString &fileName) const
+{
+    return QDir::filePath(fileName);
+}
+
+QStringList Dir::entryList(const QStringList &nameFilters, QDir::Filters filters, QDir::SortFlags sort) const
+{
+    return QDir::entryList(nameFilters, filters, sort);
+}
+
+QStringList Dir::entryList(QDir::Filters filters, QDir::SortFlags sort) const
+{
+    return QDir::entryList(filters, sort);
+}
+
+QStringList Dir::nameFilters() const
+{
+    return QDir::nameFilters();
+}
+
+QString Dir::path() const
+{
+    return QDir::path();
+}
+
+QString Dir::relativeFilePath(const QString &fileName) const
+{
+    return QDir::relativeFilePath(fileName);
+}
+
+QDir::SortFlags Dir::sorting() const
+{
+    return QDir::sorting();
+}
+
+uint Dir::count() const
+{
+    return QDir::count();
+}
+
+void Dir::refresh() const
+{
+    QDir::refresh();
+}
+
+void Dir::setFilter(QDir::Filters filter)
+{
+    QDir::setFilter(filter);
+}
+
+void Dir::setNameFilters(const QStringList &nameFilters)
+{
+    QDir::setNameFilters(nameFilters);
+}
+
+void Dir::setPath(const QString &path)
+{
+    QDir::setPath(path);
+}
+
+void Dir::setSorting(QDir::SortFlags sort)
+{
+    QDir::setSorting(sort);
+}
+
+void Dir::swap(QDir &other)
+{
+    QDir::swap(other);
+}
+
+bool Dir::isAbsolutePath(const QString &path)
+{
+    return QDir::isAbsolutePath(path);
+}
+
+bool Dir::isRelativePath(const QString &path)
+{
+    return QDir::isRelativePath(path);
+}
+
+bool Dir::match(const QString &filter, const QString &fileName)
+{
+    return QDir::match(filter,fileName);
+}
+
+bool Dir::match(const QStringList &filters, const QString &fileName)
+{
+    return QDir::match(filters,fileName);
+}
+
+bool Dir::setCurrent(const QString &path)
+{
+    return QDir::setCurrent(path);
+}
+
+QChar Dir::listSeparator()
+{
+    return QDir::listSeparator();
+}
+
+QChar Dir::separator()
+{
+    return QDir::separator();
+}
+
+QDir Dir::current()
+{
+    return QDir::current();
+}
+
+QDir Dir::home()
+{
+    return QDir::home();
+}
+
+QDir Dir::root()
+{
+    return QDir::root();
+}
+
+QDir Dir::temp()
+{
+    return QDir::temp();
+}
+
+QFileInfoList Dir::drives()
+{
+    return QDir::drives();
+}
+
+QString Dir::cleanPath(const QString &path)
+{
+    return QDir::cleanPath(path);
+}
+
+QString Dir::currentPath()
+{
+    return QDir::currentPath();
+}
+
+QString Dir::fromNativeSeparators(const QString &pathName)
+{
+    return QDir::fromNativeSeparators(pathName);
+}
+
+QString Dir::homePath()
+{
+    return QDir::homePath();
+}
+
+QStringList Dir::nameFiltersFromString(const QString &nameFilter)
+{
+    return QDir::nameFiltersFromString(nameFilter);
+}
+
+QStringList Dir::searchPaths(const QString &prefix)
+{
+    return QDir::searchPaths(prefix);
+}
+
+QString Dir::rootPath()
+{
+    return QDir::rootPath();
+}
+
+QString Dir::tempPath()
+{
+    return QDir::tempPath();
+}
+
+QString Dir::toNativeSeparators(const QString &pathName)
+{
+    return QDir::toNativeSeparators(pathName);
+}
+
+void Dir::addResourceSearchPath(const QString &path)
+{
+    QDir::addResourceSearchPath(path);
+}
+
+void Dir::addSearchPath(const QString &prefix, const QString &path)
+{
+    QDir::addSearchPath(prefix,path);
+}
+
+void Dir::setSearchPaths(const QString &prefix, const QStringList &searchPaths)
+{
+    QDir::setSearchPaths(prefix,searchPaths);
+}
+
+Dir &Dir::operator=(const Dir &other)
+{
+    if (this != &other) {
+       QDir::operator=( other );
+    }
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreDir.h b/src/scripting/scriptengine/qtbindings/CoreDir.h
new file mode 100644
index 0000000000..a498ff8c7a
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreDir.h
@@ -0,0 +1,106 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedro.gomes@ipsoft.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef COREDIR_H
+#define COREDIR_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QDir>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class Dir : public QObject, public QDir, public QtBindings::Base<Dir>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE Dir(const QDir &path);
+            Q_INVOKABLE Dir(const Dir &path);
+            Q_INVOKABLE Dir(const QString &path = QString());
+            Q_INVOKABLE Dir(const QString &path, const QString &nameFilter, SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries);
+            Q_INVOKABLE static bool isAbsolutePath(const QString &path);
+            Q_INVOKABLE static bool isRelativePath(const QString &path);
+            Q_INVOKABLE static bool match(const QString &filter, const QString &fileName);
+            Q_INVOKABLE static bool match(const QStringList &filters, const QString &fileName);
+            Q_INVOKABLE static bool setCurrent(const QString &path);
+            Q_INVOKABLE static QChar listSeparator();
+            Q_INVOKABLE static QChar separator();
+            Q_INVOKABLE static QDir current();
+            Q_INVOKABLE static QDir home();
+            Q_INVOKABLE static QDir root();
+            Q_INVOKABLE static QDir temp();
+            Q_INVOKABLE static QFileInfoList drives();
+            Q_INVOKABLE static QString cleanPath(const QString &path);
+            Q_INVOKABLE static QString currentPath();
+            Q_INVOKABLE static QString fromNativeSeparators(const QString &pathName);
+            Q_INVOKABLE static QString homePath();
+            Q_INVOKABLE static QStringList nameFiltersFromString(const QString &nameFilter);
+            Q_INVOKABLE static QStringList searchPaths(const QString &prefix);
+            Q_INVOKABLE static QString rootPath();
+            Q_INVOKABLE static QString tempPath();
+            Q_INVOKABLE static QString toNativeSeparators(const QString &pathName);
+            Q_INVOKABLE static void addResourceSearchPath(const QString &path);
+            Q_INVOKABLE static void addSearchPath(const QString &prefix, const QString &path);
+            Q_INVOKABLE static void setSearchPaths(const QString &prefix, const QStringList &searchPaths);
+            Dir &operator=(const Dir &other);
+        public slots:
+            bool cd(const QString &dirName);
+            bool cdUp();
+            bool exists() const;
+            bool exists(const QString &name) const;
+            bool isAbsolute() const { return !isRelative(); }
+            bool isEmpty(Filters filters = Filters(AllEntries | NoDotAndDotDot)) const;
+            bool isReadable() const;
+            bool isRelative() const;
+            bool isRoot() const;
+            bool makeAbsolute();
+            bool mkdir(const QString &dirName) const;
+            bool mkpath(const QString &dirPath) const;
+            bool remove(const QString &fileName);
+            bool removeRecursively();
+            bool rename(const QString &oldName, const QString &newName);
+            bool rmdir(const QString &dirName) const;
+            bool rmpath(const QString &dirPath) const;
+            Filters filter() const;
+            QFileInfoList entryInfoList(const QStringList &nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort) const;
+            QFileInfoList entryInfoList(Filters filters = NoFilter, SortFlags sort = NoSort) const;
+            QString absoluteFilePath(const QString &fileName) const;
+            QString absolutePath() const;
+            QString canonicalPath() const;
+            QString dirName() const;
+            QString filePath(const QString &fileName) const;
+            QStringList entryList(const QStringList &nameFilters, Filters filters = NoFilter, SortFlags sort = NoSort) const;
+            QStringList entryList(Filters filters = NoFilter, SortFlags sort = NoSort) const;
+            QStringList nameFilters() const;
+            QString path() const;
+            QString relativeFilePath(const QString &fileName) const;
+            SortFlags sorting() const;
+            uint count() const;
+            void refresh() const;
+            void setFilter(Filters filter);
+            void setNameFilters(const QStringList &nameFilters);
+            void setPath(const QString &path);
+            void setSorting(SortFlags sort);
+            void swap(QDir &other);
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::Dir)
+#endif //COREDIR_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreFile.cpp b/src/scripting/scriptengine/qtbindings/CoreFile.cpp
new file mode 100644
index 0000000000..8e7b6a266f
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreFile.cpp
@@ -0,0 +1,209 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreFile.h"
+
+using namespace QtBindings::Core;
+
+File::File()
+{
+}
+
+File::File(const File &file) : QFile()
+{
+    *this = file;
+}
+
+File::File(const QString &name, QObject *parent) : QFile(name, parent)
+{
+}
+
+File::File(QObject *parent) : QFile(parent)
+{
+}
+
+File::File(const QString &name) : QFile(name)
+{
+}
+
+File::~File()
+{
+}
+
+void File::close()
+{
+    QFile::close();
+}
+
+bool File::copy(const QString &fileName, const QString &newName)
+{
+    return QFile::copy(fileName,newName);
+}
+
+QString File::decodeName(const char *localFileName)
+{
+    return QFile::decodeName(localFileName);
+}
+
+QString File::decodeName(const QByteArray &localFileName)
+{
+    return QFile::decodeName(localFileName);
+}
+
+QByteArray File::encodeName(const QString &fileName)
+{
+    return QFile::encodeName(fileName);
+}
+
+bool File::exists(const QString &fileName)
+{
+    return QFile::exists(fileName);
+}
+
+bool File::link(const QString &fileName, const QString &linkName)
+{
+    return QFile::link(fileName,linkName);
+}
+
+QFileDevice::Permissions File::permissions(const QString &fileName)
+{
+    return QFile::permissions(fileName);
+}
+
+bool File::remove(const QString &fileName)
+{
+    return QFile::remove(fileName);
+}
+
+bool File::rename(const QString &oldName, const QString &newName)
+{
+    return QFile::rename(oldName,newName);
+}
+
+bool File::resize(const QString &fileName, qint64 sz)
+{
+    return QFile::resize(fileName,sz);
+}
+
+bool File::setPermissions(const QString &fileName,
+                                            QFileDevice::Permissions permissions)
+{
+    return QFile::setPermissions(fileName,permissions);
+}
+
+QString File::symLinkTarget(const QString &fileName)
+{
+    return QFile::symLinkTarget(fileName);
+}
+
+bool File::copy(const QString &newName)
+{
+    return QFile::copy(newName);
+}
+
+bool File::exists() const
+{
+    return QFile::exists();
+}
+
+QString File::fileName() const
+{
+    return QFile::fileName();
+}
+
+bool File::link(const QString &linkName)
+{
+    return QFile::link(linkName);
+}
+/*
+bool File::open(FILE *fh, QIODevice::OpenMode mode,
+                                  QFileDevice::FileHandleFlags handleFlags)
+{
+    return QFile::open(fh, mode, handleFlags);
+}
+
+bool File::open(int fd, QIODevice::OpenMode mode,
+                                  QFileDevice::FileHandleFlags handleFlags)
+{
+    return QFile::open(fd, mode, handleFlags);
+}
+
+bool File::open(QIODevice::OpenMode mode)
+{
+    return QFile::open(mode);
+}
+*/
+
+bool File::open(QtBindings::Core::IODevice::OpenModeFlag mode)
+{
+    return QFile::open( QIODevice::OpenMode(mode) );
+}
+
+QFileDevice::Permissions File::permissions() const
+{
+    return QFile::permissions();
+}
+
+bool File::remove()
+{
+    return QFile::remove();
+}
+
+bool File::rename(const QString &newName)
+{
+    return QFile::rename(newName);
+}
+
+bool File::resize(qint64 sz)
+{
+    return QFile::resize(sz);
+}
+
+void File::setFileName(const QString &name)
+{
+    QFile::setFileName(name);
+}
+
+bool File::setPermissions(QFileDevice::Permissions permissions)
+{
+    return QFile::setPermissions(permissions);
+}
+
+qint64 File::size() const
+{
+    return QFile::size();
+}
+
+QString File::symLinkTarget() const
+{
+    return QFile::symLinkTarget();
+}
+
+File &File::operator=(const File &other)
+{
+    if (this != &other ) {
+        this->setFileName(other.fileName());
+        this->setPermissions(other.permissions());
+        this->setCurrentReadChannel(other.currentReadChannel());
+        this->setCurrentWriteChannel(other.currentWriteChannel());
+        this->setTextModeEnabled(other.isTextModeEnabled());
+        this->setErrorString(other.errorString());
+        this->setOpenMode(other.openMode());
+    }
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreFile.h b/src/scripting/scriptengine/qtbindings/CoreFile.h
new file mode 100644
index 0000000000..65f74c1b89
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreFile.h
@@ -0,0 +1,77 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COREFILE_H
+#define COREFILE_H
+
+#include "QtBinding.h"
+#include "CoreIODevice.h"
+#include <QFile>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class File : public QFile, public QtBindings::Base<File>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE File();
+            Q_INVOKABLE File(const File &file);
+            Q_INVOKABLE File(const QString &name, QObject *parent);
+            Q_INVOKABLE File(QObject *parent);
+            Q_INVOKABLE File(const QString &name);
+            Q_INVOKABLE virtual ~File();;
+            Q_INVOKABLE static bool copy(const QString &fileName, const QString &newName);
+            Q_INVOKABLE static QString decodeName(const char *localFileName);
+            Q_INVOKABLE static QString decodeName(const QByteArray &localFileName);
+            Q_INVOKABLE static QByteArray encodeName(const QString &fileName);
+            Q_INVOKABLE static bool exists(const QString &fileName);
+            Q_INVOKABLE static bool link(const QString &fileName, const QString &linkName);
+            Q_INVOKABLE static QFileDevice::Permissions permissions(const QString &fileName);
+            Q_INVOKABLE static bool remove(const QString &fileName);
+            Q_INVOKABLE static bool rename(const QString &oldName, const QString &newName);
+            Q_INVOKABLE static bool resize(const QString &fileName, qint64 sz);
+            Q_INVOKABLE static bool setPermissions(const QString &fileName, QFileDevice::Permissions permissions);
+            Q_INVOKABLE static QString symLinkTarget(const QString &fileName);
+            File &operator=(const File &other);
+            // Supress warnings about overloading virtual QFile::open
+            using QFile::open;
+        public slots:
+            Q_INVOKABLE virtual void close() override;
+            Q_INVOKABLE bool copy(const QString &newName);
+            Q_INVOKABLE bool exists() const;
+            Q_INVOKABLE virtual QString fileName() const override;
+            Q_INVOKABLE bool link(const QString &linkName);
+            //Q_INVOKABLE bool open(FILE *fh, QIODevice::OpenMode mode, QFileDevice::FileHandleFlags handleFlags = DontCloseHandle);
+            //Q_INVOKABLE bool open(int fd, QIODevice::OpenMode mode, QFileDevice::FileHandleFlags handleFlags = DontCloseHandle);
+            //Q_INVOKABLE virtual bool open(QIODevice::OpenMode mode) override;
+            Q_INVOKABLE virtual bool open(QtBindings::Core::IODevice::OpenModeFlag mode);
+            Q_INVOKABLE virtual QFileDevice::Permissions permissions() const override;
+            Q_INVOKABLE bool remove();
+            Q_INVOKABLE bool rename(const QString &newName);
+            Q_INVOKABLE virtual bool resize(qint64 sz) override;
+            Q_INVOKABLE void setFileName(const QString &name);
+            Q_INVOKABLE virtual bool setPermissions(QFileDevice::Permissions permissions) override;
+            Q_INVOKABLE virtual qint64 size() const override;
+            Q_INVOKABLE QString symLinkTarget() const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::File)
+#endif //COREFILE_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreFileInfo.cpp b/src/scripting/scriptengine/qtbindings/CoreFileInfo.cpp
new file mode 100644
index 0000000000..625e72f19b
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreFileInfo.cpp
@@ -0,0 +1,299 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreFileInfo.h"
+
+#include <QDateTime>
+#include <QDir>
+
+using namespace QtBindings::Core;
+
+FileInfo::FileInfo()
+{
+}
+
+FileInfo::FileInfo(const QString &file) : QFileInfo(file)
+{
+}
+
+FileInfo::FileInfo(const QFile &file) : QFileInfo(file)
+{
+}
+
+FileInfo::FileInfo(const QDir &dir, const QString &file) : QFileInfo(dir, file)
+{
+}
+
+FileInfo::FileInfo(const QFileInfo &fileinfo) : QFileInfo(fileinfo)
+{
+}
+
+FileInfo::FileInfo(const FileInfo &fileinfo) : QObject(), QFileInfo(fileinfo)
+{
+}
+
+FileInfo::FileInfo(QFileInfoPrivate *d) : QFileInfo(d)
+{
+}
+
+QDir FileInfo::absoluteDir() const
+{
+    return QFileInfo::absoluteDir();
+}
+
+QString FileInfo::absoluteFilePath() const
+{
+    return QFileInfo::absoluteFilePath();
+}
+
+QString FileInfo::absolutePath() const
+{
+    return QFileInfo::absolutePath();
+}
+
+QString FileInfo::baseName() const
+{
+    return QFileInfo::baseName();
+}
+
+QString FileInfo::bundleName() const
+{
+    return QFileInfo::bundleName();
+}
+
+bool FileInfo::caching() const
+{
+    return QFileInfo::caching();
+}
+
+QString FileInfo::canonicalFilePath() const
+{
+    return QFileInfo::canonicalFilePath();
+}
+
+QString FileInfo::canonicalPath() const
+{
+    return QFileInfo::canonicalPath();
+}
+
+QString FileInfo::completeBaseName() const
+{
+    return QFileInfo::completeBaseName();
+}
+
+QString FileInfo::completeSuffix() const
+{
+    return QFileInfo::completeSuffix();
+}
+
+QDateTime FileInfo::created() const
+{
+    return QFileInfo::created();
+}
+
+QDir FileInfo::dir() const
+{
+    return QFileInfo::dir();
+}
+
+bool FileInfo::exists() const
+{
+    return QFileInfo::exists();
+}
+
+QString FileInfo::fileName() const
+{
+    return QFileInfo::fileName();
+}
+
+QString FileInfo::filePath() const
+{
+    return QFileInfo::filePath();
+}
+
+QString FileInfo::group() const
+{
+    return QFileInfo::group();
+}
+
+uint FileInfo::groupId() const
+{
+    return QFileInfo::groupId();
+}
+
+bool FileInfo::isAbsolute() const
+{
+    return QFileInfo::isAbsolute();
+}
+
+bool FileInfo::isBundle() const
+{
+    return QFileInfo::isBundle();
+}
+
+bool FileInfo::isDir() const
+{
+    return QFileInfo::isDir();
+}
+
+bool FileInfo::isExecutable() const
+{
+    return QFileInfo::isExecutable();
+}
+
+bool FileInfo::isFile() const
+{
+    return QFileInfo::isFile();
+}
+
+bool FileInfo::isHidden() const
+{
+    return QFileInfo::isHidden();
+}
+
+bool FileInfo::isNativePath() const
+{
+    return QFileInfo::isNativePath();
+}
+
+bool FileInfo::isReadable() const
+{
+    return QFileInfo::isReadable();
+}
+
+bool FileInfo::isRelative() const
+{
+    return QFileInfo::isRelative();
+}
+
+bool FileInfo::isRoot() const
+{
+    return QFileInfo::isRoot();
+}
+
+bool FileInfo::isSymLink() const
+{
+    return QFileInfo::isSymLink();
+}
+
+bool FileInfo::isWritable() const
+{
+    return QFileInfo::isWritable();
+}
+
+QDateTime FileInfo::lastModified() const
+{
+    return QFileInfo::lastModified();
+}
+
+QDateTime FileInfo::lastRead() const
+{
+    return QFileInfo::lastRead();
+}
+
+bool FileInfo::makeAbsolute()
+{
+    return QFileInfo::makeAbsolute();
+}
+
+QString FileInfo::owner() const
+{
+    return QFileInfo::owner();
+}
+
+uint FileInfo::ownerId() const
+{
+    return QFileInfo::ownerId();
+}
+
+QString FileInfo::path() const
+{
+    return QFileInfo::path();
+}
+
+bool FileInfo::permission(QFile::Permissions permissions) const
+{
+    return QFileInfo::permission(permissions);
+}
+
+QFile::Permissions FileInfo::permissions() const
+{
+    return QFileInfo::permissions();
+}
+
+QString FileInfo::readLink() const
+{
+    return QFileInfo::readLink();
+}
+
+void FileInfo::refresh()
+{
+    QFileInfo::refresh();
+}
+
+void FileInfo::setCaching(bool on)
+{
+    QFileInfo::setCaching(on);
+}
+
+void FileInfo::setFile(const QDir &dir, const QString &file)
+{
+    QFileInfo::setFile(dir, file);
+}
+
+void FileInfo::setFile(const QFile &file)
+{
+    QFileInfo::setFile(file);
+}
+
+void FileInfo::setFile(const QString &file)
+{
+    QFileInfo::setFile(file);
+}
+
+qint64 FileInfo::size() const
+{
+    return QFileInfo::size();
+}
+
+QString FileInfo::suffix() const
+{
+    return QFileInfo::suffix();
+}
+
+void FileInfo::swap(QFileInfo &other)
+{
+    QFileInfo::swap(other);
+}
+
+QString FileInfo::symLinkTarget() const
+{
+    return QFileInfo::symLinkTarget();
+}
+
+bool FileInfo::exists(const QString &file)
+{
+    return QFileInfo::exists(file);
+}
+
+FileInfo &FileInfo::operator=(const FileInfo &other)
+{
+    if (this != &other)
+        QFileInfo::operator=(other);
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreFileInfo.h b/src/scripting/scriptengine/qtbindings/CoreFileInfo.h
new file mode 100644
index 0000000000..32cc1e29c3
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreFileInfo.h
@@ -0,0 +1,96 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COREFILEINFO_H
+#define COREFILEINFO_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QFileInfo>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class FileInfo : public QObject, public QFileInfo, public QtBindings::Base<FileInfo>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE FileInfo();
+            Q_INVOKABLE FileInfo(const QString &file);
+            Q_INVOKABLE FileInfo(const QFile &file);
+            Q_INVOKABLE FileInfo(const QDir &dir, const QString &file);
+            Q_INVOKABLE FileInfo(const QFileInfo &fileinfo);
+            Q_INVOKABLE FileInfo(const FileInfo &fileInfo);
+            Q_INVOKABLE FileInfo(QFileInfoPrivate *d);
+            Q_INVOKABLE static bool exists(const QString &file);
+            FileInfo &operator=(const FileInfo &other);
+        public slots:
+            QDir absoluteDir() const;
+            QString absoluteFilePath() const;
+            QString absolutePath() const;
+            QString baseName() const;
+            QString bundleName() const;
+            bool caching() const;
+            QString canonicalFilePath() const;
+            QString canonicalPath() const;
+            QString completeBaseName() const;
+            QString completeSuffix() const;
+            QDateTime created() const;
+            QDir dir() const;
+            bool exists() const;
+            QString fileName() const;
+            QString filePath() const;
+            QString group() const;
+            uint groupId() const;
+            bool isAbsolute() const;
+            bool isBundle() const;
+            bool isDir() const;
+            bool isExecutable() const;
+            bool isFile() const;
+            bool isHidden() const;
+            bool isNativePath() const;
+            bool isReadable() const;
+            bool isRelative() const;
+            bool isRoot() const;
+            bool isSymLink() const;
+            bool isWritable() const;
+            QDateTime lastModified() const;
+            QDateTime lastRead() const;
+            bool makeAbsolute();
+            QString owner() const;
+            uint ownerId() const;
+            QString path() const;
+            bool permission(QFile::Permissions permissions) const;
+            QFile::Permissions permissions() const;
+            QString readLink() const;
+            void refresh();
+            void setCaching(bool on);
+            void setFile(const QDir &dir, const QString &file);
+            void setFile(const QFile &file);
+            void setFile(const QString &file);
+            qint64 size() const;
+            QString suffix() const;
+            void swap(QFileInfo &other);
+            QString symLinkTarget() const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::FileInfo)
+#endif //COREFILEINFO_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreIODevice.cpp b/src/scripting/scriptengine/qtbindings/CoreIODevice.cpp
new file mode 100644
index 0000000000..e30708f229
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreIODevice.cpp
@@ -0,0 +1,70 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreIODevice.h"
+
+using namespace QtBindings::Core;
+
+IODevice::IODevice()
+{
+}
+
+IODevice::IODevice(const IODevice &other) : QObject()
+{
+    Q_UNUSED(other)
+}
+
+IODevice::~IODevice()
+{
+}
+
+IODevice &IODevice::operator=(const IODevice &other)
+{
+    Q_UNUSED(other)
+    return *this;
+}
+
+void IODevice::installJSType( QJSEngine *engine )
+{
+
+    Base<IODevice>::installJSType( engine );
+    engine->globalObject().property("QIODevice").setProperty(
+            "OpenMode", engine->newQMetaObject<OpenMode>() );
+    qRegisterMetaType<OpenMode>("QIODevice::OpenMode");
+    qRegisterMetaType<QtBindings::Core::IODevice::OpenModeFlag>();
+}
+
+OpenMode::OpenMode() : QIODevice::OpenMode()
+{
+}
+
+OpenMode::OpenMode(const OpenMode& other) : QObject(), QIODevice::OpenMode( other )
+{
+}
+
+OpenMode::OpenMode(QIODevice::OpenMode flags) : QIODevice::OpenMode( flags )
+{
+}
+
+OpenMode::~OpenMode()
+{
+}
+
+OpenMode::operator Int() {
+    return QIODevice::OpenMode::operator Int();
+}
\ No newline at end of file
diff --git a/src/scripting/scriptengine/qtbindings/CoreIODevice.h b/src/scripting/scriptengine/qtbindings/CoreIODevice.h
new file mode 100644
index 0000000000..3bb7773ac3
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreIODevice.h
@@ -0,0 +1,72 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COREIODEVICE_H
+#define COREIODEVICE_H
+
+#include "QtBinding.h"
+
+#include <QIODevice>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class IODevice : public QObject, public QtBindings::Base<IODevice>
+        {
+        Q_OBJECT
+        public:
+            enum OpenModeFlag {
+                NotOpen = QIODevice::NotOpen,
+                ReadOnly = QIODevice::ReadOnly,
+                WriteOnly = QIODevice::WriteOnly,
+                ReadWrite = QIODevice::ReadOnly | WriteOnly,
+                Append = QIODevice::Append,
+                Truncate = QIODevice::Truncate,
+                Text = QIODevice::Text,
+                Unbuffered = QIODevice::Unbuffered,
+                // The following are not presetn at QT5.8 - Add as value for backward compatibility
+                NewOnly = 0x0040,
+                ExistingOnly = 0x0080
+            };
+            Q_FLAG(OpenModeFlag);
+            IODevice();
+            IODevice(const IODevice &other);
+            ~IODevice();
+            IODevice &operator=(const IODevice &other);
+            static void installJSType( QJSEngine *engine );
+        };
+
+        /* MOC does not support nested classes - Had to hack it out */
+        class OpenMode : public QObject, public QIODevice::OpenMode
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE OpenMode();
+            Q_INVOKABLE OpenMode(const OpenMode& other);
+            Q_INVOKABLE OpenMode(QIODevice::OpenMode flags);
+            Q_INVOKABLE ~OpenMode();
+            Q_INVOKABLE operator Int();
+            OpenMode &operator=(const OpenMode& other);
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::IODevice)
+Q_DECLARE_METATYPE(QtBindings::Core::OpenMode)
+
+#endif //COREIODEVICE_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreLocale.cpp b/src/scripting/scriptengine/qtbindings/CoreLocale.cpp
new file mode 100644
index 0000000000..a8261883f4
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreLocale.cpp
@@ -0,0 +1,515 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreLocale.h"
+
+#include <QDate>
+#include <QDateTime>
+#include <QJSEngine>
+#include <QTime>
+#include <QMetaMethod>
+
+using namespace QtBindings::Core;
+
+Locale::Locale()
+{
+}
+
+Locale::Locale(const QString &name) : QLocale(name)
+{
+}
+
+Locale::Locale(QLocale::Language language, QLocale::Country country) : QLocale(language, country)
+{
+}
+
+Locale::Locale(QLocale::Language language, QLocale::Script script,
+                                 QLocale::Country country) : QLocale(language, script, country)
+{
+}
+
+Locale::Locale(const QLocale &other) : QLocale(other)
+{
+}
+
+Locale::Locale(const Locale &other) : QObject(), QLocale(other)
+{
+}
+
+QString Locale::amText() const
+{
+    return QLocale::amText();
+}
+
+QString Locale::bcp47Name() const
+{
+    return QLocale::bcp47Name();
+}
+
+QLocale::Country Locale::country() const
+{
+    return QLocale::country();
+}
+
+QString Locale::createSeparatedList(const QStringList &strl) const
+{
+    return QLocale::createSeparatedList(strl);
+}
+
+QString Locale::currencySymbol(QLocale::CurrencySymbolFormat format) const
+{
+    return QLocale::currencySymbol(format);
+}
+
+QString Locale::dateFormat(QLocale::FormatType format) const
+{
+    return QLocale::dateFormat(format);
+}
+
+QString Locale::dateTimeFormat(QLocale::FormatType format) const
+{
+    return QLocale::dateTimeFormat(format);
+}
+
+QString Locale::dayName(int day, QLocale::FormatType format) const
+{
+    return QLocale::dayName(day, format);
+}
+
+QChar Locale::decimalPoint() const
+{
+    return QLocale::decimalPoint();
+}
+
+QChar Locale::exponential() const
+{
+    return QLocale::exponential();
+}
+
+Qt::DayOfWeek Locale::firstDayOfWeek() const
+{
+    return QLocale::firstDayOfWeek();
+}
+
+QChar Locale::groupSeparator() const
+{
+    return QLocale::groupSeparator();
+}
+
+QLocale::Language Locale::language() const
+{
+    return QLocale::language();
+}
+
+QLocale::MeasurementSystem Locale::measurementSystem() const
+{
+    return QLocale::measurementSystem();
+}
+
+QString Locale::monthName(int month, QLocale::FormatType format) const
+{
+    return QLocale::monthName(month, format);
+}
+
+QString Locale::name() const
+{
+    return QLocale::name();
+}
+
+QString Locale::nativeCountryName() const
+{
+    return QLocale::nativeCountryName();
+}
+
+QString Locale::nativeLanguageName() const
+{
+    return QLocale::nativeLanguageName();
+}
+
+QChar Locale::negativeSign() const
+{
+    return QLocale::negativeSign();
+}
+
+QLocale::NumberOptions Locale::numberOptions() const
+{
+    return QLocale::numberOptions();
+}
+
+QChar Locale::percent() const
+{
+    return QLocale::percent();
+}
+
+QString Locale::pmText() const
+{
+    return QLocale::pmText();
+}
+
+QChar Locale::positiveSign() const
+{
+    return QLocale::positiveSign();
+}
+
+QString Locale::quoteString(const QStringRef &str, QLocale::QuotationStyle style) const
+{
+    return QLocale::quoteString(str, style);
+}
+
+QString Locale::quoteString(const QString &str, QLocale::QuotationStyle style) const
+{
+    return QLocale::quoteString(str, style);
+}
+
+QLocale::Script Locale::script() const
+{
+    return QLocale::script();
+}
+
+void Locale::setNumberOptions(QLocale::NumberOptions options)
+{
+    QLocale::setNumberOptions(options);
+}
+
+QString Locale::standaloneDayName(int day, QLocale::FormatType format) const
+{
+    return QLocale::standaloneDayName(day, format);
+}
+
+QString Locale::standaloneMonthName(int month, QLocale::FormatType format) const
+{
+    return QLocale::standaloneMonthName(month, format);
+}
+
+void Locale::swap(QLocale &other)
+{
+    QLocale::swap(other);
+}
+
+Qt::LayoutDirection Locale::textDirection() const
+{
+    return QLocale::textDirection();
+}
+
+QString Locale::timeFormat(QLocale::FormatType format) const
+{
+    return QLocale::timeFormat(format);
+}
+
+QString Locale::toCurrencyString(double value, const QString &symbol, int precision) const
+{
+    return QLocale::toCurrencyString(value, symbol, precision);
+}
+
+QString Locale::toCurrencyString(double value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QString Locale::toCurrencyString(float i, const QString &symbol, int precision) const
+{
+    return QLocale::toCurrencyString(i, symbol, precision);
+}
+
+QString Locale::toCurrencyString(float i, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(i, symbol);
+}
+
+QString Locale::toCurrencyString(int value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QString Locale::toCurrencyString(qlonglong value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QString Locale::toCurrencyString(qulonglong value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QString Locale::toCurrencyString(short value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QString Locale::toCurrencyString(uint value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QString Locale::toCurrencyString(ushort value, const QString &symbol) const
+{
+    return QLocale::toCurrencyString(value, symbol);
+}
+
+QDate Locale::toDate(const QString &string, const QString &format) const
+{
+    return QLocale::toDate(string, format);
+}
+
+QDate Locale::toDate(const QString &string, QLocale::FormatType format) const
+{
+    return QLocale::toDate(string, format);
+}
+
+QDateTime Locale::toDateTime(const QString &string, const QString &format) const
+{
+    return QLocale::toDateTime(string, format);
+}
+
+QDateTime Locale::toDateTime(const QString &string, QLocale::FormatType format) const
+{
+    return QLocale::toDateTime(string, format);
+}
+
+double Locale::toDouble(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toDouble(s, ok);
+}
+
+double Locale::toDouble(const QString &s, bool *ok) const
+{
+    return QLocale::toDouble(s, ok);
+}
+
+float Locale::toFloat(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toFloat(s, ok);
+}
+
+float Locale::toFloat(const QString &s, bool *ok) const
+{
+    return QLocale::toFloat(s, ok);
+}
+
+int Locale::toInt(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toInt(s, ok);
+}
+
+int Locale::toInt(const QString &s, bool *ok) const
+{
+    return QLocale::toInt(s, ok);
+}
+
+qlonglong Locale::toLongLong(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toLongLong(s, ok);
+}
+
+qlonglong Locale::toLongLong(const QString &s, bool *ok) const
+{
+    return QLocale::toLongLong(s, ok);
+}
+
+QString Locale::toLower(const QString &str) const
+{
+    return QLocale::toLower(str);
+}
+
+short Locale::toShort(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toShort(s, ok);
+}
+
+short Locale::toShort(const QString &s, bool *ok) const
+{
+    return QLocale::toShort(s, ok);
+}
+
+QString Locale::toString(const QDate &date, const QString &formatStr) const
+{
+    return QLocale::toString(date, formatStr);
+}
+
+QString Locale::toString(const QDate &date, QLocale::FormatType format) const
+{
+    return QLocale::toString(date, format);
+}
+
+QString Locale::toString(const QDateTime &dateTime, const QString &format) const
+{
+    return QLocale::toString(dateTime, format);
+}
+
+QString Locale::toString(const QDateTime &dateTime, QLocale::FormatType format) const
+{
+    return QLocale::toString(dateTime, format);
+}
+
+QString Locale::toString(const QTime &time, const QString &formatStr) const
+{
+    return QLocale::toString(time, formatStr);
+}
+
+QString Locale::toString(const QTime &time, QLocale::FormatType format) const
+{
+    return QLocale::toString(time, format);
+}
+
+QString Locale::toString(double i, char f, int prec) const
+{
+    return QLocale::toString(i, f, prec);
+}
+
+QString Locale::toString(float i, char f, int prec) const
+{
+    return QLocale::toString(i, f, prec);
+}
+
+QString Locale::toString(int i) const
+{
+    return QLocale::toString(i);
+}
+
+QString Locale::toString(qlonglong i) const
+{
+    return QLocale::toString(i);
+}
+
+QString Locale::toString(qulonglong i) const
+{
+    return QLocale::toString(i);
+}
+
+QString Locale::toString(short i) const
+{
+    return QLocale::toString(i);
+}
+
+QString Locale::toString(uint i) const
+{
+    return QLocale::toString(i);
+}
+
+QString Locale::toString(ushort i) const
+{
+    return QLocale::toString(i);
+}
+
+QTime Locale::toTime(const QString &string, const QString &format) const
+{
+    return QLocale::toTime(string, format);
+}
+
+QTime Locale::toTime(const QString &string, QLocale::FormatType format) const
+{
+    return QLocale::toTime(string, format);
+}
+
+uint Locale::toUInt(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toUInt(s, ok);
+}
+
+uint Locale::toUInt(const QString &s, bool *ok) const
+{
+    return QLocale::toUInt(s, ok);
+}
+
+qulonglong Locale::toULongLong(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toULongLong(s, ok);
+}
+
+qulonglong Locale::toULongLong(const QString &s, bool *ok) const
+{
+    return QLocale::toULongLong(s, ok);
+}
+
+QString Locale::toUpper(const QString &str) const
+{
+    return QLocale::toUpper(str);
+}
+
+ushort Locale::toUShort(const QStringRef &s, bool *ok) const
+{
+    return QLocale::toUShort(s, ok);
+}
+
+ushort Locale::toUShort(const QString &s, bool *ok) const
+{
+    return QLocale::toUShort(s, ok);
+}
+
+QStringList Locale::uiLanguages() const
+{
+    return QLocale::uiLanguages();
+}
+
+QList<Qt::DayOfWeek> Locale::weekdays() const
+{
+    return QLocale::weekdays();
+}
+
+QChar Locale::zeroDigit() const
+{
+    return QLocale::zeroDigit();
+}
+
+QList<QLocale::Country> Locale::countriesForLanguage(QLocale::Language lang)
+{
+    return QLocale::countriesForLanguage(lang);
+}
+
+QList<QLocale>
+Locale::matchingLocales(QLocale::Language language, QLocale::Script script, QLocale::Country country)
+{
+    return QLocale::matchingLocales(language,script,country);
+}
+
+QLocale Locale::c()
+{
+    return QLocale::c();
+}
+
+Locale Locale::system()
+{
+    return Locale(QLocale::system());
+}
+
+QString Locale::countryToString(QLocale::Country country)
+{
+    return QLocale::countryToString(country);
+}
+
+QString Locale::languageToString(QLocale::Language language)
+{
+    return QLocale::languageToString(language);
+}
+
+QString Locale::scriptToString(QLocale::Script script)
+{
+    return QLocale::scriptToString(script);
+}
+
+void Locale::setDefault(const QLocale &locale)
+{
+    QLocale::setDefault(locale);
+}
+
+Locale &Locale::operator=(const Locale &other)
+{
+    if (this != &other)
+        QLocale::operator=(other);
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreLocale.h b/src/scripting/scriptengine/qtbindings/CoreLocale.h
new file mode 100644
index 0000000000..eaca86c74c
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreLocale.h
@@ -0,0 +1,140 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORELOCALE_H
+#define CORELOCALE_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QLocale>
+
+class QJSEngine;
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class Locale : public QObject, public QLocale, public QtBindings::Base<Locale>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE Locale();
+            Q_INVOKABLE Locale(const QString &name);
+            Q_INVOKABLE Locale(Language language, Country country = AnyCountry);
+            Q_INVOKABLE Locale(Language language, Script script, Country country);
+            Q_INVOKABLE Locale(const QLocale &other);
+            Q_INVOKABLE Locale(const Locale &other);
+            Q_INVOKABLE static QLocale c();
+            Q_INVOKABLE static QString countryToString(Country country);
+            Q_INVOKABLE static QString languageToString(Language language);
+            Q_INVOKABLE static QString scriptToString(Script script);
+            Q_INVOKABLE static void setDefault(const QLocale &locale);
+            Q_INVOKABLE static Locale system();
+            Locale &operator=(const Locale& other);
+        public slots:
+            QString amText() const;
+            QString bcp47Name() const;
+            Country country() const;
+            QString createSeparatedList(const QStringList &strl) const;
+            QString currencySymbol(CurrencySymbolFormat format = CurrencySymbol) const;
+            QString dateFormat(FormatType format = LongFormat) const;
+            QString dateTimeFormat(FormatType format = LongFormat) const;
+            QString dayName(int day, FormatType format = LongFormat) const;
+            QChar decimalPoint() const;
+            QChar exponential() const;
+            Qt::DayOfWeek firstDayOfWeek() const;
+            QChar groupSeparator() const;
+            Language language() const;
+            MeasurementSystem measurementSystem() const;
+            QString monthName(int month, FormatType format = LongFormat) const;
+            QString name() const;
+            QString nativeCountryName() const;
+            QString nativeLanguageName() const;
+            QChar negativeSign() const;
+            NumberOptions numberOptions() const;
+            QChar percent() const;
+            QString pmText() const;
+            QChar positiveSign() const;
+            QString quoteString(const QStringRef &str, QuotationStyle style = StandardQuotation) const;
+            QString quoteString(const QString &str, QuotationStyle style = StandardQuotation) const;
+            Script script() const;
+            void setNumberOptions(NumberOptions options);
+            QString standaloneDayName(int day, FormatType format = LongFormat) const;
+            QString standaloneMonthName(int month, FormatType format = LongFormat) const;
+            void swap(QLocale &other);
+            Qt::LayoutDirection textDirection() const;
+            QString timeFormat(FormatType format = LongFormat) const;
+            QString toCurrencyString(double value, const QString &symbol, int precision) const;
+            QString toCurrencyString(double value, const QString &symbol = QString()) const;
+            QString toCurrencyString(float i, const QString &symbol, int precision) const;
+            QString toCurrencyString(float i, const QString &symbol = QString()) const;
+            QString toCurrencyString(int value, const QString &symbol = QString()) const;
+            QString toCurrencyString(qlonglong value, const QString &symbol = QString()) const;
+            QString toCurrencyString(qulonglong value, const QString &symbol = QString()) const;
+            QString toCurrencyString(short value, const QString &symbol = QString()) const;
+            QString toCurrencyString(uint value, const QString &symbol = QString()) const;
+            QString toCurrencyString(ushort value, const QString &symbol = QString()) const;
+            QDate toDate(const QString &string, const QString &format) const;
+            QDate toDate(const QString &string, FormatType format = LongFormat) const;
+            QDateTime toDateTime(const QString &string, const QString &format) const;
+            QDateTime toDateTime(const QString &string, FormatType format = LongFormat) const;
+            double toDouble(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            double toDouble(const QString &s, bool *ok = Q_NULLPTR) const;
+            float toFloat(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            float toFloat(const QString &s, bool *ok = Q_NULLPTR) const;
+            int toInt(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            int toInt(const QString &s, bool *ok = Q_NULLPTR) const;
+            qlonglong toLongLong(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            qlonglong toLongLong(const QString &s, bool *ok = Q_NULLPTR) const;
+            QString toLower(const QString &str) const;
+            short toShort(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            short toShort(const QString &s, bool *ok = Q_NULLPTR) const;
+            QString toString(const QDate &date, const QString &formatStr) const;
+            QString toString(const QDate &date, FormatType format = LongFormat) const;
+            QString toString(const QDateTime &dateTime, const QString &format) const;
+            QString toString(const QDateTime &dateTime, FormatType format = LongFormat) const;
+            QString toString(const QTime &time, const QString &formatStr) const;
+            QString toString(const QTime &time, FormatType format = LongFormat) const;
+            QString toString(double i, char f = 'g', int prec = 6) const;
+            QString toString(float i, char f = 'g', int prec = 6) const;
+            QString toString(int i) const;
+            QString toString(qlonglong i) const;
+            QString toString(qulonglong i) const;
+            QString toString(short i) const;
+            QString toString(uint i) const;
+            QString toString(ushort i) const;
+            QTime toTime(const QString &string, const QString &format) const;
+            QTime toTime(const QString &string, FormatType format = LongFormat) const;
+            uint toUInt(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            uint toUInt(const QString &s, bool *ok = Q_NULLPTR) const;
+            qulonglong toULongLong(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            qulonglong toULongLong(const QString &s, bool *ok = Q_NULLPTR) const;
+            QString toUpper(const QString &str) const;
+            ushort toUShort(const QStringRef &s, bool *ok = Q_NULLPTR) const;
+            ushort toUShort(const QString &s, bool *ok = Q_NULLPTR) const;
+            QStringList uiLanguages() const;
+            QList<Qt::DayOfWeek> weekdays() const;
+            QChar zeroDigit() const;
+            QList<Country> countriesForLanguage(Language lang);
+            QList<QLocale> matchingLocales(QLocale::Language language, QLocale::Script script, QLocale::Country country);
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::Locale)
+#endif //CORELOCALE_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreResource.cpp b/src/scripting/scriptengine/qtbindings/CoreResource.cpp
new file mode 100644
index 0000000000..331e10190a
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreResource.cpp
@@ -0,0 +1,122 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreResource.h"
+
+#include <QDateTime>
+
+using namespace QtBindings::Core;
+
+
+Resource::Resource(const QString &file, const QLocale &locale) : QResource(file, locale)
+{
+}
+
+Resource::Resource(const Resource &resource) : Resource(resource.fileName(), resource.locale())
+{
+}
+
+QString Resource::absoluteFilePath() const
+{
+    return QResource::absoluteFilePath();
+}
+
+const uchar *Resource::data() const
+{
+    return QResource::data();
+}
+
+QString Resource::fileName() const
+{
+    return QResource::fileName();
+}
+
+bool Resource::isCompressed() const
+{
+    return QResource::isCompressed();
+}
+
+bool Resource::isValid() const
+{
+    return QResource::isValid();
+}
+
+QDateTime Resource::lastModified() const
+{
+    return QResource::lastModified();
+}
+
+QLocale Resource::locale() const
+{
+    return QResource::locale();
+}
+
+void Resource::setFileName(const QString &file)
+{
+    QResource::setFileName(file);
+}
+
+void Resource::setLocale(const QLocale &locale)
+{
+    QResource::setLocale(locale);
+}
+
+qint64 Resource::size() const
+{
+    return QResource::size();
+}
+
+void Resource::addSearchPath(const QString &path)
+{
+    QResource::addSearchPath(path);
+}
+
+bool Resource::registerResource(const QString &rccFilename, const QString &resourceRoot)
+{
+    return QResource::registerResource(rccFilename,resourceRoot);
+}
+
+bool Resource::registerResource(const uchar *rccData, const QString &resourceRoot)
+{
+    return QResource::registerResource(rccData,resourceRoot);
+}
+
+QStringList Resource::searchPaths()
+{
+    return QResource::searchPaths();
+}
+
+bool Resource::unregisterResource(const QString &rccFilename, const QString &resourceRoot)
+{
+    return QResource::unregisterResource(rccFilename,resourceRoot);
+}
+
+bool Resource::unregisterResource(const uchar *rccData, const QString &resourceRoot)
+{
+    return QResource::unregisterResource(rccData,resourceRoot);
+}
+
+Resource &Resource::operator=(const Resource &other)
+{
+    if (this != &other) {
+        this->setFileName( other.fileName() );
+        this->setLocale( other.locale() );
+    }
+
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreResource.h b/src/scripting/scriptengine/qtbindings/CoreResource.h
new file mode 100644
index 0000000000..f27a42067c
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreResource.h
@@ -0,0 +1,59 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORERESOURCE_H
+#define CORERESOURCE_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QResource>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class Resource : public QObject, public QResource, public QtBindings::Base<Resource>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE Resource(const QString &file=QString(), const QLocale &locale=QLocale());
+            Q_INVOKABLE Resource(const Resource& resource);
+            Q_INVOKABLE static void addSearchPath(const QString &path);
+            Q_INVOKABLE static bool registerResource(const QString &rccFilename, const QString &resourceRoot=QString());
+            Q_INVOKABLE static bool registerResource(const uchar *rccData, const QString &resourceRoot=QString());
+            Q_INVOKABLE static QStringList searchPaths();
+            Q_INVOKABLE static bool unregisterResource(const QString &rccFilename, const QString &resourceRoot=QString());
+            Q_INVOKABLE static bool unregisterResource(const uchar *rccData, const QString &resourceRoot=QString());
+            Resource &operator=(const Resource &other);
+        public slots:
+            QString absoluteFilePath() const;
+            const uchar *data() const;
+            QString fileName() const;
+            bool isCompressed() const;
+            bool isValid() const;
+            QDateTime lastModified() const;
+            QLocale locale() const;
+            void setFileName(const QString &file);
+            void setLocale(const QLocale &locale);
+            qint64 size() const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::Resource)
+#endif //CORERESOURCE_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreTextCodec.cpp b/src/scripting/scriptengine/qtbindings/CoreTextCodec.cpp
new file mode 100644
index 0000000000..27eb17e206
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreTextCodec.cpp
@@ -0,0 +1,171 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreTextCodec.h"
+
+#include <QJSEngine>
+
+using namespace QtBindings::Core;
+
+TextCodec::TextCodec() : TextCodec( nullptr )
+{
+}
+
+TextCodec::TextCodec(const QTextCodec *codec)
+{
+    if ( codec != nullptr ) {
+        internal = codec;
+    } else {
+        internal = QTextCodec::codecForLocale();
+    }
+}
+
+TextCodec::TextCodec(const TextCodec &codec) : TextCodec( dynamic_cast<const QTextCodec*>(&codec) )
+{
+}
+
+TextCodec::~TextCodec()
+{
+}
+
+QList<QByteArray> TextCodec::aliases() const
+{
+    return internal->aliases();
+}
+
+bool TextCodec::canEncode(QChar ch) const
+{
+    return internal->canEncode(ch);
+}
+
+bool TextCodec::canEncode(const QString &s) const
+{
+    return internal->canEncode(s);
+}
+
+ByteArray TextCodec::fromUnicode(const QString &str) const
+{
+    return ByteArray( internal->fromUnicode(str) );
+}
+
+ByteArray
+TextCodec::fromUnicode(const QChar *input, int number, QTextCodec::ConverterState *state) const
+{
+    return ByteArray( internal->fromUnicode(input, number, state) );
+}
+
+/*
+QTextDecoder *TextCodec::makeDecoder(QTextCodec::ConversionFlags flags) const
+{
+    return internal->makeDecoder(flags);
+}
+
+QTextEncoder *TextCodec::makeEncoder(QTextCodec::ConversionFlags flags) const
+{
+    return internal->makeEncoder(flags);
+}
+*/
+
+int TextCodec::mibEnum()
+{
+    return internal->mibEnum();
+}
+
+ByteArray TextCodec::name()
+{
+    return ByteArray( internal->name() );
+}
+
+QString TextCodec::toUnicode(const ByteArray &a) const
+{
+    return internal->toUnicode(a);
+}
+
+QString TextCodec::toUnicode(const char *chars) const
+{
+    return internal->toUnicode(chars);
+}
+
+QString
+TextCodec::toUnicode(const char *input, int size, QTextCodec::ConverterState *state) const
+{
+    return internal->toUnicode(input, size, state);
+}
+
+QList<QByteArray> TextCodec::availableCodecs()
+{
+    return QTextCodec::availableCodecs();
+}
+
+QList<int> TextCodec::availableMibs()
+{
+    return QTextCodec::availableMibs();
+}
+
+TextCodec TextCodec::codecForHtml(const ByteArray &ba, QTextCodec *defaultCodec)
+{
+     return TextCodec( QTextCodec::codecForHtml(ba,defaultCodec) );
+}
+
+TextCodec TextCodec::codecForHtml(const ByteArray &ba)
+{
+    return QTextCodec::codecForHtml(ba);
+}
+
+TextCodec TextCodec::codecForLocale()
+{
+    return QTextCodec::codecForLocale();
+}
+
+TextCodec TextCodec::codecForMib(int mib)
+{
+    return QTextCodec::codecForMib(mib);
+}
+
+TextCodec TextCodec::codecForName(const ByteArray &name)
+{
+    return QTextCodec::codecForName(name);
+}
+
+TextCodec TextCodec::codecForName(const char *name)
+{
+    return QTextCodec::codecForName(name);
+}
+
+TextCodec TextCodec::codecForUtfText(const ByteArray &ba, QTextCodec *defaultCodec)
+{
+    return QTextCodec::codecForUtfText(ba,defaultCodec);
+}
+
+TextCodec TextCodec::codecForUtfText(const ByteArray &ba)
+{
+    return QTextCodec::codecForUtfText(ba);
+}
+
+void TextCodec::setCodecForLocale(QTextCodec *c)
+{
+    QTextCodec::setCodecForLocale(c);
+}
+
+TextCodec &TextCodec::operator=(const TextCodec &other)
+{
+    if (this != &other) {
+        internal = other.internal;
+    }
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreTextCodec.h b/src/scripting/scriptengine/qtbindings/CoreTextCodec.h
new file mode 100644
index 0000000000..e7108f3d43
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreTextCodec.h
@@ -0,0 +1,75 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORETEXTCODEC_H
+#define CORETEXTCODEC_H
+
+#include "QtBinding.h"
+#include "CoreByteArray.h"
+
+#include <QObject>
+#include <QTextCodec>
+
+class QJSEngine;
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class TextCodec : public QObject, public QtBindings::Base<TextCodec>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE TextCodec();
+            Q_INVOKABLE TextCodec(const QTextCodec* coded);
+            Q_INVOKABLE TextCodec(const TextCodec& codec);
+            Q_INVOKABLE ~TextCodec();
+            Q_INVOKABLE static QList<QByteArray> availableCodecs();
+            Q_INVOKABLE static QList<int> availableMibs();
+            Q_INVOKABLE static TextCodec codecForHtml(const ByteArray &ba, QTextCodec *defaultCodec);
+            Q_INVOKABLE static TextCodec codecForHtml(const ByteArray &ba);
+            Q_INVOKABLE static TextCodec codecForLocale();
+            Q_INVOKABLE static TextCodec codecForMib(int mib);
+            Q_INVOKABLE static TextCodec codecForName(const ByteArray &name);
+            Q_INVOKABLE static TextCodec codecForName(const char *name);
+            Q_INVOKABLE static TextCodec codecForUtfText(const ByteArray &ba, QTextCodec *defaultCodec);
+            Q_INVOKABLE static TextCodec codecForUtfText(const ByteArray &ba);
+            Q_INVOKABLE static void setCodecForLocale(QTextCodec *c);
+            TextCodec &operator=(const TextCodec &other);
+        public slots:
+            virtual QList<QByteArray> aliases() const;
+            bool canEncode(QChar ch) const;
+            bool canEncode(const QString &s) const;
+            ByteArray fromUnicode(const QString &str) const;
+            ByteArray fromUnicode(const QChar *input, int number, QTextCodec::ConverterState *state = Q_NULLPTR) const;
+            /*
+            QTextDecoder *makeDecoder(ConversionFlags flags = DefaultConversion) const;
+            QTextEncoder *makeEncoder(ConversionFlags flags = DefaultConversion) const;
+             */
+            virtual int	mibEnum();
+            virtual ByteArray name();
+            QString toUnicode(const ByteArray &a) const;
+            QString toUnicode(const char *chars) const;
+            QString toUnicode(const char *input, int size, QTextCodec::ConverterState *state = Q_NULLPTR) const;
+        private:
+            const QTextCodec *internal;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::TextCodec)
+#endif //CORETEXTCODEC_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreTextStream.cpp b/src/scripting/scriptengine/qtbindings/CoreTextStream.cpp
new file mode 100644
index 0000000000..2d4272dcfe
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreTextStream.cpp
@@ -0,0 +1,270 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreTextStream.h"
+
+using namespace QtBindings::Core;
+
+TextStream::TextStream()
+{
+}
+
+TextStream::TextStream(const TextStream &textStream) : QObject(), QTextStream(textStream.device())
+{
+}
+
+TextStream::TextStream(QIODevice *device) : QTextStream(device)
+{
+}
+
+TextStream::TextStream(FILE *fileHandle, QIODevice::OpenMode openMode) : QTextStream(fileHandle, openMode)
+{
+}
+
+TextStream::TextStream(QString *string, QIODevice::OpenMode openMode) : QTextStream(string, openMode)
+{
+}
+
+TextStream::TextStream(QByteArray *array, QIODevice::OpenMode openMode) : QTextStream(array, openMode)
+{
+}
+
+TextStream::TextStream(const QByteArray &array, QIODevice::OpenMode openMode) : QTextStream(array, openMode)
+{
+}
+
+bool TextStream::atEnd() const
+{
+    return QTextStream::atEnd();
+}
+
+bool TextStream::autoDetectUnicode() const
+{
+    return QTextStream::autoDetectUnicode();
+}
+
+QTextCodec *TextStream::codec() const
+{
+    return QTextStream::codec();
+}
+
+QIODevice *TextStream::device() const
+{
+    return QTextStream::device();
+}
+
+QTextStream::FieldAlignment TextStream::fieldAlignment() const
+{
+    return QTextStream::fieldAlignment();
+}
+
+int TextStream::fieldWidth() const
+{
+    return QTextStream::fieldWidth();
+}
+
+void TextStream::flush()
+{
+    QTextStream::flush();
+}
+
+bool TextStream::generateByteOrderMark() const
+{
+    return QTextStream::generateByteOrderMark();
+}
+
+int TextStream::integerBase() const
+{
+    return QTextStream::integerBase();
+}
+
+QLocale TextStream::locale() const
+{
+    return QTextStream::locale();
+}
+
+QTextStream::NumberFlags TextStream::numberFlags() const
+{
+    return QTextStream::numberFlags();
+}
+
+QChar TextStream::padChar() const
+{
+    return QTextStream::padChar();
+}
+
+qint64 TextStream::pos() const
+{
+    return QTextStream::pos();
+}
+
+QString TextStream::readAll()
+{
+    return QTextStream::readAll();
+}
+
+bool TextStream::readLineInto(QString *line, qint64 maxlen)
+{
+    return QTextStream::readLineInto(line, maxlen);
+}
+
+QString TextStream::readLine(qint64 maxlen)
+{
+    return QTextStream::readLine(maxlen);
+}
+
+QString TextStream::read(qint64 maxlen)
+{
+    return QTextStream::read(maxlen);
+}
+
+QTextStream::RealNumberNotation TextStream::realNumberNotation() const
+{
+    return QTextStream::realNumberNotation();
+}
+
+int TextStream::realNumberPrecision() const
+{
+    return QTextStream::realNumberPrecision();
+}
+
+void TextStream::reset()
+{
+    QTextStream::reset();
+}
+
+void TextStream::resetStatus()
+{
+    QTextStream::resetStatus();
+}
+
+bool TextStream::seek(qint64 pos)
+{
+    return QTextStream::seek(pos);
+}
+
+void TextStream::setAutoDetectUnicode(bool enabled)
+{
+    QTextStream::setAutoDetectUnicode(enabled);
+}
+
+void TextStream::setCodec(const char *codecName)
+{
+    QTextStream::setCodec(codecName);
+}
+
+void TextStream::setCodec(QTextCodec *codec)
+{
+    QTextStream::setCodec(codec);
+}
+
+void TextStream::setDevice(QIODevice *device)
+{
+    QTextStream::setDevice(device);
+}
+
+void TextStream::setFieldAlignment(QTextStream::FieldAlignment alignment)
+{
+    QTextStream::setFieldAlignment(alignment);
+}
+
+void TextStream::setFieldWidth(int width)
+{
+    QTextStream::setFieldWidth(width);
+}
+
+void TextStream::setGenerateByteOrderMark(bool generate)
+{
+    QTextStream::setGenerateByteOrderMark(generate);
+}
+
+void TextStream::setIntegerBase(int base)
+{
+    QTextStream::setIntegerBase(base);
+}
+
+void TextStream::setLocale(const QLocale &locale)
+{
+    QTextStream::setLocale(locale);
+}
+
+void TextStream::setNumberFlags(QTextStream::NumberFlags flags)
+{
+    QTextStream::setNumberFlags(flags);
+}
+
+void TextStream::setPadChar(QChar ch)
+{
+    QTextStream::setPadChar(ch);
+}
+
+void TextStream::setRealNumberNotation(QTextStream::RealNumberNotation notation)
+{
+    QTextStream::setRealNumberNotation(notation);
+}
+
+void TextStream::setRealNumberPrecision(int precision)
+{
+    QTextStream::setRealNumberPrecision(precision);
+}
+
+void TextStream::setStatus(QTextStream::Status status)
+{
+    QTextStream::setStatus(status);
+}
+
+void TextStream::setString(QString *string, QIODevice::OpenMode openMode)
+{
+    QTextStream::setString(string, openMode);
+}
+
+void TextStream::skipWhiteSpace()
+{
+    QTextStream::skipWhiteSpace();
+}
+
+QTextStream::Status TextStream::status() const
+{
+    return QTextStream::status();
+}
+
+QString *TextStream::string() const
+{
+    return QTextStream::string();
+}
+
+TextStream &TextStream::operator=(const TextStream &other)
+{
+    if (this != &other) {
+        this->setAutoDetectUnicode( other.autoDetectUnicode() );
+        this->setCodec( other.codec() );
+        this->setDevice( other.device() );
+        this->setFieldAlignment( other.fieldAlignment() );
+        this->setFieldWidth( other.fieldWidth() );
+        this->setGenerateByteOrderMark( other.generateByteOrderMark() );
+        this->setIntegerBase( other.integerBase() );
+        this->setLocale( other.locale() );
+        this->setNumberFlags( other.numberFlags() );
+        this->setPadChar( other.padChar() );
+        this->setRealNumberNotation( other.realNumberNotation() );
+        this->setRealNumberPrecision( other.realNumberPrecision() );
+        this->setStatus( other.status() );
+        this->setString( other.string() );
+    }
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreTextStream.h b/src/scripting/scriptengine/qtbindings/CoreTextStream.h
new file mode 100644
index 0000000000..3a2afce8ac
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreTextStream.h
@@ -0,0 +1,88 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORETEXTSTREAM_H
+#define CORETEXTSTREAM_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QTextStream>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class TextStream : public QObject, public QTextStream, public QtBindings::Base<TextStream>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE TextStream();
+            Q_INVOKABLE TextStream(const TextStream &textStream);
+            Q_INVOKABLE TextStream(QIODevice *device);
+            Q_INVOKABLE TextStream(FILE *fileHandle, QIODevice::OpenMode openMode = QIODevice::ReadWrite);
+            Q_INVOKABLE TextStream(QString *string, QIODevice::OpenMode openMode = QIODevice::ReadWrite);
+            Q_INVOKABLE TextStream(QByteArray *array, QIODevice::OpenMode openMode = QIODevice::ReadWrite);
+            Q_INVOKABLE TextStream(const QByteArray &array, QIODevice::OpenMode openMode = QIODevice::ReadOnly);
+            TextStream &operator=(const TextStream &other);
+        public slots:
+            bool atEnd() const;
+            bool autoDetectUnicode() const;
+            QTextCodec *codec() const;
+            QIODevice *device() const;
+            FieldAlignment fieldAlignment() const;
+            int fieldWidth() const;
+            void flush();
+            bool generateByteOrderMark() const;
+            int integerBase() const;
+            QLocale locale() const;
+            NumberFlags numberFlags() const;
+            QChar padChar() const;
+            qint64 pos() const;
+            QString readAll();
+            bool readLineInto(QString *line, qint64 maxlen = 0);
+            QString readLine(qint64 maxlen = 0);
+            QString read(qint64 maxlen);
+            RealNumberNotation realNumberNotation() const;
+            int realNumberPrecision() const;
+            void reset();
+            void resetStatus();
+            bool seek(qint64 pos);
+            void setAutoDetectUnicode(bool enabled);
+            void setCodec(const char *codecName);
+            void setCodec(QTextCodec *codec);
+            void setDevice(QIODevice *device);
+            void setFieldAlignment(FieldAlignment alignment);
+            void setFieldWidth(int width);
+            void setGenerateByteOrderMark(bool generate);
+            void setIntegerBase(int base);
+            void setLocale(const QLocale &locale);
+            void setNumberFlags(NumberFlags flags);
+            void setPadChar(QChar ch);
+            void setRealNumberNotation(RealNumberNotation notation);
+            void setRealNumberPrecision(int precision);
+            void setStatus(Status status);
+            void setString(QString *string, QIODevice::OpenMode openMode = QIODevice::ReadWrite);
+            void skipWhiteSpace();
+            Status status() const;
+            QString *string() const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::TextStream)
+#endif //CORETEXTSTREAM_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreTranslator.cpp b/src/scripting/scriptengine/qtbindings/CoreTranslator.cpp
new file mode 100644
index 0000000000..a4eb759f91
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreTranslator.cpp
@@ -0,0 +1,68 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreTranslator.h"
+
+using namespace QtBindings::Core;
+
+Translator::Translator(QObject *parent) : QTranslator(parent)
+{
+
+}
+
+Translator::Translator(const Translator &other) : QTranslator()
+{
+    Q_UNUSED(other);
+}
+
+QString Translator::translate(const char *context, const char *sourceText,
+                              const char *disambiguation, int n) const
+{
+    return QTranslator::translate(context, sourceText, disambiguation, n);
+}
+
+bool Translator::isEmpty() const
+{
+    return QTranslator::isEmpty();
+}
+
+bool Translator::load(const QString &filename, const QString &directory,
+                      const QString &search_delimiters, const QString &suffix)
+{
+    return QTranslator::load(filename, directory, search_delimiters, suffix);
+}
+
+bool
+Translator::load(const QLocale &locale, const QString &filename, const QString &prefix,
+                 const QString &directory, const QString &suffix)
+{
+    return QTranslator::load(locale, filename, prefix, directory, suffix);
+}
+
+bool Translator::load(const uchar *data, int len, const QString &directory)
+{
+    return QTranslator::load(data, len, directory);
+}
+
+Translator &Translator::operator=(const Translator &other)
+{
+    Q_UNUSED(other);
+    /* Nothing to do here */
+    return *this;
+}
+
diff --git a/src/scripting/scriptengine/qtbindings/CoreTranslator.h b/src/scripting/scriptengine/qtbindings/CoreTranslator.h
new file mode 100644
index 0000000000..8f7f130b9a
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreTranslator.h
@@ -0,0 +1,48 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef CORETRANSLATOR_H
+#define CORETRANSLATOR_H
+
+#include "QtBinding.h"
+
+#include <QTranslator>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class Translator : public QTranslator, public QtBindings::Base<Translator>
+        {
+        Q_OBJECT
+
+        public:
+            Q_INVOKABLE Translator(QObject *parent = Q_NULLPTR);
+            Q_INVOKABLE Translator(const Translator &other);
+            Translator &operator=(const Translator& other);
+        public slots:
+            virtual QString translate(const char *context, const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) const override ;
+            virtual bool isEmpty() const override;
+            bool load(const QString & filename, const QString & directory = QString(), const QString & search_delimiters = QString(), const QString & suffix = QString());
+            bool load(const QLocale & locale, const QString & filename, const QString & prefix = QString(), const QString & directory = QString(), const QString & suffix = QString());
+            bool load(const uchar *data, int len, const QString &directory = QString());
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::Translator)
+#endif //CORETRANSLATOR_H
diff --git a/src/scripting/scriptengine/qtbindings/CoreUrl.cpp b/src/scripting/scriptengine/qtbindings/CoreUrl.cpp
new file mode 100644
index 0000000000..3c61cce0eb
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreUrl.cpp
@@ -0,0 +1,330 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "CoreUrl.h"
+
+using namespace QtBindings::Core;
+
+Url::Url()
+{
+}
+
+Url::Url(const QUrl &copy) : QUrl(copy)
+{
+}
+
+Url::Url(const Url &copy) : QObject(), QUrl(copy)
+{
+}
+
+Url::Url(const QString &url, QUrl::ParsingMode mode) : QUrl(url, mode)
+{
+}
+
+Url::Url(QUrl &&other) : QUrl(other)
+{
+}
+
+QUrl Url::adjusted(QUrl::FormattingOptions options) const
+{
+    return QUrl::adjusted(options);
+}
+
+QString Url::authority(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::authority(options);
+}
+
+void Url::clear()
+{
+    QUrl::clear();
+}
+
+void Url::detach()
+{
+    QUrl::detach();
+}
+
+QString Url::errorString() const
+{
+    return QUrl::errorString();
+}
+
+QString Url::fileName(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::fileName(options);
+}
+
+QString Url::fragment(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::fragment(options);
+}
+
+bool Url::hasFragment() const
+{
+    return QUrl::hasFragment();
+}
+
+bool Url::hasQuery() const
+{
+    return QUrl::hasQuery();
+}
+
+QString Url::host(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::host(options);
+}
+
+bool Url::isDetached() const
+{
+    return QUrl::isDetached();
+}
+
+bool Url::isEmpty() const
+{
+    return QUrl::isEmpty();
+}
+
+bool Url::isLocalFile() const
+{
+    return QUrl::isLocalFile();
+}
+
+bool Url::isParentOf(const QUrl &url) const
+{
+    return QUrl::isParentOf(url);
+}
+
+bool Url::isRelative() const
+{
+    return QUrl::isRelative();
+}
+
+bool Url::isValid() const
+{
+    return QUrl::isValid();
+}
+
+bool Url::matches(const QUrl &url, QUrl::FormattingOptions options) const
+{
+    return QUrl::matches(url, options);
+}
+
+QString Url::password(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::password(options);
+}
+
+QString Url::path(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::path(options);
+}
+
+int Url::port(int defaultPort) const
+{
+    return QUrl::port(defaultPort);
+}
+
+QString Url::query(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::query(options);
+}
+
+QUrl Url::resolved(const QUrl &relative) const
+{
+    return QUrl::resolved(relative);
+}
+
+QString Url::scheme() const
+{
+    return QUrl::scheme();
+}
+
+void Url::setAuthority(const QString &authority, QUrl::ParsingMode mode)
+{
+    QUrl::setAuthority(authority, mode);
+}
+
+void Url::setFragment(const QString &fragment, QUrl::ParsingMode mode)
+{
+    QUrl::setFragment(fragment, mode);
+}
+
+void Url::setHost(const QString &host, QUrl::ParsingMode mode)
+{
+    QUrl::setHost(host, mode);
+}
+
+void Url::setPassword(const QString &password, QUrl::ParsingMode mode)
+{
+    QUrl::setPassword(password, mode);
+}
+
+void Url::setPath(const QString &path, QUrl::ParsingMode mode)
+{
+    QUrl::setPath(path, mode);
+}
+
+void Url::setPort(int port)
+{
+    QUrl::setPort(port);
+}
+
+void Url::setQuery(const QString &query, QUrl::ParsingMode mode)
+{
+    QUrl::setQuery(query, mode);
+}
+
+void Url::setQuery(const QUrlQuery &query)
+{
+    QUrl::setQuery(query);
+}
+
+void Url::setScheme(const QString &scheme)
+{
+    QUrl::setScheme(scheme);
+}
+
+void Url::setUrl(const QString &url, QUrl::ParsingMode mode)
+{
+    QUrl::setUrl(url, mode);
+}
+
+void Url::setUserInfo(const QString &userInfo, QUrl::ParsingMode mode)
+{
+    QUrl::setUserInfo(userInfo, mode);
+}
+
+void Url::setUserName(const QString &userName, QUrl::ParsingMode mode)
+{
+    QUrl::setUserName(userName, mode);
+}
+
+void Url::swap(QUrl &other)
+{
+    QUrl::swap(other);
+}
+
+QString Url::toDisplayString(QUrl::FormattingOptions options) const
+{
+    return QUrl::toDisplayString(options);
+}
+
+QByteArray Url::toEncoded(QUrl::FormattingOptions options) const
+{
+    return QUrl::toEncoded(options);
+}
+
+QString Url::toLocalFile() const
+{
+    return QUrl::toLocalFile();
+}
+
+QString Url::topLevelDomain(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::topLevelDomain(options);
+}
+
+QString Url::toString(QUrl::FormattingOptions options) const
+{
+    return QUrl::toString(options);
+}
+
+QString Url::url(QUrl::FormattingOptions options) const
+{
+    return QUrl::url(options);
+}
+
+QString Url::userInfo(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::userInfo(options);
+}
+
+QString Url::userName(QUrl::ComponentFormattingOptions options) const
+{
+    return QUrl::userName(options);
+}
+
+QString Url::fromAce(const QByteArray &domain)
+{
+    return QUrl::fromAce(domain);
+}
+
+QUrl Url::fromEncoded(const QByteArray &url, QUrl::ParsingMode mode)
+{
+    return QUrl::fromEncoded(url,mode);
+}
+
+QUrl Url::fromLocalFile(const QString &localfile)
+{
+    return QUrl::fromLocalFile(localfile);
+}
+
+QString Url::fromPercentEncoding(const QByteArray &input)
+{
+    return QUrl::fromPercentEncoding(input);
+}
+
+QList<QUrl> Url::fromStringList(const QStringList &uris, QUrl::ParsingMode mode)
+{
+    return QUrl::fromStringList(uris,mode);
+}
+
+QUrl Url::fromUserInput(const QString &userInput)
+{
+    return QUrl::fromUserInput(userInput);
+}
+
+QUrl Url::fromUserInput(const QString &userInput, const QString &workingDirectory,
+                        QUrl::UserInputResolutionOptions options)
+{
+    return QUrl::fromUserInput(userInput,workingDirectory,options);
+}
+
+QStringList Url::idnWhitelist()
+{
+    return QUrl::idnWhitelist();
+}
+
+void Url::setIdnWhitelist(const QStringList &list)
+{
+    QUrl::setIdnWhitelist(list);
+}
+
+QByteArray Url::toAce(const QString &domain)
+{
+    return QUrl::toAce(domain);
+}
+
+QByteArray Url::toPercentEncoding(const QString &input, const QByteArray &exclude,
+                                  const QByteArray &include)
+{
+    return QUrl::toPercentEncoding(input,exclude,include);
+}
+
+QStringList Url::toStringList(const QList<QUrl> &uris, QUrl::FormattingOptions options)
+{
+    return QUrl::toStringList(uris,options);
+}
+
+Url &Url::operator=(const Url &other)
+{
+    if (this != &other)
+        QUrl::operator=(other);
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/CoreUrl.h b/src/scripting/scriptengine/qtbindings/CoreUrl.h
new file mode 100644
index 0000000000..16d4272f48
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/CoreUrl.h
@@ -0,0 +1,102 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef COREURL_H
+#define COREURL_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QUrl>
+
+namespace QtBindings
+{
+    namespace Core
+    {
+        class Url : public QObject, public QUrl, public QtBindings::Base<Url>
+        {
+        Q_OBJECT
+        public:
+            Q_INVOKABLE Url();
+            Q_INVOKABLE explicit Url(const QUrl &copy);
+            Q_INVOKABLE Url(const Url &copy);
+            Q_INVOKABLE explicit Url(const QString &url, ParsingMode mode = TolerantMode);
+            Q_INVOKABLE explicit Url(QUrl &&other);
+            Q_INVOKABLE static QString fromAce(const QByteArray &domain);
+            Q_INVOKABLE static QUrl fromEncoded(const QByteArray &url, ParsingMode mode = TolerantMode);
+            Q_INVOKABLE static QUrl fromLocalFile(const QString &localfile);
+            Q_INVOKABLE static QString fromPercentEncoding(const QByteArray &input);
+            Q_INVOKABLE static QList<QUrl> fromStringList(const QStringList &uris, ParsingMode mode = TolerantMode);
+            Q_INVOKABLE static QUrl fromUserInput(const QString &userInput);
+            Q_INVOKABLE static QUrl fromUserInput(const QString &userInput, const QString &workingDirectory, UserInputResolutionOptions options = DefaultResolution);
+            Q_INVOKABLE static QStringList idnWhitelist();
+            Q_INVOKABLE static void setIdnWhitelist(const QStringList &list);
+            Q_INVOKABLE static QByteArray toAce(const QString &domain);
+            Q_INVOKABLE static QByteArray toPercentEncoding(const QString &input, const QByteArray &exclude = QByteArray(), const QByteArray &include = QByteArray());
+            Q_INVOKABLE static QStringList toStringList(const QList<QUrl> &uris, FormattingOptions options = FormattingOptions(PrettyDecoded));
+            Url &operator=(const Url &other);
+        public slots:
+            QUrl adjusted(FormattingOptions options) const;
+            QString authority(ComponentFormattingOptions options = PrettyDecoded) const;
+            void clear();
+            void detach();
+            QString errorString() const;
+            QString fileName(ComponentFormattingOptions options = FullyDecoded) const;
+            QString fragment(ComponentFormattingOptions options = PrettyDecoded) const;
+            bool hasFragment() const;
+            bool hasQuery() const;
+            QString host(ComponentFormattingOptions options = FullyDecoded) const;
+            bool isDetached() const;
+            bool isEmpty() const;
+            bool isLocalFile() const;
+            bool isParentOf(const QUrl &url) const;
+            bool isRelative() const;
+            bool isValid() const;
+            bool matches(const QUrl &url, FormattingOptions options) const;
+            QString password(ComponentFormattingOptions options = FullyDecoded) const;
+            QString path(ComponentFormattingOptions options = FullyDecoded) const;
+            int port(int defaultPort = -1) const;
+            QString query(ComponentFormattingOptions options = PrettyDecoded) const;
+            QUrl resolved(const QUrl &relative) const;
+            QString scheme() const;
+            void setAuthority(const QString &authority, ParsingMode mode = TolerantMode);
+            void setFragment(const QString &fragment, ParsingMode mode = TolerantMode);
+            void setHost(const QString &host, ParsingMode mode = DecodedMode);
+            void setPassword(const QString &password, ParsingMode mode = DecodedMode);
+            void setPath(const QString &path, ParsingMode mode = DecodedMode);
+            void setPort(int port);
+            void setQuery(const QString &query, ParsingMode mode = TolerantMode);
+            void setQuery(const QUrlQuery &query);
+            void setScheme(const QString &scheme);
+            void setUrl(const QString &url, ParsingMode mode = TolerantMode);
+            void setUserInfo(const QString &userInfo, ParsingMode mode = TolerantMode);
+            void setUserName(const QString &userName, ParsingMode mode = DecodedMode);
+            void swap(QUrl &other);
+            QString toDisplayString(FormattingOptions options = FormattingOptions(PrettyDecoded)) const;
+            QByteArray toEncoded(FormattingOptions options = FullyEncoded) const;
+            QString toLocalFile() const;
+            QString topLevelDomain(ComponentFormattingOptions options = FullyDecoded) const;
+            QString toString(FormattingOptions options = FormattingOptions(PrettyDecoded)) const;
+            QString url(FormattingOptions options = FormattingOptions(PrettyDecoded)) const;
+            QString userInfo(ComponentFormattingOptions options = PrettyDecoded) const;
+            QString userName(ComponentFormattingOptions options = FullyDecoded) const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Core::Url)
+#endif //COREURL_H
diff --git a/src/scripting/scriptengine/qtbindings/Gui.h b/src/scripting/scriptengine/qtbindings/Gui.h
new file mode 100644
index 0000000000..93b59cc532
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/Gui.h
@@ -0,0 +1,27 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_H
+#define GUI_H
+
+// Groups includes by namespace
+#include "GuiCheckBox.h"
+#include "GuiDialogButtonBox.h"
+#include "GuiLabel.h"
+
+#endif //GUI_H
diff --git a/src/scripting/scriptengine/qtbindings/GuiCheckBox.cpp b/src/scripting/scriptengine/qtbindings/GuiCheckBox.cpp
new file mode 100644
index 0000000000..8f81a2ec5f
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/GuiCheckBox.cpp
@@ -0,0 +1,85 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GuiCheckBox.h"
+
+using namespace QtBindings::Gui;
+
+CheckBox::CheckBox(QWidget *parent) : QCheckBox(parent)
+{
+}
+
+CheckBox::CheckBox(const CheckBox &other) : QCheckBox(qobject_cast<QWidget*>( other.parent() ))
+{
+    *this = other;
+}
+
+CheckBox::CheckBox(const QString &text, QWidget *parent) : QCheckBox(
+        text, parent)
+{
+}
+
+CheckBox::~CheckBox()
+{
+}
+
+Qt::CheckState CheckBox::checkState() const
+{
+    return QCheckBox::checkState();
+}
+
+bool CheckBox::isTristate() const
+{
+    return QCheckBox::isTristate();
+}
+
+void CheckBox::setCheckState(Qt::CheckState state)
+{
+    QCheckBox::setCheckState(state);
+}
+
+void CheckBox::setTristate(bool y)
+{
+    QCheckBox::setTristate(y);
+}
+
+void CheckBox::setEnabled(bool enabled)
+{
+    QCheckBox::setEnabled(enabled);
+}
+
+QSize CheckBox::minimumSizeHint() const
+{
+    return QCheckBox::minimumSizeHint();
+}
+
+QSize CheckBox::sizeHint() const
+{
+    return QCheckBox::sizeHint();
+}
+
+CheckBox &CheckBox::operator=(const CheckBox &other)
+{
+    if (this != &other) {
+       this->setCheckState( other.checkState() );
+       this->setTristate( other.isTristate() );
+       this->setEnabled( other.isEnabled() );
+    }
+    return *this;
+}
+
diff --git a/src/scripting/scriptengine/qtbindings/GuiCheckBox.h b/src/scripting/scriptengine/qtbindings/GuiCheckBox.h
new file mode 100644
index 0000000000..d16679f317
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/GuiCheckBox.h
@@ -0,0 +1,51 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUICHECKBOX_H
+#define GUICHECKBOX_H
+
+#include "QtBinding.h"
+
+#include <QCheckBox>
+
+namespace QtBindings
+{
+    namespace Gui
+    {
+        class CheckBox : public QCheckBox, public QtBindings::Base<CheckBox>
+        {
+            Q_OBJECT
+        public:
+            Q_INVOKABLE CheckBox(QWidget *parent = Q_NULLPTR);
+            Q_INVOKABLE CheckBox(const CheckBox &other);
+            Q_INVOKABLE CheckBox(const QString &text, QWidget *parent = Q_NULLPTR);
+            Q_INVOKABLE ~CheckBox();
+            CheckBox &operator=(const CheckBox &other);
+        public slots:
+            Qt::CheckState checkState() const;
+            bool isTristate() const;
+            void setCheckState(Qt::CheckState state);
+            void setTristate(bool y = true);
+            void setEnabled(bool enabled);
+            virtual QSize minimumSizeHint() const override;
+            virtual QSize sizeHint() const override;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Gui::CheckBox)
+#endif //GUICHECKBOX_H
diff --git a/src/scripting/scriptengine/qtbindings/GuiDialogButtonBox.cpp b/src/scripting/scriptengine/qtbindings/GuiDialogButtonBox.cpp
new file mode 100644
index 0000000000..127df39598
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/GuiDialogButtonBox.cpp
@@ -0,0 +1,50 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GuiDialogButtonBox.h"
+
+using namespace QtBindings::Gui;
+
+DialogButtonBox::DialogButtonBox(QWidget *parent) : QDialogButtonBox(parent)
+{
+}
+
+DialogButtonBox::DialogButtonBox(const DialogButtonBox &other) : QDialogButtonBox(other.parentWidget())
+{
+    *this = other;
+}
+
+
+DialogButtonBox::~DialogButtonBox()
+{
+}
+
+DialogButtonBox &
+DialogButtonBox::operator=(const DialogButtonBox &other)
+{
+    if (this != &other) {
+        this->setCenterButtons(other.centerButtons());
+        this->setOrientation(other.orientation());
+        this->setStandardButtons(other.standardButtons());;
+        for (auto &otherButton : other.buttons() )
+        {
+           this->addButton(otherButton,QDialogButtonBox::AcceptRole);
+        }
+    }
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/GuiDialogButtonBox.h b/src/scripting/scriptengine/qtbindings/GuiDialogButtonBox.h
new file mode 100644
index 0000000000..e7cc0cd029
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/GuiDialogButtonBox.h
@@ -0,0 +1,88 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUIDIALOGBUTTONBOX_H
+#define GUIDIALOGBUTTONBOX_H
+
+#include "QtBinding.h"
+
+#include <QDialogButtonBox>
+
+namespace QtBindings
+{
+    namespace Gui
+    {
+        class DialogButtonBox : public QDialogButtonBox, public QtBindings::Base<DialogButtonBox>
+        {
+            Q_OBJECT
+        public:
+            enum ButtonRole {
+                InvalidRole = -1,
+                AcceptRole,
+                RejectRole,
+                DestructiveRole,
+                ActionRole,
+                HelpRole,
+                YesRole,
+                NoRole,
+                ResetRole,
+                ApplyRole,
+                NRoles
+            };
+            Q_ENUM(ButtonRole)
+
+            enum StandardButton {
+                NoButton           = 0x00000000,
+                Ok                 = 0x00000400,
+                Save               = 0x00000800,
+                SaveAll            = 0x00001000,
+                Open               = 0x00002000,
+                Yes                = 0x00004000,
+                YesToAll           = 0x00008000,
+                No                 = 0x00010000,
+                NoToAll            = 0x00020000,
+                Abort              = 0x00040000,
+                Retry              = 0x00080000,
+                Ignore             = 0x00100000,
+                Close              = 0x00200000,
+                Cancel             = 0x00400000,
+                Discard            = 0x00800000,
+                Help               = 0x01000000,
+                Apply              = 0x02000000,
+                Reset              = 0x04000000,
+                RestoreDefaults    = 0x08000000,
+            };
+            Q_FLAG(StandardButtons)
+
+            enum ButtonLayout {
+                WinLayout,
+                MacLayout,
+                KdeLayout,
+                GnomeLayout
+            };
+            Q_ENUM(ButtonLayout)
+
+            Q_INVOKABLE DialogButtonBox(QWidget *parent = Q_NULLPTR);
+            Q_INVOKABLE DialogButtonBox(const DialogButtonBox &other);
+            Q_INVOKABLE ~DialogButtonBox();
+            Q_INVOKABLE DialogButtonBox &operator=(const DialogButtonBox &other);
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Gui::DialogButtonBox)
+#endif //GUIDIALOGBUTTONBOX_H
diff --git a/src/scripting/scriptengine/qtbindings/GuiLabel.cpp b/src/scripting/scriptengine/qtbindings/GuiLabel.cpp
new file mode 100644
index 0000000000..686c784512
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/GuiLabel.cpp
@@ -0,0 +1,321 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "GuiLabel.h"
+
+using namespace QtBindings::Gui;
+
+Label::Label(QWidget *parent, Qt::WindowFlags f) : QLabel(parent, f)
+{
+}
+
+Label::Label(const Label &other) : QLabel (other.text())
+{
+    *this=other;
+}
+
+Label::Label(const QString &text, QWidget *parent,
+                              Qt::WindowFlags f) : QLabel(text, parent, f)
+{
+}
+
+Label::~Label()
+{
+}
+
+Qt::Alignment Label::alignment() const
+{
+    return QLabel::alignment();
+}
+
+QWidget *Label::buddy() const
+{
+    return QLabel::buddy();
+}
+
+void Label::clear()
+{
+    QLabel::clear();
+}
+
+bool Label::hasScaledContents() const
+{
+    return QLabel::hasScaledContents();
+}
+
+bool Label::hasSelectedText() const
+{
+    return QLabel::hasSelectedText();
+}
+
+int Label::indent() const
+{
+    return QLabel::indent();
+}
+
+int Label::margin() const
+{
+    return QLabel::margin();
+}
+
+QMovie *Label::movie() const
+{
+    return QLabel::movie();
+}
+
+bool Label::openExternalLinks() const
+{
+    return QLabel::openExternalLinks();
+}
+
+const QPicture *Label::picture() const
+{
+    return QLabel::picture();
+}
+
+const QPixmap *Label::pixmap() const
+{
+    return QLabel::pixmap();
+}
+
+QString Label::selectedText() const
+{
+    return QLabel::selectedText();
+}
+
+int Label::selectionStart() const
+{
+    return QLabel::selectionStart();
+}
+
+void Label::setAlignment(Qt::Alignment alignment)
+{
+    QLabel::setAlignment(alignment);
+}
+
+void Label::setBuddy(QWidget *buddy)
+{
+    QLabel::setBuddy(buddy);
+}
+
+void Label::setIndent(int indent)
+{
+    QLabel::setIndent(indent);
+}
+
+void Label::setMargin(int margin)
+{
+    QLabel::setMargin(margin);
+}
+
+void Label::setMovie(QMovie *movie)
+{
+    QLabel::setMovie(movie);
+}
+
+void Label::setNum(double num)
+{
+    QLabel::setNum(num);
+}
+
+void Label::setNum(int num)
+{
+    QLabel::setNum(num);
+}
+
+void Label::setOpenExternalLinks(bool open)
+{
+    QLabel::setOpenExternalLinks(open);
+}
+
+void Label::setPicture(const QPicture &picture)
+{
+    QLabel::setPicture(picture);
+}
+
+void Label::setPixmap(const QPixmap &pixMap)
+{
+    QLabel::setPixmap(pixMap);
+}
+
+void Label::setScaledContents(bool y)
+{
+    QLabel::setScaledContents(y);
+}
+
+void Label::setSelection(int start, int length)
+{
+    QLabel::setSelection(start, length);
+}
+
+void Label::setText(const QString &text)
+{
+    QLabel::setText(text);
+}
+
+void Label::setTextFormat(Qt::TextFormat textFormat)
+{
+    QLabel::setTextFormat(textFormat);
+}
+
+void Label::setTextInteractionFlags(Qt::TextInteractionFlags flags)
+{
+    QLabel::setTextInteractionFlags(flags);
+}
+
+void Label::setWordWrap(bool on)
+{
+    QLabel::setWordWrap(on);
+}
+
+QString Label::text() const
+{
+    return QLabel::text();
+}
+
+Qt::TextFormat Label::textFormat() const
+{
+    return QLabel::textFormat();
+}
+
+Qt::TextInteractionFlags Label::textInteractionFlags() const
+{
+    return QLabel::textInteractionFlags();
+}
+
+bool Label::wordWrap() const
+{
+    return QLabel::wordWrap();
+}
+
+bool Label::close()
+{
+    return QWidget::close();
+}
+
+void Label::hide()
+{
+    QWidget::hide();
+}
+
+void Label::lower()
+{
+    QWidget::lower();
+}
+
+void Label::raise()
+{
+    QWidget::raise();
+}
+
+void Label::repaint()
+{
+    QWidget::repaint();
+}
+
+void Label::setDisabled(bool disable)
+{
+    QWidget::setDisabled(disable);
+}
+
+void Label::setEnabled(bool enabled)
+{
+    QWidget::setEnabled(enabled);
+}
+
+void Label::setFocus()
+{
+    QWidget::setFocus();
+}
+
+void Label::setHidden(bool hidden)
+{
+    QWidget::setHidden(hidden);
+}
+
+void Label::setStyleSheet(const QString &styleSheet)
+{
+    QWidget::setStyleSheet(styleSheet);
+}
+
+void Label::setVisible(bool visible)
+{
+    QWidget::setVisible(visible);
+}
+
+void Label::setWindowModified(bool windowModified)
+{
+    QWidget::setWindowModified(windowModified);
+}
+
+void Label::setWindowTitle(const QString &title)
+{
+    QWidget::setWindowTitle(title);
+}
+
+void Label::show()
+{
+    QWidget::show();
+}
+
+void Label::showFullScreen()
+{
+    QWidget::showFullScreen();
+}
+
+void Label::showMaximized()
+{
+    QWidget::showMaximized();
+}
+
+void Label::showMinimized()
+{
+    QWidget::showMinimized();
+}
+
+void Label::showNormal()
+{
+    QWidget::showNormal();
+}
+
+void Label::update()
+{
+    QWidget::update();
+}
+
+Label &Label::operator=(const Label &other)
+{
+    if (this != &other) {
+        this->setEnabled( other.isEnabled() ) ;
+        this->setBuddy( other.buddy() );
+        this->setIndent( other.indent() );
+        this->setMargin( other.margin() );
+        this->setMovie( other.movie() );
+        this->setOpenExternalLinks( other.openExternalLinks() );
+        this->setPicture( *other.picture() ) ;
+        this->setPixmap( *other.pixmap() );
+        this->setScaledContents( other.hasScaledContents() );
+        this->setSelection( other.selectionStart(), other.selectedText().length() );
+        this->setText( other.text() );
+        this->setTextFormat( other.textFormat() );
+        this->setTextInteractionFlags( other.textInteractionFlags() );
+        this->setWordWrap( other.wordWrap() );
+    }
+    return *this;
+}
+
diff --git a/src/scripting/scriptengine/qtbindings/GuiLabel.h b/src/scripting/scriptengine/qtbindings/GuiLabel.h
new file mode 100644
index 0000000000..e33250aab4
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/GuiLabel.h
@@ -0,0 +1,96 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUILABEL_H
+#define GUILABEL_H
+
+#include "QtBinding.h"
+
+#include <QLabel>
+
+namespace QtBindings {
+    namespace  Gui
+    {
+        class Label : public QLabel, public QtBindings::Base<Label>
+        {
+            Q_OBJECT
+        public:
+            Q_INVOKABLE Label(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+            Q_INVOKABLE Label(const Label &other);
+            Q_INVOKABLE Label(const QString &text, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+            Q_INVOKABLE ~Label();
+            Label &operator=(const Label &other);
+        public slots:
+            Qt::Alignment alignment() const;
+            QWidget *buddy() const;
+            void clear();
+            bool hasScaledContents() const;
+            bool hasSelectedText() const;
+            int indent() const;
+            int margin() const;
+            QMovie *movie() const;
+            bool openExternalLinks() const;
+            const QPicture *picture() const;
+            const QPixmap *pixmap() const;
+            QString selectedText() const;
+            int selectionStart() const;
+            void setAlignment(Qt::Alignment);
+            void setBuddy(QWidget *buddy);
+            void setIndent(int);
+            void setMargin(int);
+            void setMovie(QMovie *movie);
+            void setNum(double num);
+            void setNum(int num);
+            void setOpenExternalLinks(bool open);
+            void setPicture(const QPicture &picture);
+            void setPixmap(const QPixmap &);
+            void setScaledContents(bool);
+            void setSelection(int start, int length);
+            void setText(const QString &);
+            void setTextFormat(Qt::TextFormat);
+            void setTextInteractionFlags(Qt::TextInteractionFlags flags);
+            void setWordWrap(bool on);
+            QString text() const;
+            Qt::TextFormat textFormat() const;
+            Qt::TextInteractionFlags textInteractionFlags() const;
+            bool wordWrap() const;
+            // QWidget
+            bool close();
+            void hide();
+            void lower();
+            void raise();
+            void repaint();
+            void setDisabled(bool disable);
+            void setEnabled(bool);
+            void setFocus();
+            void setHidden(bool hidden);
+            void setStyleSheet(const QString &styleSheet);
+            virtual void setVisible(bool visible) override;
+            void setWindowModified(bool);
+            void setWindowTitle(const QString &);
+            void show();
+            void showFullScreen();
+            void showMaximized();
+            void showMinimized();
+            void showNormal();
+            void update();
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Gui::Label)
+#endif //GUILABEL_H
diff --git a/src/scripting/scriptengine/qtbindings/QtBinding.h b/src/scripting/scriptengine/qtbindings/QtBinding.h
new file mode 100644
index 0000000000..6fa27369e3
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/QtBinding.h
@@ -0,0 +1,123 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef QTBINDING_H
+#define QTBINDING_H
+
+#include <QJSEngine>
+#include <QMetaMethod>
+#include <QRegularExpression>
+#include <QSet>
+
+namespace QtBindings {
+    /** Base template for QT bindings
+     * IMPORTANT: for methods do be correctly exported, static methods must be
+     * annotated with Q_INVOKABLE, and object methods must be declared as public slots
+     * */
+    template<class T> class Base
+    {
+    public:
+        /**
+         * Export type to the JS engine
+         * @param engine
+         * @param parentObject
+         */
+        static void installJSType( QJSEngine *engine )
+        {
+            if (!engine) return;
+
+            // Install type only once along program execution
+            if ( !QMetaType::isRegistered( QMetaType::type( typeName ) ) ) {
+                qRegisterMetaType<T>( typeName );
+                qRegisterMetaType<T>( typeNameRef );
+                qRegisterMetaType<T*>( typeNamePtr );
+                qRegisterMetaType<T>(  "const " + typeName );
+                qRegisterMetaType<T>(  "const " + typeNameRef );
+                qRegisterMetaType<T*>( "const " + typeNamePtr );
+
+                /* Converter allows passing parameters to C++ via value and const-ref */
+                bool conv = QMetaType::registerConverter<QObject*,T>( [] (QObject* qObjPtr) {
+                    const T* dataPtr = qobject_cast<T*>( qObjPtr );
+                    return (dataPtr == nullptr) ? T() : T( *dataPtr ) ;
+                });
+                Q_ASSERT(conv);
+            }
+
+            QJSValue scopeObj = engine->globalObject();
+
+            // Export type to each JS engine only once - Test if not defined yet
+            if ( scopeObj.property( qTypeName ).isUndefined() ) {
+                scopeObj.setProperty( qTypeName, engine->newQMetaObject<T>());
+
+                QJSValue classObj = engine->newQObject( new T() );
+                // Add static methods to the associated JS object
+                for ( const QString& methodName : getStaticMethods() ) {
+                    scopeObj.property( qTypeName )
+                        .setProperty( methodName, classObj.property( methodName ) );
+                }
+            }
+        }
+
+        static QSet<QString> getStaticMethods()
+        {
+            const QMetaObject classObj = T::staticMetaObject;
+            QSet<QString> methodList;
+            for (int i = classObj.methodOffset(); i < classObj.methodCount(); i++) {
+                /* TODO - non-static methods are filtered out by being slots since
+                 * tags do not work for Q_INVOKABLE. Change this to tags if fixed */
+                if (classObj.method(i).methodType() == QMetaMethod::Method)
+                    methodList << classObj.method(i).name();
+            }
+            return methodList;
+        }
+
+    protected:
+        static const QByteArray typeName;
+        static const QByteArray typeNamePtr;
+        static const QByteArray typeNameRef;
+        static const QString qTypeName;
+
+        /**
+         *  Mirrors a QObject tree into a JS object
+         *
+         * @param rootObject top object in the tree
+         * @param  engine javascript engine object that the tree belongs to
+         * @return a Javascript object with the top QObject of the tree
+         */
+        QJSValue mirrorObjectTree( QObject* rootObject, QJSEngine* engine ) {
+
+            QJSValue rootJSValue = engine->newQObject( rootObject );
+
+            for (QObject* childObject : rootObject->findChildren<QObject*>( QString(), Qt::FindDirectChildrenOnly ) ) {
+                QJSValue childJSValue = mirrorObjectTree( childObject, engine ) ;
+                rootJSValue.setProperty( childObject->objectName(), childJSValue );
+            }
+            return rootJSValue;
+        }
+    };
+
+    // Remove namespace
+    template<class T> const QByteArray Base<T>::typeName = QString( T::staticMetaObject.className() )
+        .remove(  QRegularExpression( "^.*::" ) ).toLatin1();
+    template<class T> const QByteArray Base<T>::typeNamePtr = typeName + "*";
+    template<class T> const QByteArray Base<T>::typeNameRef = typeName + "&";
+    template<class T> const QString Base<T>::qTypeName( "Q" + typeName );
+}
+
+
+#endif //QTBINDING_H
diff --git a/src/scripting/scriptengine/qtbindings/Sql.h b/src/scripting/scriptengine/qtbindings/Sql.h
new file mode 100644
index 0000000000..50eb707006
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/Sql.h
@@ -0,0 +1,25 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SQL_H
+#define SQL_H
+
+// Groups includes by namespace
+#include "SqlSqlQuery.h"
+
+#endif //SQL_H
diff --git a/src/scripting/scriptengine/qtbindings/SqlSqlQuery.cpp b/src/scripting/scriptengine/qtbindings/SqlSqlQuery.cpp
new file mode 100644
index 0000000000..de71704e2e
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/SqlSqlQuery.cpp
@@ -0,0 +1,247 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "SqlSqlQuery.h"
+
+#include <QVariant>
+
+using namespace QtBindings::Sql;
+
+SqlQuery::SqlQuery(QSqlResult *r) : QSqlQuery(r)
+{
+}
+
+SqlQuery::SqlQuery(const QString &query, QSqlDatabase db) : QSqlQuery(query, db)
+{
+}
+
+SqlQuery::SqlQuery(QSqlDatabase db) : QSqlQuery(db)
+{
+}
+
+SqlQuery::SqlQuery(const QSqlQuery &other) : QSqlQuery(other)
+{
+}
+
+SqlQuery::SqlQuery(const SqlQuery &other) : QObject(), QSqlQuery(other)
+{
+}
+
+void SqlQuery::addBindValue(const QVariant &val, QSql::ParamType type)
+{
+    QSqlQuery::addBindValue(val, type);
+}
+
+int SqlQuery::at() const
+{
+    return QSqlQuery::at();
+}
+
+void
+SqlQuery::bindValue(const QString &placeholder, const QVariant &val, QSql::ParamType type)
+{
+    QSqlQuery::bindValue(placeholder, val, type);
+}
+
+void SqlQuery::bindValue(int pos, const QVariant &val, QSql::ParamType type)
+{
+    QSqlQuery::bindValue(pos, val, type);
+}
+
+QVariant SqlQuery::boundValue(const QString &placeholder) const
+{
+    return QSqlQuery::boundValue(placeholder);
+}
+
+QVariant SqlQuery::boundValue(int pos) const
+{
+    return QSqlQuery::boundValue(pos);
+}
+
+void SqlQuery::clear()
+{
+    QSqlQuery::clear();
+}
+
+const QSqlDriver *SqlQuery::driver() const
+{
+    return QSqlQuery::driver();
+}
+
+bool SqlQuery::exec()
+{
+    return QSqlQuery::exec();
+}
+
+bool SqlQuery::execBatch(QSqlQuery::BatchExecutionMode mode)
+{
+    return QSqlQuery::execBatch(mode);
+}
+
+bool SqlQuery::exec(const QString &query)
+{
+    return QSqlQuery::exec(query);
+}
+
+QString SqlQuery::executedQuery() const
+{
+    return QSqlQuery::executedQuery();
+}
+
+void SqlQuery::finish()
+{
+    QSqlQuery::finish();
+}
+
+bool SqlQuery::first()
+{
+    return QSqlQuery::first();
+}
+
+bool SqlQuery::isActive() const
+{
+    return QSqlQuery::isActive();
+}
+
+bool SqlQuery::isForwardOnly() const
+{
+    return QSqlQuery::isForwardOnly();
+}
+
+bool SqlQuery::isNull(const QString &name) const
+{
+    return QSqlQuery::isNull(name);
+}
+
+bool SqlQuery::isNull(int field) const
+{
+    return QSqlQuery::isNull(field);
+}
+
+bool SqlQuery::isSelect() const
+{
+    return QSqlQuery::isSelect();
+}
+
+bool SqlQuery::isValid() const
+{
+    return QSqlQuery::isValid();
+}
+
+bool SqlQuery::last()
+{
+    return QSqlQuery::last();
+}
+
+QSqlError SqlQuery::lastError() const
+{
+    return QSqlQuery::lastError();
+}
+
+QVariant SqlQuery::lastInsertId() const
+{
+    return QSqlQuery::lastInsertId();
+}
+
+QString SqlQuery::lastQuery() const
+{
+    return QSqlQuery::lastQuery();
+}
+
+bool SqlQuery::next()
+{
+    return QSqlQuery::next();
+}
+
+bool SqlQuery::nextResult()
+{
+    return QSqlQuery::nextResult();
+}
+
+QSql::NumericalPrecisionPolicy SqlQuery::numericalPrecisionPolicy() const
+{
+    return QSqlQuery::numericalPrecisionPolicy();
+}
+
+int SqlQuery::numRowsAffected() const
+{
+    return QSqlQuery::numRowsAffected();
+}
+
+bool SqlQuery::prepare(const QString &query)
+{
+    return QSqlQuery::prepare(query);
+}
+
+bool SqlQuery::previous()
+{
+    return QSqlQuery::previous();
+}
+
+QMap<QString, QVariant> SqlQuery::boundValues() const
+{
+    return QSqlQuery::boundValues();
+}
+
+QSqlRecord SqlQuery::record() const
+{
+    return QSqlQuery::record();
+}
+
+const QSqlResult *SqlQuery::result() const
+{
+    return QSqlQuery::result();
+}
+
+bool SqlQuery::seek(int i, bool relative)
+{
+    return QSqlQuery::seek(i, relative);
+}
+
+void SqlQuery::setForwardOnly(bool forward)
+{
+    QSqlQuery::setForwardOnly(forward);
+}
+
+void SqlQuery::setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy)
+{
+    QSqlQuery::setNumericalPrecisionPolicy(precisionPolicy);
+}
+
+int SqlQuery::size() const
+{
+    return QSqlQuery::size();
+}
+
+QVariant SqlQuery::value(const QString &name) const
+{
+    return QSqlQuery::value(name);
+}
+
+QVariant SqlQuery::value(int i) const
+{
+    return QSqlQuery::value(i);
+}
+
+SqlQuery &SqlQuery::operator=(const SqlQuery &other)
+{
+    if (this != &other) {
+        this->QSqlQuery::operator=( other );
+    }
+    return *this;
+}
diff --git a/src/scripting/scriptengine/qtbindings/SqlSqlQuery.h b/src/scripting/scriptengine/qtbindings/SqlSqlQuery.h
new file mode 100644
index 0000000000..09af19279d
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/SqlSqlQuery.h
@@ -0,0 +1,87 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SQLSQLQUERY_H
+#define SQLSQLQUERY_H
+
+#include "QtBinding.h"
+
+#include <QObject>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QSqlRecord>
+
+namespace QtBindings
+{
+    namespace Sql
+    {
+        class SqlQuery : public QObject, public QSqlQuery, public QtBindings::Base<SqlQuery>
+        {
+            Q_OBJECT
+        public:
+            Q_INVOKABLE SqlQuery(QSqlResult *r);
+            Q_INVOKABLE SqlQuery(const QString& query = QString(), QSqlDatabase db = QSqlDatabase());
+            Q_INVOKABLE SqlQuery(QSqlDatabase db);
+            Q_INVOKABLE explicit SqlQuery(const QSqlQuery& other);
+            Q_INVOKABLE SqlQuery(const SqlQuery& other);
+            SqlQuery &operator=(const SqlQuery& other);
+        public slots:
+            void addBindValue(const QVariant& val, QSql::ParamType type = QSql::In);
+            int at() const;
+            void bindValue(const QString& placeholder, const QVariant& val, QSql::ParamType type = QSql::In);
+            void bindValue(int pos, const QVariant& val, QSql::ParamType type = QSql::In);
+            QVariant boundValue(const QString& placeholder) const;
+            QVariant boundValue(int pos) const;
+            void clear();
+            const QSqlDriver* driver() const;
+            bool exec();
+            bool execBatch(BatchExecutionMode mode = ValuesAsRows);
+            bool exec(const QString& query);
+            QString executedQuery() const;
+            void finish();
+            bool first();
+            bool isActive() const;
+            bool isForwardOnly() const;
+            bool isNull(const QString &name) const;
+            bool isNull(int field) const;
+            bool isSelect() const;
+            bool isValid() const;
+            bool last();
+            QSqlError lastError() const;
+            QVariant lastInsertId() const;
+            QString lastQuery() const;
+            bool next();
+            bool nextResult();
+            QSql::NumericalPrecisionPolicy numericalPrecisionPolicy() const;
+            int numRowsAffected() const;
+            bool prepare(const QString& query);
+            bool previous();
+            QMap<QString, QVariant> boundValues() const;
+            QSqlRecord record() const;
+            const QSqlResult* result() const;
+            bool seek(int i, bool relative = false);
+            void setForwardOnly(bool forward);
+            void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy precisionPolicy);
+            int size() const;
+            QVariant value(const QString& name) const;
+            QVariant value(int i) const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::Sql::SqlQuery)
+#endif //SQLSQLQUERY_H
diff --git a/src/scripting/scriptengine/qtbindings/UiTools.h b/src/scripting/scriptengine/qtbindings/UiTools.h
new file mode 100644
index 0000000000..1c5649670c
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/UiTools.h
@@ -0,0 +1,25 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UITOOLS_H
+#define UITOOLS_H
+
+// Groups includes by namespace
+#include "UiToolsUiLoader.h"
+
+#endif //UITOOLS_H
diff --git a/src/scripting/scriptengine/qtbindings/UiToolsUiLoader.cpp b/src/scripting/scriptengine/qtbindings/UiToolsUiLoader.cpp
new file mode 100644
index 0000000000..1254f5d7f5
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/UiToolsUiLoader.cpp
@@ -0,0 +1,136 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "UiToolsUiLoader.h"
+
+#include "CoreDir.h"
+#include <QWidget>
+
+using namespace QtBindings::UiTools;
+
+UiLoader::UiLoader(QObject *parent) : QUiLoader(parent)
+{
+}
+
+UiLoader::UiLoader(const UiLoader &other) : QUiLoader(other.parent())
+{
+    *this=other;
+}
+
+UiLoader::UiLoader(const QJSValue &other) : QUiLoader(nullptr)
+{
+    Q_UNUSED(other);
+}
+
+UiLoader::~UiLoader()
+{
+}
+
+void UiLoader::addPluginPath(const QString &path)
+{
+    QUiLoader::addPluginPath(path);
+}
+
+QStringList UiLoader::availableLayouts() const
+{
+    return QUiLoader::availableLayouts();
+}
+
+QStringList UiLoader::availableWidgets() const
+{
+    return QUiLoader::availableWidgets();
+}
+
+void UiLoader::clearPluginPaths()
+{
+    QUiLoader::clearPluginPaths();
+}
+
+QAction *UiLoader::createAction(QObject *parent, const QString &name)
+{
+    return QUiLoader::createAction(parent, name);
+}
+
+QActionGroup *
+UiLoader::createActionGroup(QObject *parent, const QString &name)
+{
+    return QUiLoader::createActionGroup(parent, name);
+}
+
+QLayout *
+UiLoader::createLayout(const QString &className, QObject *parent,
+                                            const QString &name)
+{
+    return QUiLoader::createLayout(className, parent, name);
+}
+
+QWidget *
+UiLoader::createWidget(const QString &className, QWidget *parent,
+                                            const QString &name)
+{
+    return QUiLoader::createWidget(className, parent, name);
+}
+
+QString UiLoader::errorString() const
+{
+    return QUiLoader::errorString();
+}
+
+bool UiLoader::isLanguageChangeEnabled() const
+{
+    return QUiLoader::isLanguageChangeEnabled();
+}
+
+QJSValue UiLoader::load(QFile *device, QJSValue parentWidget)
+{
+    QWidget *rootWidget = ( parentWidget.isQObject() ) ?
+        QUiLoader::load(device, qobject_cast<QWidget*>( parentWidget.toQObject()) ) :
+        QUiLoader::load(device);
+
+    return this->mirrorObjectTree( rootWidget, qjsEngine( this ) );
+}
+
+QStringList UiLoader::pluginPaths() const
+{
+    return QUiLoader::pluginPaths();
+}
+
+void UiLoader::setLanguageChangeEnabled(bool enabled)
+{
+    QUiLoader::setLanguageChangeEnabled(enabled);
+}
+
+void UiLoader::setWorkingDirectory(const QDir &dir)
+{
+    QUiLoader::setWorkingDirectory(dir);
+}
+
+QDir UiLoader::workingDirectory() const
+{
+    return QtBindings::Core::Dir(QUiLoader::workingDirectory());
+}
+
+UiLoader &UiLoader::operator=(const UiLoader &other)
+{
+    if (this != &other) {
+        this->setLanguageChangeEnabled( other.isLanguageChangeEnabled() );
+        this->setWorkingDirectory( other.workingDirectory() );
+    }
+    return *this;
+}
+
diff --git a/src/scripting/scriptengine/qtbindings/UiToolsUiLoader.h b/src/scripting/scriptengine/qtbindings/UiToolsUiLoader.h
new file mode 100644
index 0000000000..c116f08a52
--- /dev/null
+++ b/src/scripting/scriptengine/qtbindings/UiToolsUiLoader.h
@@ -0,0 +1,60 @@
+/*
+ * Replacement fot QT Bindings that were removed from QT5
+ * Copyright (C) 2020  Pedro de Carvalho Gomes <pedrogomes81@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UITOOLSUILOADER_H
+#define UITOOLSUILOADER_H
+
+#include "QtBinding.h"
+#include <QFile>
+#include <QUiLoader>
+#include <QDialogButtonBox>
+
+namespace QtBindings
+{
+    namespace UiTools
+    {
+        class UiLoader : public QUiLoader, public QtBindings::Base<UiLoader>
+        {
+            Q_OBJECT
+        public:
+            Q_INVOKABLE UiLoader(QObject *parent = Q_NULLPTR);
+            Q_INVOKABLE UiLoader(const UiLoader &other);
+            Q_INVOKABLE UiLoader(const QJSValue &other);
+            Q_INVOKABLE virtual ~UiLoader();
+            UiLoader &operator=(const UiLoader &other);
+        public slots:
+            void addPluginPath(const QString &path);
+            QStringList availableLayouts() const;
+            QStringList availableWidgets() const;
+            void clearPluginPaths();
+            virtual QAction *createAction(QObject *parent = Q_NULLPTR, const QString &name = QString()) override;
+            virtual QActionGroup *createActionGroup(QObject *parent = Q_NULLPTR, const QString &name = QString()) override;
+            virtual QLayout *createLayout(const QString &className, QObject *parent = Q_NULLPTR, const QString &name = QString()) override;
+            virtual QWidget *createWidget(const QString &className, QWidget *parent = Q_NULLPTR, const QString &name = QString()) override;
+            QString errorString() const;
+            bool isLanguageChangeEnabled() const;
+            QJSValue load(QFile *device, QJSValue parentWidget);
+            QStringList pluginPaths() const;
+            void setLanguageChangeEnabled(bool enabled);
+            void setWorkingDirectory(const QDir &dir);
+            QDir workingDirectory() const;
+        };
+    }
+}
+Q_DECLARE_METATYPE(QtBindings::UiTools::UiLoader)
+#endif //UITOOLSUILOADER_H
diff --git a/src/scripting/scriptmanager/ScriptItem.cpp b/src/scripting/scriptmanager/ScriptItem.cpp
index 33460b6130..41cfd13bca 100644
--- a/src/scripting/scriptmanager/ScriptItem.cpp
+++ b/src/scripting/scriptmanager/ScriptItem.cpp
@@ -37,6 +37,7 @@
 #include "scripting/scriptengine/AmarokEngineScript.h"
 #include "scripting/scriptengine/AmarokInfoScript.h"
 #include "scripting/scriptengine/AmarokKNotifyScript.h"
+#include "scripting/scriptengine/AmarokLyricsScript.h"
 #include "scripting/scriptengine/AmarokNetworkScript.h"
 #include "scripting/scriptengine/AmarokOSDScript.h"
 #include "scripting/scriptengine/AmarokPlaylistScript.h"
@@ -58,7 +59,7 @@
 #include <QFileInfo>
 #include <QLabel>
 #include <QPushButton>
-#include <QScriptEngine>
+#include <QJSValue>
 #include <QStandardPaths>
 #include <QToolTip>
 
@@ -110,11 +111,13 @@ ScriptItem::ScriptItem( QObject *parent, const QString &name, const QString &pat
 , m_name( name )
 , m_url( QUrl::fromLocalFile( path ) )
 , m_info( info )
+, m_engineResult()
 , m_running( false )
-, m_evaluating( false )
 , m_runningTime( 0 )
 , m_timerId( 0 )
-{}
+{
+    initializeScriptEngine();
+}
 
 void
 ScriptItem::pause()
@@ -122,7 +125,7 @@ ScriptItem::pause()
     DEBUG_BLOCK
     if( !m_engine )
     {
-        warning() << "Script has no script engine attached:" << m_name;
+        warning() << "Script has no engine attached:" << m_name;
         return;
     }
 
@@ -133,12 +136,14 @@ ScriptItem::pause()
         m_popupWidget->deleteLater();
     }
     //FIXME: Sometimes a script can be evaluating and cannot be abort? or can be reevaluating for some reason?
-    if( m_engine->isEvaluating() )
+    /* TODO- interrupted methos is available only from 5.14. Check minimum QT version.
+    if( !m_engine->isInterrupted() )
     {
-        m_engine->abortEvaluation();
+        m_engine->setInterrupted(true);
         m_evaluating = false;
         return;
     }
+    */
     if( m_info.category() == "Scriptable Service" )
         The::scriptableServiceManager()->removeRunningScript( m_name );
 
@@ -151,7 +156,6 @@ ScriptItem::pause()
 
     m_log << QString( "%1 Script ended" ).arg( QTime::currentTime().toString() );
     m_running = false;
-    m_evaluating = false;
 }
 
 QString
@@ -166,7 +170,7 @@ void
 ScriptItem::timerEvent( QTimerEvent* event )
 {
     Q_UNUSED( event )
-    if( m_engine && m_engine->isEvaluating() )
+    if( m_engine &&  running())
     {
         m_runningTime += 100;
         if( m_runningTime >= 5000 )
@@ -195,13 +199,13 @@ ScriptItem::timerEvent( QTimerEvent* event )
 }
 
 QString
-ScriptItem::handleError( QScriptEngine *engine )
+ScriptItem::handleError( QJSValue *result )
 {
     QString errorString = QString( "Script Error: %1 (line: %2)" )
-                          .arg( engine->uncaughtException().toString() )
-                          .arg( engine->uncaughtExceptionLineNumber() );
+                          .arg( result->toString() )
+                          .arg( result->property("lineNumber").toInt() );
     error() << errorString;
-    engine->clearExceptions();
+    //engine->clearExceptions();
     stop();
     return errorString;
 }
@@ -213,28 +217,38 @@ ScriptItem::start( bool silent )
     DEBUG_BLOCK
     //load the wrapper classes
     m_output.clear();
-    initializeScriptEngine();
 
     QFile scriptFile( m_url.path() );
     scriptFile.open( QIODevice::ReadOnly );
     m_running = true;
-    m_evaluating = true;
 
     m_log << QStringLiteral( "%1 Script started" ).arg( QTime::currentTime().toString() );
 
     m_timerId = startTimer( 100 );
     Q_ASSERT( m_engine );
-    m_output << m_engine->evaluate( scriptFile.readAll() ).toString();
+    if (m_qtScriptCompat) {
+        //QTBUG-69408 - const is not supported by ES5. Replace it with 'var'
+        QRegularExpression removeConst(
+                "const ([_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*) *=",
+                QRegularExpression::DotMatchesEverythingOption );
+        m_engineResult = m_engine->evaluate(
+               QString(scriptFile.readAll()).replace( removeConst, "var \\1 =" ),
+                m_name);
+    } else {
+        m_engineResult = m_engine->evaluate(scriptFile.readAll(), m_name);
+    }
+    m_output << m_engineResult.toString();
     debug() << "After Evaluation "<< m_name;
     Q_EMIT evaluated( m_output.join( "\n" ) );
     scriptFile.close();
 
-    if ( m_evaluating )
+    if ( m_running )
     {
-        m_evaluating = false;
-        if ( m_engine->hasUncaughtException() )
+        m_running = false;
+        if ( m_engineResult.isError() )
         {
-            m_log << handleError( m_engine.data() );
+            Q_EMIT signalHandlerException( m_engineResult );
+            m_log << handleError( &m_engineResult );
             if( !silent )
             {
                 debug() << "The Log For the script that is the borked: " << m_log;
@@ -260,9 +274,10 @@ ScriptItem::initializeScriptEngine()
     m_engine = new AmarokScript::AmarokScriptEngine( this );
     connect( m_engine.data(), &AmarokScript::AmarokScriptEngine::deprecatedCall,
              this, &ScriptItem::slotDeprecatedCall );
-    connect( m_engine.data(), &AmarokScript::AmarokScriptEngine::signalHandlerException,
-             this, &ScriptItem::signalHandlerException );
-    m_engine.data()->setProcessEventsInterval( 50 );
+    // TODO - Inspect if possible to implement similar signal
+    //connect( m_engine.data(), &AmarokScript::AmarokScriptEngine::signalHandlerException,
+    //         this, &ScriptItem::signalHandlerException );
+    //m_engine.data()->setProcessEventsInterval( 50 );
     debug() << "starting script engine:" << m_name;
 
     // first create the Amarok global script object
@@ -290,8 +305,11 @@ ScriptItem::initializeScriptEngine()
     AmarokScript::CollectionPrototype::init( m_engine.data() );
     AmarokScript::QueryMakerPrototype::init( m_engine.data() );
 
-    const QString &category = m_info.category();
-    if( category.contains( QLatin1String("Scriptable Service") ) )
+    if ( m_info.category().contains( QLatin1String("Lyrics") ) )
+    {
+        new AmarokScript::AmarokLyricsScript( m_engine.data() );
+    }
+    if ( m_info.category().contains( QLatin1String("Scriptable Service") ) )
     {
         new StreamItem( m_engine.data() );
         m_service = new AmarokScript::ScriptableServiceScript( m_engine.data() );
diff --git a/src/scripting/scriptmanager/ScriptItem.h b/src/scripting/scriptmanager/ScriptItem.h
index 60006f89be..19f35bbb8a 100644
--- a/src/scripting/scriptmanager/ScriptItem.h
+++ b/src/scripting/scriptmanager/ScriptItem.h
@@ -27,13 +27,12 @@
 #include <KPluginInfo>
 #include <QUrl>
 
-#include <QScriptValue>
+#include <QJSValue>
 
 namespace AmarokScript {
     class AmarokScript;
 }
 class ScriptItem;
-class QScriptEngine;
 class QTimerEvent;
 
 class ScriptTerminatorWidget : public PopupWidget
@@ -61,6 +60,7 @@ class ScriptItem : public QObject
     bool running() const { return m_running; }
     QString specPath() const;
     QString output() const { return m_output.join(QStringLiteral("\n")); }
+    QJSValue engineResult() const { return m_engineResult; };
 
     virtual bool start( bool silent );
     virtual void pause();
@@ -78,31 +78,32 @@ private Q_SLOTS:
     void timerEvent( QTimerEvent *event ) override;
 
 Q_SIGNALS:
-    void signalHandlerException(QScriptValue);
+    void signalHandlerException( QJSValue );
     void evaluated( QString output );
     void uninstalled();
 
 protected:
     /**
-     * Initialize QScriptEngine and load wrapper classes
+     * Initialize QJSEngine and load wrapper classes
      */
     virtual void initializeScriptEngine();
-    virtual QString handleError( QScriptEngine *engine );
+    virtual QString handleError( QJSValue *evalReturn );
 
 private:
     QString                                             m_name;
     QUrl                                                m_url;
     KPluginInfo                                         m_info;
-    QPointer<AmarokScript::AmarokScriptEngine>      m_engine;
+    QPointer<AmarokScript::AmarokScriptEngine>          m_engine;
+    QJSValue                                            m_engineResult;
     /** Currently activated in the Script Manager */
     bool                                                m_running;
-    bool                                                m_evaluating;
     QStringList                                         m_log;
-    QPointer<AmarokScript::ScriptableServiceScript> m_service;
+    QPointer<AmarokScript::ScriptableServiceScript>     m_service;
     QStringList                                         m_output;
     int                                                 m_runningTime;
     int                                                 m_timerId;
-    QPointer<ScriptTerminatorWidget>                m_popupWidget;
+    QPointer<ScriptTerminatorWidget>                    m_popupWidget;
+    bool                                                m_qtScriptCompat = true;
 };
 
 #endif /* AMAROK_SCRIPTITEM_H */
diff --git a/src/scripting/scriptmanager/ScriptManager.cpp b/src/scripting/scriptmanager/ScriptManager.cpp
index f612364864..29c2932de0 100644
--- a/src/scripting/scriptmanager/ScriptManager.cpp
+++ b/src/scripting/scriptmanager/ScriptManager.cpp
@@ -36,12 +36,15 @@
 #include "ScriptUpdater.h"
 
 #include <KMessageBox>
+#include <KPluginInfo>
 #include <KPluginMetaData>
 
 #include <QFileInfo>
-#include <QScriptEngine>
+#include <QJSEngine>
+#include <QJsonDocument>
 #include <QStandardPaths>
 #include <QTimer>
+#include <QDir>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -127,6 +130,27 @@ ScriptManager::specForScript( const QString& name ) const
     return m_scripts[name]->specPath();
 }
 
+KPluginMetaData
+ScriptManager::createMetadaFromSpec( const QString &specPath )
+{
+    // KPluginMetaData and KPluginInfo require file suffix to be .desktop. Thus create temporary file with suffix
+    QFile specFile( specPath );
+    QTemporaryFile desktopFile( QDir::tempPath() + "/XXXXXX.desktop" );
+
+    if ( !specFile.open( QIODevice::ReadOnly ) ) {
+        warning() << "Could not read from spec file: " << specPath;
+        return KPluginMetaData();
+    } else if ( !desktopFile.open() ) {
+        warning() << "Could not create temporary .desktop file at " << QDir::tempPath();
+        return KPluginMetaData();
+    }
+
+    QTextStream( &desktopFile ) << QTextStream( &specFile ).readAll();
+    desktopFile.close();
+
+    return KPluginMetaData( desktopFile.fileName() );
+}
+
 bool
 ScriptManager::lyricsScriptRunning() const
 {
@@ -255,15 +279,11 @@ ScriptManager::slotRunScript( const QString &name, bool silent )
 }
 
 void
-ScriptManager::handleException(const QScriptValue& value)
+ScriptManager::handleException(const QJSValue& value)
 {
     DEBUG_BLOCK
 
-    QScriptEngine *engine = value.engine();
-    if (!engine)
-        return;
-
-    Amarok::Logger::longMessage( i18n( "Script error reported by: %1\n%2", scriptNameForEngine( engine ), value.toString() ), Amarok::Logger::Error );
+    Amarok::Logger::longMessage( i18n( "Script error reported by: %1\n%2", value.property("name").toString(), value.property("message").toString() ), Amarok::Logger::Error );
 }
 
 void
@@ -333,13 +353,24 @@ ScriptManager::loadScript( const QString& path )
     QString ScriptVersion;
     QFileInfo info( path );
     const QString jsonPath = QString( "%1/script.json" ).arg( info.path() );
-    if( !QFile::exists( jsonPath ) )
+    const QString specPath = QString( "%1/script.spec" ).arg( info.path() );
+    KPluginMetaData pluginMetadata;
+
+    if( QFile::exists( jsonPath ) )
+    {
+        pluginMetadata = KPluginMetaData( jsonPath );
+    }
+    else if( QFile::exists( specPath ) )
+    {
+        warning() << "Reading legacy spec file: " << specPath;
+        pluginMetadata = createMetadaFromSpec( specPath );
+    }
+    else
     {
         error() << "script.json for "<< path << " is missing!";
         return false;
     }
 
-    KPluginMetaData pluginMetadata( jsonPath );
     if( !pluginMetadata.isValid() )
     {
         error() << "PluginMetaData invalid for" << jsonPath;
@@ -402,7 +433,7 @@ ScriptManager::scripts( const QString &category ) const
 }
 
 QString
-ScriptManager::scriptNameForEngine( const QScriptEngine *engine ) const
+ScriptManager::scriptNameForEngine( const QJSEngine *engine ) const
 {
     foreach( const QString &name, m_scripts.keys() )
     {
diff --git a/src/scripting/scriptmanager/ScriptManager.h b/src/scripting/scriptmanager/ScriptManager.h
index 06e53c05b9..c834c98f43 100644
--- a/src/scripting/scriptmanager/ScriptManager.h
+++ b/src/scripting/scriptmanager/ScriptManager.h
@@ -24,6 +24,7 @@
 #include "ScriptItem.h"
 
 #include <KPluginInfo>
+#include <KPluginMetaData>
 #include <QUrl>
 
 #include <QSemaphore>
@@ -31,8 +32,7 @@
 namespace AmarokScript {
     class AmarokScript;
 }
-class QScriptEngine;
-class QScriptValue;
+class QJSValue;
 
 class AMAROK_EXPORT ScriptManager : public QObject
 {
@@ -41,6 +41,8 @@ class AMAROK_EXPORT ScriptManager : public QObject
     public:
         static ScriptManager* instance();
         static void destroy();
+        /** Reads plugin info from legacy .desktop format */
+        static KPluginMetaData createMetadaFromSpec( const QString &specPath );
 
         /**
          * Runs the script with the given name.
@@ -70,7 +72,7 @@ class AMAROK_EXPORT ScriptManager : public QObject
         /** Returns whether or not there is a lyrics script running */
         bool lyricsScriptRunning() const;
 
-        QString scriptNameForEngine( const QScriptEngine *engine ) const;
+        QString scriptNameForEngine( const QJSEngine *engine ) const;
 
         /** Notifies any running lyric scripts to fetch desired lyric from given URL */
         void notifyFetchLyrics( const QString& artist, const QString& title, const QString& url, const Meta::TrackPtr &track );
@@ -105,7 +107,7 @@ class AMAROK_EXPORT ScriptManager : public QObject
 
     private Q_SLOTS:
         bool slotRunScript( const QString &name, bool silent = false );
-        void handleException( const QScriptValue &value );
+        void handleException( const QJSValue &value );
 
         void updaterFinished( const QString &scriptPath );
         void slotConfigChanged();
diff --git a/src/scripting/scriptmanager/ScriptUpdater.cpp b/src/scripting/scriptmanager/ScriptUpdater.cpp
index 665d695880..ff8bc0a1fc 100644
--- a/src/scripting/scriptmanager/ScriptUpdater.cpp
+++ b/src/scripting/scriptmanager/ScriptUpdater.cpp
@@ -19,6 +19,7 @@
 #include "ScriptUpdater.h"
 
 #include "core/support/Debug.h"
+#include "ScriptManager.h"
 
 #include <KIO/Job>
 #include <KPluginInfo>
@@ -61,7 +62,7 @@ ScriptUpdater::updateScript()
         Q_EMIT finished( m_scriptPath );
         return;
     }
-    KPluginInfo pInfo( specPath );
+    KPluginInfo pInfo = KPluginInfo::fromMetaData( ScriptManager::createMetadaFromSpec( specPath ) );
     if ( !pInfo.isValid() || pInfo.name().isEmpty() || pInfo.version().isEmpty() )
     {
         // invalid or unusable .spec file, can't continue
diff --git a/src/scripting/scripts/librivox_service/script.desktop b/src/scripting/scripts/librivox_service/script.desktop
index b1dae23522..11f2b7810b 100644
--- a/src/scripting/scripts/librivox_service/script.desktop
+++ b/src/scripting/scripts/librivox_service/script.desktop
@@ -14,6 +14,7 @@ Name[el]=Librivox.org
 Name[en_GB]=Librivox.org
 Name[es]=Librivox.org
 Name[et]=Librivox.org
+Name[eu]=Librivox.org
 Name[fi]=Librivox.org
 Name[fr]=Librivox.org
 Name[gl]=Librivox.org
@@ -48,6 +49,7 @@ Comment[el]=Μια υπηρεσία σεναρίων που σας επιτρέ
 Comment[en_GB]=A scripted service that lets you search, stream and download free, public domain, audio books from Librivox.org
 Comment[es]=Un servicio mediante guiones que le permite buscar, transmitir o descargar audio-libros libres, de dominio público desde Librivox.org
 Comment[et]=Skriptiteenus, mis võimaldab otsida, voogesitada ja alla laadida vabu avalikus domeenis asuvaid audioraamatuid Librivox.org-ist
+Comment[eu]=«Librivox.org»etik jabari publikoko audio-liburu askeak, bilatzen, transmititu ahala entzuten eta zama-jaisten uzten dizun script bidezko zerbitzu bat
 Comment[fi]=Skriptattu palvelu, joka mahdollistaa ilmaisten sekä public domainin alaisten äänikirjojen etsimisen, suoratoistamisen ja lataamisen Librivox.orgista
 Comment[fr]=Un service sous forme de script qui vous permet de rechercher, de lire et de télécharger des livres audio libres, du domaine public.
 Comment[gl]=Un servizo compatíbel con scripts que permite buscar, emitir e descargar libros de son libres, no dominio público, desde Librivox.org.
diff --git a/src/scripting/scripts/radio_station_service/main.js b/src/scripting/scripts/radio_station_service/main.js
index a0060c38c9..279c42ab4e 100644
--- a/src/scripting/scripts/radio_station_service/main.js
+++ b/src/scripting/scripts/radio_station_service/main.js
@@ -34,25 +34,13 @@ function Station( name, url )
 var stationArray = new Array (
     new Station( "Afterhours.FM [Trance/Livesets]",                     "http://www.ah.fm/192k.m3u" ),
     new Station( "Bassdrive [Drum \'n Bass]",                           "http://www.bassdrive.com/v2/streams/BassDrive.pls" ),
-    new Station( "Bluemars [Ambient/Space-Music]",                      "http://207.200.96.225:8020/listen.pls" ),
-    new Station( "Digitally Imported - Chillout [Chill-Out]",           "http://di.fm/mp3/classictechno.pls" ),
-    new Station( "Digitally Imported - Classic Techno [Techno]",        "http://di.fm/mp3/classictechno.pls" ),
-    new Station( "Digitally Imported - Trance [Trance]",                "http://di.fm/mp3/trance.pls" ),
-    new Station( "Frequence 3 [Pop]",                                   "http://streams.frequence3.net/hd-mp3.m3u" ),
-    new Station( "Radio GFM - Electro [Electro]",                       "http://streams.radio-gfm.net/electro.ogg.m3u" ),
-    new Station( "Radio GFM - Metal [Metal]",                           "http://streams.radio-gfm.net/metal.ogg.m3u" ),
-    new Station( "Radio GFM - RockPop [Rock/Pop]",                      "http://streams.radio-gfm.net/rockpop.ogg.m3u" ),
+    new Station( "Digitally Imported - Chillout [Chill-Out]",           "http://listen.di.fm/public3/chillout.pls" ),
+    new Station( "Digitally Imported - Classic Techno [Techno]",        "http://listen.di.fm/public3/classictechno.pls" ),
+    new Station( "Digitally Imported - Trance [Trance]",                "http://listen.di.fm/public3/trance.pls" ),
     new Station( "Kohina [Computer-Music]",                             "http://www.kohina.com/kohinasolanum.m3u" ),
-    new Station( "Mostly Classical [Classical]",                        "http://www.sky.fm/mp3/classical.pls" ),
-    new Station( "MTH.Electro [Minimal Techno]",                        "http://www.shouted.fm/tunein/electro-dsl.m3u" ),
-    new Station( "MTH.House [House]",                                   "http://stream.mth-house.de:8500/listen.pls" ),
-    new Station( "Nectarine Demoscene Radio [Computer-Music]",          "http://de.scenemusic.net/necta192.mp3.m3u" ),
-    new Station( "Proton Radio [House/Dance]",                          "http://protonradio.com/proton.m3u" ),
-    new Station( "Psyradio [Progressive Psytrance]",                    "http://streamer.psyradio.org:8010/" ),
+    new Station( "Proton Radio [House/Dance]",                          "https://www.protonradio.com/proton.m3u" ),
     new Station( "Radio Paradise [Rock/Pop/Alternative]",               "http://www.radioparadise.com/musiclinks/rp_128.m3u" ),
-    new Station( "Raggakings [Reggae]",                                 "http://www.raggakings.net/listen.m3u" ),
     new Station( "SLAY Radio [C64 Remixes]",                            "http://www.slayradio.org/tune_in.php/128kbps/listen.m3u" ),
-    new Station( "NPR All Songs Considered 24/7",                       "http://npr.ic.llnwd.net/stream/npr_music2.pls" ),
     new Station( "SomaFM - Drone Zone [Ambient]",                       "http://somafm.com/dronezone.pls" ),
     new Station( "SomaFM - Groove Salad [Chill-Out]",                   "http://somafm.com/groovesalad.pls" ),
     new Station( "SomaFM - Indie Pop Rocks [Indie]",                    "http://somafm.com/indiepop.pls" ),
diff --git a/src/scripting/scripts/radio_station_service/script.desktop b/src/scripting/scripts/radio_station_service/script.desktop
index b0cd165366..4a97ef741c 100644
--- a/src/scripting/scripts/radio_station_service/script.desktop
+++ b/src/scripting/scripts/radio_station_service/script.desktop
@@ -14,6 +14,7 @@ Name[el]=Χαλαρές ροές
 Name[en_GB]=Cool Streams
 Name[es]=Cool Streams
 Name[et]=Lahedad vood
+Name[eu]=Cool Streams
 Name[fi]=Siistit suoratoistot
 Name[fr]=Flux sympathiques
 Name[gl]=Emisións xeniais
@@ -39,8 +40,8 @@ Name[x-test]=xxCool Streamsxx
 Name[zh_TW]=Cool Streams
 Comment=A script that sets up a service with a few cool internet radio stations
 Comment[bs]=Skripta koja postavlja uslugu sa nekoliko odličnih radio stanica.
-Comment[ca]=Un script que configura un servei amb diverses estacions de ràdio per Internet interessants
-Comment[ca@valencia]=Un script que configura un servei amb diverses estacions de ràdio per Internet interessants
+Comment[ca]=Un script que configura un servei amb diverses estacions de ràdio interessants per Internet
+Comment[ca@valencia]=Un script que configura un servei amb diverses estacions de ràdio interessants per Internet
 Comment[cs]=Skvělé proudy
 Comment[da]=Et script som sætter en tjeneste op med nogle få fede internet-radioer
 Comment[de]=Ein Skript, das einen Dienst mit einigen coolen Internet-Radiostationen einrichtet
@@ -48,6 +49,7 @@ Comment[el]=Σενάριο που ρυθμίζει μια υπηρεσία με
 Comment[en_GB]=A script that sets up a service with a few cool internet radio stations
 Comment[es]=Un guion que configura un servicio con unas pocas emisoras de radio de Internet interesantes
 Comment[et]=Skript, mis paneb paika teenuse mitme laheda internetis tegutseva raadiojaamaga
+Comment[eu]=Internet bidezko irrati-etxe atsegin batzuekin zerbitzu bat ezartzen duen script bat
 Comment[fi]=Skripti, joka tarjoaa muutamia siistejä internet-radioasemia
 Comment[fr]=Un script qui paramètre un service doté de quelques stations de radio sympathiques
 Comment[gl]=Un script que configura un servizo con algunhas estacións de radio de Internet xeniais.
diff --git a/src/scripting/scripts/script_console/script.desktop b/src/scripting/scripts/script_console/script.desktop
index d48df382ed..95985927d3 100644
--- a/src/scripting/scripts/script_console/script.desktop
+++ b/src/scripting/scripts/script_console/script.desktop
@@ -14,6 +14,7 @@ Name[el]=Κονσόλα σεναρίων του Amarok
 Name[en_GB]=Amarok Script Console
 Name[es]=Consola de guiones de Amarok
 Name[et]=Amaroki skriptikonsool
+Name[eu]=Amarok-en script-en kontsola
 Name[fi]=Amarok-skriptikonsoli
 Name[fr]=Console de script d'Amarok
 Name[gl]=Consola de scripting de Amarok
@@ -48,6 +49,7 @@ Comment[el]=Κονσόλα σεναρίων του Amarok
 Comment[en_GB]=Amarok Script Console
 Comment[es]=Consola de guiones de Amarok
 Comment[et]=Amaroki skriptikonsool
+Comment[eu]=Amarok-en script-en kontsola
 Comment[fi]=Amarok-skriptikonsoli
 Comment[fr]=Console de script d'Amarok
 Comment[gl]=Consola de scripting de Amarok
diff --git a/src/services/gpodder/amarok_service_gpodder_config.desktop b/src/services/gpodder/amarok_service_gpodder_config.desktop
index fb6a7b649a..f149c2d88e 100644
--- a/src/services/gpodder/amarok_service_gpodder_config.desktop
+++ b/src/services/gpodder/amarok_service_gpodder_config.desktop
@@ -19,6 +19,7 @@ Name[el]=Διαμόρφωση της υπηρεσίας gpodder.net
 Name[en_GB]=gpodder.net Service Config
 Name[es]=Configuración del servicio gpodder.net
 Name[et]=gpodder.net-i teenuse seadistamine
+Name[eu]=gpodder.net zerbitzariaren konfigurazioa
 Name[fi]=gpodder.net-palvelumääritykset
 Name[fr]=Configuration du service « gpodder.net »
 Name[ga]=Cumraíocht Sheirbhís gpodder.net
@@ -60,6 +61,7 @@ Comment[el]=Διαμόρφωση διαπιστευτηρίων gpodder.net
 Comment[en_GB]=Configure gpodder.net Credentials
 Comment[es]=Configurar credenciales de gpodder.net
 Comment[et]=gpodder.net-i kasutajatunnuste määramine
+Comment[eu]=Konfiguratu «gpodder.net»en egiaztagiriak
 Comment[fi]=Määritä gpodder.net-palvelun tilitiedot
 Comment[fr]=Configuration des identifiants « gpodder.net »
 Comment[ga]=Cumraigh dintiúir gpodder.net
diff --git a/src/services/magnatune/amarok_service_magnatunestore_config.desktop b/src/services/magnatune/amarok_service_magnatunestore_config.desktop
index 9ccdd4a19a..19ac3bb3ef 100644
--- a/src/services/magnatune/amarok_service_magnatunestore_config.desktop
+++ b/src/services/magnatune/amarok_service_magnatunestore_config.desktop
@@ -73,7 +73,7 @@ Comment[en_GB]=Configure Magnatune store settings and memberships credentials
 Comment[eo]=Agordas Magnatune vendejajn preferojn kaj membrecajn akreditaĵojn.
 Comment[es]=Configurar preferencias de almacenamiento y credenciales de miembro de Magnatune
 Comment[et]=Magnatune kaupluse seadistuste ja liikmesuse määramine
-Comment[eu]=Konfiguratu Magnatune dendako ezarpenak eta kideen kredentzialak
+Comment[eu]=Konfiguratu Magnatune dendako ezarpenak eta kideen egiaztagiriak
 Comment[fi]=Määritä Magnatunen asetukset ja jäsenyystiedot
 Comment[fr]=Configurer les paramètres de la boutique « Magnatune » et les identifiants de membre
 Comment[ga]=Cumraigh socruithe siopa Magnatune agus do chuid dintiúr
diff --git a/src/services/mp3tunes/amarok_service_mp3tunes_config.desktop b/src/services/mp3tunes/amarok_service_mp3tunes_config.desktop
index 8185309013..e15d792bc2 100644
--- a/src/services/mp3tunes/amarok_service_mp3tunes_config.desktop
+++ b/src/services/mp3tunes/amarok_service_mp3tunes_config.desktop
@@ -67,7 +67,7 @@ Comment[en_GB]=Configure mp3tunes credentials
 Comment[eo]=Agordi mp3tunes akreditaĵojn.
 Comment[es]=Configurar credenciales de mp3tunes
 Comment[et]=Mp3Tunesi kasutajatunnuste määramine
-Comment[eu]=Konfiguratu mp3tunes-en kredentzialak
+Comment[eu]=Konfiguratu mp3tunes-en egiaztagiriak
 Comment[fi]=Määritä Mp3tunes-palvelun tilitiedot
 Comment[fr]=Configuration des identifiants « MP3tunes »
 Comment[ga]=Cumraíocht dintiúir MP3tunes
diff --git a/src/widgets/PrettyTreeDelegate.cpp b/src/widgets/PrettyTreeDelegate.cpp
index 4cf4d08d54..d4973b7657 100644
--- a/src/widgets/PrettyTreeDelegate.cpp
+++ b/src/widgets/PrettyTreeDelegate.cpp
@@ -34,6 +34,8 @@
 #include <QPainter>
 #include <QTreeView>
 #include <QHeaderView>
+#include <scripting/scriptengine/qtbindings/CoreTextCodec.h>
+
 
 Q_DECLARE_METATYPE( QAction* )
 Q_DECLARE_METATYPE( QList<QAction*> )
diff --git a/src/widgets/Token.cpp b/src/widgets/Token.cpp
index c87216dcda..d97a2b7475 100644
--- a/src/widgets/Token.cpp
+++ b/src/widgets/Token.cpp
@@ -228,14 +228,12 @@ Token::performDrag()
     if( stacked )
         hide();
 
-    Token *token = this;
-
     QDrag *drag = new QDrag( this );
     drag->setMimeData( mimeData() );
 
     // icon for pointer
-    QPixmap pixmap( token->size() );
-    token->render( &pixmap );
+    QPixmap pixmap( size() );
+    render( &pixmap );
     drag->setPixmap( pixmap );
     drag->setHotSpot ( pixmap.rect().center() );
 
@@ -244,7 +242,8 @@ Token::performDrag()
     if( dropAction != Qt::MoveAction && dropAction != Qt::CopyAction ) // dragged out and not just dragged to another position.
     {
         // TODO: nice poof animation? ;-)
-        token->deleteLater();
+        Q_EMIT removed( this );
+        deleteLater();
     }
 
 }
diff --git a/src/widgets/Token.h b/src/widgets/Token.h
index 768ee35175..b21fc9676a 100644
--- a/src/widgets/Token.h
+++ b/src/widgets/Token.h
@@ -76,6 +76,7 @@ class Token : public QWidget
 
     Q_SIGNALS:
         void changed();
+        void removed( Token *token );
 
         /** Emitted when the token get's the focus */
         void gotFocus( Token* thisToken );
diff --git a/src/widgets/TokenDropTarget.cpp b/src/widgets/TokenDropTarget.cpp
index 68e13963dc..8a88a985fe 100644
--- a/src/widgets/TokenDropTarget.cpp
+++ b/src/widgets/TokenDropTarget.cpp
@@ -92,7 +92,7 @@ TokenDropTarget::clear()
 {
     QList< Token *> allTokens = tokensAtRow();
     foreach( Token* token, allTokens )
-        delete token;
+        token->deleteLater();;
 
     Q_EMIT changed();
 }
@@ -206,9 +206,9 @@ TokenDropTarget::insertToken( Token *token, int row, int col )
 
     connect( token, &Token::changed, this, &TokenDropTarget::changed );
     connect( token, &Token::gotFocus, this, &TokenDropTarget::tokenSelected );
-    connect( token, &Token::changed, this, &TokenDropTarget::deleteEmptyRows );
+    connect( token, &Token::removed, this, &TokenDropTarget::deleteEmptyRows );
 
-    Q_EMIT changed();
+    emit changed();
 }
 
 
diff --git a/tests/qt-modeltest/modeltest.cpp b/tests/qt-modeltest/modeltest.cpp
deleted file mode 100644
index cac139b067..0000000000
--- a/tests/qt-modeltest/modeltest.cpp
+++ /dev/null
@@ -1,523 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2007 Trolltech ASA. All rights reserved.
-**
-** This file is part of the Qt Concurrent project on Trolltech Labs.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales@trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include <QtGui>
-
-#include "modeltest.h"
-
-Q_DECLARE_METATYPE(QModelIndex)
-
-/*!
-    Connect to all of the models signals.  Whenever anything happens recheck everything.
-*/
-ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(parent), model(_model), fetchingMore(false)
-{
-    Q_ASSERT(model);
-
-    connect(model, &QAbstractItemModel::columnsAboutToBeInserted, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::columnsAboutToBeRemoved, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::columnsInserted, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::columnsRemoved, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::dataChanged, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::headerDataChanged, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::modelReset, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::rowsAboutToBeInserted, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::rowsInserted, this, &ModelTest::runAllTests);
-    connect(model, &QAbstractItemModel::rowsRemoved, this, &ModelTest::runAllTests);
-
-    // Special checks for inserting/removing
-    connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::layoutAboutToBeChanged);
-    connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::layoutChanged);
-
-    connect(model, &QAbstractItemModel::rowsAboutToBeInserted, this, &ModelTest::rowsAboutToBeInserted);
-    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ModelTest::rowsAboutToBeRemoved);
-    connect(model, &QAbstractItemModel::rowsInserted, this, &ModelTest::rowsInserted);
-    connect(model, &QAbstractItemModel::rowsRemoved, this, &ModelTest::rowsRemoved);
-
-    runAllTests();
-}
-
-void ModelTest::runAllTests()
-{
-    if (fetchingMore)
-        return;
-    nonDestructiveBasicTest();
-    rowCount();
-    columnCount();
-    hasIndex();
-    index();
-    parent();
-    data();
-}
-
-/*!
-    nonDestructiveBasicTest tries to call a number of the basic functions (not all)
-    to make sure the model doesn't outright segfault, testing the functions that makes sense.
-*/
-void ModelTest::nonDestructiveBasicTest()
-{
-    Q_ASSERT(model->buddy(QModelIndex()) == QModelIndex());
-    model->canFetchMore(QModelIndex());
-    Q_ASSERT(model->columnCount(QModelIndex()) >= 0);
-    Q_ASSERT(model->data(QModelIndex()) == QVariant());
-    fetchingMore = true;
-    model->fetchMore(QModelIndex());
-    fetchingMore = false;
-    Qt::ItemFlags flags = model->flags(QModelIndex());
-    Q_ASSERT(flags == Qt::ItemIsDropEnabled || flags == 0);
-    model->hasChildren(QModelIndex());
-    model->hasIndex(0, 0);
-    model->headerData(0, Qt::Horizontal);
-    model->index(0, 0);
-    Q_ASSERT(model->index(-1, -1) == QModelIndex());
-    model->itemData(QModelIndex());
-    QVariant cache;
-    model->match(QModelIndex(), -1, cache);
-    model->mimeTypes();
-    Q_ASSERT(model->parent(QModelIndex()) == QModelIndex());
-    Q_ASSERT(model->rowCount() >= 0);
-    QVariant variant;
-    model->setData(QModelIndex(), variant, -1);
-    model->setHeaderData(-1, Qt::Horizontal, QVariant());
-    model->setHeaderData(0, Qt::Horizontal, QVariant());
-    model->setHeaderData(999999, Qt::Horizontal, QVariant());
-    QMap<int, QVariant> roles;
-    model->sibling(0, 0, QModelIndex());
-    model->span(QModelIndex());
-    model->supportedDropActions();
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren()
-
-    Models that are dynamically populated are not as fully tested here.
- */
-void ModelTest::rowCount()
-{
-    // check top row
-    QModelIndex topIndex = model->index(0, 0, QModelIndex());
-    int rows = model->rowCount(topIndex);
-    Q_ASSERT(rows >= 0);
-    if (rows > 0)
-        Q_ASSERT(model->hasChildren(topIndex) == true);
-
-    QModelIndex secondLevelIndex = model->index(0, 0, topIndex);
-    if (secondLevelIndex.isValid()) { // not the top level
-        // check a row count where parent is valid
-        rows = model->rowCount(secondLevelIndex);
-        Q_ASSERT(rows >= 0);
-        if (rows > 0)
-            Q_ASSERT(model->hasChildren(secondLevelIndex) == true);
-    }
-
-    // The models rowCount() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren()
- */
-void ModelTest::columnCount()
-{
-    // check top row
-    QModelIndex topIndex = model->index(0, 0, QModelIndex());
-    Q_ASSERT(model->columnCount(topIndex) >= 0);
-
-    // check a column count where parent is valid
-    QModelIndex childIndex = model->index(0, 0, topIndex);
-    if (childIndex.isValid())
-        Q_ASSERT(model->columnCount(childIndex) >= 0);
-
-    // columnCount() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::hasIndex()
- */
-void ModelTest::hasIndex()
-{
-    // Make sure that invalid values returns an invalid index
-    Q_ASSERT(model->hasIndex(-2, -2) == false);
-    Q_ASSERT(model->hasIndex(-2, 0) == false);
-    Q_ASSERT(model->hasIndex(0, -2) == false);
-
-    int rows = model->rowCount();
-    int columns = model->columnCount();
-
-    // check out of bounds
-    Q_ASSERT(model->hasIndex(rows, columns) == false);
-    Q_ASSERT(model->hasIndex(rows + 1, columns + 1) == false);
-
-    if (rows > 0)
-        Q_ASSERT(model->hasIndex(0, 0) == true);
-
-    // hasIndex() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::index()
- */
-void ModelTest::index()
-{
-    // Make sure that invalid values returns an invalid index
-    Q_ASSERT(model->index(-2, -2) == QModelIndex());
-    Q_ASSERT(model->index(-2, 0) == QModelIndex());
-    Q_ASSERT(model->index(0, -2) == QModelIndex());
-
-    int rows = model->rowCount();
-    int columns = model->columnCount();
-
-    if (rows == 0)
-        return;
-
-    // Catch off by one errors
-    Q_ASSERT(model->index(rows, columns) == QModelIndex());
-    Q_ASSERT(model->index(0, 0).isValid() == true);
-
-    // Make sure that the same index is *always* returned
-    QModelIndex a = model->index(0, 0);
-    QModelIndex b = model->index(0, 0);
-    Q_ASSERT(a == b);
-
-    // index() is tested more extensively in checkChildren(),
-    // but this catches the big mistakes
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::parent()
- */
-void ModelTest::parent()
-{
-    // Make sure the model wont crash and will return an invalid QModelIndex
-    // when asked for the parent of an invalid index.
-    Q_ASSERT(model->parent(QModelIndex()) == QModelIndex());
-
-    if (model->rowCount() == 0)
-        return;
-
-    // Column 0                | Column 1    |
-    // QModelIndex()           |             |
-    //    \- topIndex          | topIndex1   |
-    //         \- childIndex   | childIndex1 |
-
-    // Common error test #1, make sure that a top level index has a parent
-    // that is a invalid QModelIndex.
-    QModelIndex topIndex = model->index(0, 0, QModelIndex());
-    Q_ASSERT(model->parent(topIndex) == QModelIndex());
-
-    // Common error test #2, make sure that a second level index has a parent
-    // that is the first level index.
-    if (model->rowCount(topIndex) > 0) {
-        QModelIndex childIndex = model->index(0, 0, topIndex);
-        Q_ASSERT(model->parent(childIndex) == topIndex);
-    }
-
-    // Common error test #3, the second column should NOT have the same children
-    // as the first column in a row.
-    // Usually the second column shouldn't have children.
-    QModelIndex topIndex1 = model->index(0, 1, QModelIndex());
-    if (model->rowCount(topIndex1) > 0) {
-        QModelIndex childIndex = model->index(0, 0, topIndex);
-        QModelIndex childIndex1 = model->index(0, 0, topIndex1);
-        Q_ASSERT(childIndex != childIndex1);
-    }
-
-    // Full test, walk n levels deep through the model making sure that all
-    // parent's children correctly specify their parent.
-    checkChildren(QModelIndex());
-}
-
-/*!
-    Called from the parent() test.
-
-    A model that returns an index of parent X should also return X when asking
-    for the parent of the index.
-
-    This recursive function does pretty extensive testing on the whole model in an
-    effort to catch edge cases.
-
-    This function assumes that rowCount(), columnCount() and index() already work.
-    If they have a bug it will point it out, but the above tests should have already
-    found the basic bugs because it is easier to figure out the problem in
-    those tests then this one.
- */
-void ModelTest::checkChildren(const QModelIndex &parent, int currentDepth)
-{
-    // First just try walking back up the tree.
-    QModelIndex p = parent;
-    while (p.isValid())
-        p = p.parent();
-
-    // For models that are dynamically populated
-    if (model->canFetchMore(parent)) {
-        fetchingMore = true;
-        model->fetchMore(parent);
-        fetchingMore = false;
-    }
-
-    int rows = model->rowCount(parent);
-    int columns = model->columnCount(parent);
-
-    if (rows > 0)
-        Q_ASSERT(model->hasChildren(parent));
-
-    // Some further testing against rows(), columns(), and hasChildren()
-    Q_ASSERT(rows >= 0);
-    Q_ASSERT(columns >= 0);
-    if (rows > 0)
-        Q_ASSERT(model->hasChildren(parent) == true);
-
-    //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows
-    //         << "columns:" << columns << "parent column:" << parent.column();
-
-    Q_ASSERT(model->hasIndex(rows + 1, 0, parent) == false);
-    for (int r = 0; r < rows; ++r) {
-        if (model->canFetchMore(parent)) {
-            fetchingMore = true;
-            model->fetchMore(parent);
-            fetchingMore = false;
-        }
-        Q_ASSERT(model->hasIndex(r, columns + 1, parent) == false);
-        for (int c = 0; c < columns; ++c) {
-            Q_ASSERT(model->hasIndex(r, c, parent) == true);
-            QModelIndex index = model->index(r, c, parent);
-            // rowCount() and columnCount() said that it existed...
-            Q_ASSERT(index.isValid() == true);
-
-            // index() should always return the same index when called twice in a row
-            QModelIndex modifiedIndex = model->index(r, c, parent);
-            Q_ASSERT(index == modifiedIndex);
-
-            // Make sure we get the same index if we request it twice in a row
-            QModelIndex a = model->index(r, c, parent);
-            QModelIndex b = model->index(r, c, parent);
-            Q_ASSERT(a == b);
-
-            // Some basic checking on the index that is returned
-            Q_ASSERT(index.model() == model);
-            Q_ASSERT(index.row() == r);
-            Q_ASSERT(index.column() == c);
-            // While you can technically return a QVariant usually this is a sign
-            // of an bug in data()  Disable if this really is ok in your model.
-            //Q_ASSERT(model->data(index, Qt::DisplayRole).isValid() == true);
-
-            // If the next test fails here is some somewhat useful debug you play with.
-            /*
-            if (model->parent(index) != parent) {
-                qDebug() << r << c << currentDepth << model->data(index).toString()
-                         << model->data(parent).toString();
-                qDebug() << index << parent << model->parent(index);
-                // And a view that you can even use to show the model.
-                //QTreeView view;
-                //view.setModel(model);
-                //view.show();
-            }*/
-
-            // Check that we can get back our real parent.
-            QModelIndex p = model->parent(index);
-            //qDebug() << "child:" << index;
-            //qDebug() << p;
-            //qDebug() << parent;
-            Q_ASSERT(model->parent(index) == parent);
-
-            // recursively go down the children
-            if (model->hasChildren(index) && currentDepth < 10 ) {
-                //qDebug() << r << c << "has children" << model->rowCount(index);
-                checkChildren(index, ++currentDepth);
-            }/* else { if (currentDepth >= 10) qDebug() << "checked 10 deep"; };*/
-
-            // make sure that after testing the children that the index doesn't change.
-            QModelIndex newerIndex = model->index(r, c, parent);
-            Q_ASSERT(index == newerIndex);
-        }
-    }
-}
-
-/*!
-    Tests model's implementation of QAbstractItemModel::data()
- */
-void ModelTest::data()
-{
-    // Invalid index should return an invalid qvariant
-    Q_ASSERT(!model->data(QModelIndex()).isValid());
-
-    if (model->rowCount() == 0)
-        return;
-
-    // A valid index should have a valid QVariant data
-    Q_ASSERT(model->index(0, 0).isValid());
-
-    // shouldn't be able to set data on an invalid index
-    Q_ASSERT(model->setData(QModelIndex(), QLatin1String("foo"), Qt::DisplayRole) == false);
-
-    // General Purpose roles that should return a QString
-    QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
-    if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
-    }
-    variant = model->data(model->index(0, 0), Qt::StatusTipRole);
-    if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
-    }
-    variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
-    if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
-    }
-
-    // General Purpose roles that should return a QSize
-    variant = model->data(model->index(0, 0), Qt::SizeHintRole);
-    if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QSize>(variant));
-    }
-
-    // General Purpose roles that should return a QFont
-    QVariant fontVariant = model->data(model->index(0, 0), Qt::FontRole);
-    if (fontVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QFont>(fontVariant));
-    }
-
-    // Check that the alignment is one we know about
-    QVariant textAlignmentVariant = model->data(model->index(0, 0), Qt::TextAlignmentRole);
-    if (textAlignmentVariant.isValid()) {
-        int alignment = textAlignmentVariant.toInt();
-        Q_ASSERT(alignment == Qt::AlignLeft ||
-                 alignment == Qt::AlignRight ||
-                 alignment == Qt::AlignHCenter ||
-                 alignment == Qt::AlignJustify ||
-                 alignment == Qt::AlignTop ||
-                 alignment == Qt::AlignBottom ||
-                 alignment == Qt::AlignVCenter ||
-                 alignment == Qt::AlignCenter ||
-                 alignment == Qt::AlignAbsolute ||
-                 alignment == Qt::AlignLeading ||
-                 alignment == Qt::AlignTrailing);
-    }
-
-    // General Purpose roles that should return a QColor
-    QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole);
-    if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
-    }
-
-    colorVariant = model->data(model->index(0, 0), Qt::TextColorRole);
-    if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
-    }
-
-    // Check that the "check state" is one we know about.
-    QVariant checkStateVariant = model->data(model->index(0, 0), Qt::CheckStateRole);
-    if (checkStateVariant.isValid()) {
-        int state = checkStateVariant.toInt();
-        Q_ASSERT(state == Qt::Unchecked ||
-                 state == Qt::PartiallyChecked ||
-                 state == Qt::Checked);
-    }
-}
-
-/*!
-    Store what is about to be inserted to make sure it actually happens
-
-    \sa rowsInserted()
- */
-void ModelTest::rowsAboutToBeInserted(const QModelIndex &parent, int start, int end)
-{
-    Q_UNUSED(end);
-    Changing c;
-    c.parent = parent;
-    c.oldSize = model->rowCount(parent);
-    c.last = model->data(model->index(start - 1, 0, parent));
-    c.next = model->data(model->index(start, 0, parent));
-    insert.push(c);
-}
-
-/*!
-    Confirm that what was said was going to happen actually did
-
-    \sa rowsAboutToBeInserted()
- */
-void ModelTest::rowsInserted(const QModelIndex & parent, int start, int end)
-{
-    Changing c = insert.pop();
-    Q_ASSERT(c.parent == parent);
-    Q_ASSERT(c.oldSize + (end - start + 1) == model->rowCount(parent));
-    Q_ASSERT(c.last == model->data(model->index(start - 1, 0, c.parent)));
-    /*
-    if (c.next != model->data(model->index(end + 1, 0, c.parent))) {
-        qDebug() << start << end;
-        for (int i=0; i < model->rowCount(); ++i)
-            qDebug() << model->index(i, 0).data().toString();
-        qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent));
-    }
-    */
-    Q_ASSERT(c.next == model->data(model->index(end + 1, 0, c.parent)));
-}
-
-void ModelTest::layoutAboutToBeChanged()
-{
-    for (int i = 0; i < qBound(0, model->rowCount(), 100); ++i)
-        changing.append(QPersistentModelIndex(model->index(i, 0)));
-}
-
-void ModelTest::layoutChanged()
-{
-    for (int i = 0; i < changing.count(); ++i) {
-        QPersistentModelIndex p = changing[i];
-        Q_ASSERT(p == model->index(p.row(), p.column(), p.parent()));
-    }
-    changing.clear();
-}
-
-/*!
-    Store what is about to be inserted to make sure it actually happens
-
-    \sa rowsRemoved()
- */
-void ModelTest::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
-{
-    Changing c;
-    c.parent = parent;
-    c.oldSize = model->rowCount(parent);
-    c.last = model->data(model->index(start - 1, 0, parent));
-    c.next = model->data(model->index(end + 1, 0, parent));
-    remove.push(c);
-}
-
-/*!
-    Confirm that what was said was going to happen actually did
-
-    \sa rowsAboutToBeRemoved()
- */
-void ModelTest::rowsRemoved(const QModelIndex & parent, int start, int end)
-{
-    Changing c = remove.pop();
-    Q_ASSERT(c.parent == parent);
-    Q_ASSERT(c.oldSize - (end - start + 1) == model->rowCount(parent));
-    Q_ASSERT(c.last == model->data(model->index(start - 1, 0, c.parent)));
-    Q_ASSERT(c.next == model->data(model->index(start, 0, c.parent)));
-}
-
diff --git a/tests/qt-modeltest/modeltest.h b/tests/qt-modeltest/modeltest.h
deleted file mode 100644
index 3424dcabb4..0000000000
--- a/tests/qt-modeltest/modeltest.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2007 Trolltech ASA. All rights reserved.
-**
-** This file is part of the Qt Concurrent project on Trolltech Labs.
-**
-** This file may be used under the terms of the GNU General Public
-** License version 2.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of
-** this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-** http://www.trolltech.com/products/qt/opensource.html
-**
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://www.trolltech.com/products/qt/licensing.html or contact the
-** sales department at sales@trolltech.com.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef MODELTEST_H
-#define MODELTEST_H
-
-#include <QObject>
-#include <QAbstractItemModel>
-#include <QStack>
-
-class ModelTest : public QObject
-{
-    Q_OBJECT
-
-public:
-    ModelTest(QAbstractItemModel *model, QObject *parent = nullptr);
-
-private Q_SLOTS:
-    void nonDestructiveBasicTest();
-    void rowCount();
-    void columnCount();
-    void hasIndex();
-    void index();
-    void parent();
-    void data();
-
-protected Q_SLOTS:
-    void runAllTests();
-    void layoutAboutToBeChanged();
-    void layoutChanged();
-    void rowsAboutToBeInserted(const QModelIndex &parent, int start, int end);
-    void rowsInserted(const QModelIndex & parent, int start, int end);
-    void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end);
-    void rowsRemoved(const QModelIndex & parent, int start, int end);
-
-private:
-    void checkChildren(const QModelIndex &parent, int currentDepth = 0);
-
-    QAbstractItemModel *model;
-
-    struct Changing
-    {
-        QModelIndex parent;
-        int oldSize;
-        QVariant last;
-        QVariant next;
-    };
-    QStack<Changing> insert;
-    QStack<Changing> remove;
-
-    bool fetchingMore;
-
-    QList<QPersistentModelIndex> changing;
-};
-
-#endif