Some small changes

* changelog update * version metadata update * bump required Qt version to 5.6 and update patch accordinly * fix invalid cast in update dialog
2025-04-24 15:37:23 +00:00 · 2016-04-07 16:52:05 +03:00 · 2016-04-07 16:52:05 +03:00 · bfa4f9e98e
commit bfa4f9e98e
parent e9146b3b6c
7 changed files with 27 additions and 6 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Ver.3.1.1:
+- fix broken gcc build (#87)
+* translation update
+
 Ver.3.1.0:
 + implement templates support (#71)
 + implement special functions (#71)
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Вер.3.1.1:
+- исправлена сборка (#87)
+* обновлены переводы
+
 Вер.3.1.0:
 + добавлена поддержка шаблонов (#71)
 + добавлена поддержка специальных функций (#71)
--- a/patches/qt5.6-qversionnumber.patch
+++ b/patches/qt5.6-qversionnumber.patch
@ -132,3 +132,16 @@ index 359cdb2..9c6a42d 100644
     QString m_genericConfig;
 };
 
+diff --git a/sources/libraries.cmake b/sources/libraries.cmake
+index 33192f7..339bb58 100644
+--- a/sources/libraries.cmake
+++ b/sources/libraries.cmake
+@@ -2,7 +2,7 @@
+ find_package(Gettext REQUIRED)
+ 
+ # main qt libraries
+-find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
+find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
+ add_definitions(
+         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
+         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
--- a/sources/awesome-widget/package/metadata.desktop
+++ b/sources/awesome-widget/package/metadata.desktop
@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=3.1.0
+X-KDE-PluginInfo-Version=3.1.1
 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
@ -123,15 +123,15 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version)

 void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
 {
-    int ret = static_cast<QMessageBox *>(sender())->buttonRole(button);
+    QMessageBox::ButtonRole ret = static_cast<QMessageBox *>(sender())->buttonRole(button);
    qCInfo(LOG_AW) << "User select" << ret;

    switch (ret) {
-    case QMessageBox::Ok:
+    case QMessageBox::AcceptRole:
        QDesktopServices::openUrl(QString(RELEASES)
                                  + m_foundVersion.toString());
        break;
-    case QMessageBox::Cancel:
+    case QMessageBox::RejectRole:
    default:
        break;
    }
--- a/sources/desktop-panel/package/metadata.desktop
+++ b/sources/desktop-panel/package/metadata.desktop
@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
-X-KDE-PluginInfo-Version=3.1.0
+X-KDE-PluginInfo-Version=3.1.1
 X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
--- a/sources/libraries.cmake
+++ b/sources/libraries.cmake
@ -2,7 +2,7 @@
 find_package(Gettext REQUIRED)

 # main qt libraries
-find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
+find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
 add_definitions(
        ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
        ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}