Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-26 14:41:16 +01:00
Code Issues Projects Releases Wiki Activity

2025-04-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Upgrade Qt dependency from Qt5 to Qt6.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2025-04-28 09:20:03 -04:00
parent 5950a9f7ab
commit 162aa3e483
169 changed files with 747 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/rdimport/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License version 2 as
@@ -17,9 +17,9 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++17 -fPIC -I$(top_srcdir)/lib @QT6_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
MOC = @QT6_MOC@
# The dependency for qt's Meta Object Compiler (moc)
moc_%.cpp: %.h
@@ -33,7 +33,7 @@ dist_rdimport_SOURCES = journal.cpp journal.h\
nodist_rdimport_SOURCES = moc_rdimport.cpp
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdimport_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
CLEANFILES = *~\
*.idb\

4
utils/rdimport/journal.cpp
View File

@@ -139,7 +139,7 @@ void Journal::sendAll()
used_addrs.clear();
if(c_good_groups.size()>0) {
QMultiMap<QString,QString> grp_map=GroupsByAddress(c_good_groups);
for(QMap<QString,QString>::const_iterator it=grp_map.begin();
for(QMultiMap<QString,QString>::const_iterator it=grp_map.begin();
it!=grp_map.end();it++) {
if(!used_addrs.contains(it.key())) {
QString errors;
@@ -187,7 +187,7 @@ void Journal::sendAll()
used_addrs.clear();
if(c_bad_groups.size()>0) {
QMultiMap<QString,QString> grp_map=GroupsByAddress(c_bad_groups);
for(QMap<QString,QString>::const_iterator it=grp_map.begin();
for(QMultiMap<QString,QString>::const_iterator it=grp_map.begin();
it!=grp_map.end();it++) {
if(!used_addrs.contains(it.key())) {
QString errors;