Skip to content

Commit

Permalink
Merge pull request #85 from shundhammer/huha-qt-5-15-fixes
Browse files Browse the repository at this point in the history
Fixed Qt 5.15 Deprecated Warnings
  • Loading branch information
shundhammer committed Mar 24, 2020
2 parents e295e0b + 381a4e0 commit 57f3a55
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion VERSION.cmake
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "47" )
SET( VERSION_PATCH "3" )
SET( VERSION_PATCH "4" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )

##### This is need for the libyui core, ONLY.
Expand Down
2 changes: 1 addition & 1 deletion package/libyui-qt-pkg-doc.spec
Expand Up @@ -19,7 +19,7 @@
%define parent libyui-qt-pkg
%define so_version 11
Name: %{parent}-doc
Version: 2.47.3
Version: 2.47.4
Release: 0
Summary: Libyui-qt-pkg documentation
License: LGPL-2.1-only OR LGPL-3.0-only
Expand Down
6 changes: 6 additions & 0 deletions package/libyui-qt-pkg.changes
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 24 16:20:57 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>

- Fixed Qt 5.15 deprecated warnings (bsc#1165118)
- 2.47.4

-------------------------------------------------------------------
Mon Feb 17 09:32:16 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/libyui-qt-pkg.spec
Expand Up @@ -21,7 +21,7 @@
%define libyui_qt_devel_version libyui-qt-devel >= 2.50.1
%define libzypp_devel_version libzypp-devel >= 17.21.0
Name: libyui-qt-pkg
Version: 2.47.3
Version: 2.47.4
Release: 0
Summary: Libyui - Qt Package Selector
License: LGPL-2.1-only OR LGPL-3.0-only
Expand Down
6 changes: 1 addition & 5 deletions src/YQPkgConflictDialog.cc
Expand Up @@ -171,11 +171,7 @@ YQPkgConflictDialog::YQPkgConflictDialog( QWidget * parent )

// Busy popup

_busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent, 0
#ifdef FIXME
, WStyle_Customize | WStyle_DialogBorder | WStyle_Dialog | WStyle_Title
#endif
);
_busyPopup = new QLabel( " " + _( "Checking Dependencies..." ) + " ", parent );
Q_CHECK_PTR( _busyPopup );

_busyPopup->setWindowTitle( "" );
Expand Down

0 comments on commit 57f3a55

Please sign in to comment.