Merge pull request #127 from shundhammer/huha-qt-5-15-fixes

Fixed Qt 5.15 Deprecated Warnings
libyui · Mar 24, 2020 · 64c0106 · 64c0106
2 parents 0e54e20 + de3299d
commit 64c0106
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET(VERSION_MAJOR "2")
 SET(VERSION_MINOR "52")
-SET(VERSION_PATCH "2")
+SET(VERSION_PATCH "3")
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
 
 ##### This is needed for the libyui-qt core ONLY.

diff --git a/package/libyui-qt-doc.spec b/package/libyui-qt-doc.spec
@@ -21,7 +21,7 @@
 
 Name:           %{parent}-doc
 # DO NOT manually bump the version here; instead, use   rake version:bump
-Version:        2.52.2
+Version:        2.52.3
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-qt.changes b/package/libyui-qt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 24 16:18:31 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Fixed Qt 5.15 deprecated warnings (bsc#1165118)
+- 2.53.3
+
 -------------------------------------------------------------------
 Mon Feb 17 11:29:24 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
 

diff --git a/package/libyui-qt.spec b/package/libyui-qt.spec
@@ -18,7 +18,7 @@
 
 Name:           libyui-qt
 # DO NOT manually bump the version here; instead, use   rake version:bump
-Version:        2.52.2
+Version:        2.52.3
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 

diff --git a/src/QY2Styler.cc b/src/QY2Styler.cc
@@ -301,7 +301,7 @@ void QY2Styler::registerChildWidget( QWidget * parent, QWidget * widget )
 {
     // Don't use yuiDebug() here - deadlock (reason unknown so far) in thread handling!
 
-    qDebug() << "Registering " << widget << " for parent " << parent << endl;
+    qDebug() << "Registering " << widget << " for parent " << parent << Qt::endl;
     widget->installEventFilter( this );
     _children[parent].push_back( widget );
 }

diff --git a/src/YQComboBox.cc b/src/YQComboBox.cc
@@ -76,7 +76,7 @@ YQComboBox::YQComboBox( YWidget * 	parent,
 	     this,		&pclass(this)::slotSelected );
 #endif
 
-    connect( _qt_comboBox,	static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::activated),
+    connect( _qt_comboBox,	static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::textActivated),
 	     this,		&pclass(this)::textChanged );
 
     connect( _qt_comboBox,	&pclass(_qt_comboBox)::editTextChanged,