Merge remote-tracking branch 'wasted-audio/master'

INSTALL

@@ -21,7 +21,7 @@ development packages) installed:
   * lilv
   * PortAudio
   * PortMidi
-  * qt4
+  * qt5
   * serd
   * sord
   * sratom

configure

@@ -47,7 +47,7 @@ def main():
                       help="Install directory for synthclone plugins")
     parser.add_option("--prefix", action="store", default=None, dest="prefix",
                       help="Install prefix")
-    parser.add_option("--qmake", action="store", default="qmake-qt5", dest="qmake",
+    parser.add_option("--qmake", action="store", default="qmake", dest="qmake",
                       help="location of Qt5 qmake executable")
     parser.add_option("--skip-api-docs", action="store", default=0,
                       dest="skipAPIDocs", help="Don't build API documentation",

src/plugins/lv2/effectview.cpp

@@ -312,7 +312,7 @@ unsigned int
 EffectView::getSupportQuality(const QString &widgetTypeURI)
 {
     QByteArray bytes = widgetTypeURI.toLatin1();
-    return suil_ui_supported(LV2_UI__Qt4UI, bytes.constData());
+    return suil_ui_supported(LV2_UI__Qt5UI, bytes.constData());
 }
 
 void
@@ -551,7 +551,7 @@ EffectView::setViewData(const EffectViewData &data)
         LV2_Feature *featurePtrs[2];
         featurePtrs[0] = &parentFeature;
         featurePtrs[1] = 0;
-        instance = suil_instance_new(host, this, LV2_UI__Qt4UI,
+        instance = suil_instance_new(host, this, LV2_UI__Qt5UI,
                                      pluginURIBytes.constData(),
                                      widgetURIBytes.constData(),
                                      widgetTypeURIBytes.constData(),
@@ -577,7 +577,7 @@ EffectView::setViewData(const EffectViewData &data)
         // that are unparented.  If the containers are reparented, they don't
         // work.  Later versions will reparent the widget.  So, if we find a
         // QX11EmbedContainer without a parent, we just use the generic UI.
-//FIXME: Qt5 is handled differently in suil 
+//FIXME: Qt5 is handled differently in suil
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
         QX11EmbedContainer *container =
             qobject_cast<QX11EmbedContainer *>(instanceUI);

templates/debian/control

@@ -6,7 +6,7 @@ Build-Depends: doc-base,
  doxygen,
  python,
  libsamplerate0-dev,
- libqt4-dev,
+ libqt5-dev,
  libsndfile1-dev,
  libarchive-dev,
  libjack-dev,