Improve installer, fix deprecations (#88)

psifidotos · Feb 23, 2020 · 759eb3f · 759eb3f
1 parent a9a2c0f
commit 759eb3f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/install.sh b/install.sh
@@ -2,6 +2,6 @@ if ! [ -a build ] ; then
     mkdir build
 fi
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. -Wnodev
-make
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -Wnodev ..
+make -j$(nproc)
 sudo make install
diff --git a/libappletdecoration/appletdecorationplugin.cpp b/libappletdecoration/appletdecorationplugin.cpp
@@ -57,10 +57,17 @@ void AppletDecorationPlugin::registerTypes(const char *uri)
     qmlRegisterType<Decoration::Applet::ExtendedTheme>(uri, 0, 1, "PlasmaThemeExtended");
     qmlRegisterType<Decoration::Applet::WindowSystem>(uri, 0, 1, "WindowSystem");
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+    qmlRegisterAnonymousType<Decoration::Applet::Padding>("", 1);
+    qmlRegisterAnonymousType<Decoration::Applet::PreviewClient>("", 1);
+    qmlRegisterAnonymousType<Decoration::Applet::PreviewBridge>("", 1);
+    qmlRegisterAnonymousType<KDecoration2::Decoration>("", 1);
+#else
     qmlRegisterType<Decoration::Applet::Padding>();
     qmlRegisterType<Decoration::Applet::PreviewClient>();
     qmlRegisterType<Decoration::Applet::PreviewBridge>();
     qmlRegisterType<KDecoration2::Decoration>();
+#endif
 
     qmlRegisterSingletonType<Decoration::Applet::Environment>(uri, 0, 1, "Environment", &Decoration::Applet::Environment::instance);
 }

diff --git a/libappletdecoration/previewclient.cpp b/libappletdecoration/previewclient.cpp
@@ -387,6 +387,7 @@ void PreviewClient::setBordersTopEdge(bool enabled)
 #if KDECORATION2_VERSION_MINOR >= 13
 void PreviewClient::requestShowToolTip(const QString &text)
 {
+    Q_UNUSED(text)
     //qDebug() << "tooltip show requested with text:" << text;
 }