Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

2021-02-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated build system to use Qt5 instead of Qt4.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-02-24 16:12:22 -05:00
parent 5131b1d5fe
commit 57abeada3c
130 changed files with 481 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rdrepld/Makefile.am
View File

@@ -18,7 +18,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -32,7 +32,7 @@ dist_rdrepld_SOURCES = rdrepld.cpp rdrepld.h \
replfactory.cpp replfactory.h\
citadelxds.cpp citadelxds.h
nodist_rdrepld_SOURCES = moc_rdrepld.cpp
rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
rdrepld_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~ moc_*
DISTCLEANFILES = moc_*

4
rdrepld/citadelxds.cpp
View File

@@ -152,8 +152,8 @@ bool CitadelXds::LoadIsciXreference(const QString &filename)
if(ok&&(cartnum<=RD_MAX_CART_NUMBER)) {
datelist=fields[6].split("/");
if(datelist.size()==3) {
date.setYMD(datelist[2].toInt()+2000,datelist[0].toInt(),
datelist[1].toInt());
date.setDate(datelist[2].toInt()+2000,datelist[0].toInt(),
datelist[1].toInt());
if(ValidateFilename(fields[8])) {
if(date.isValid()) {
sql=QString("insert into ISCI_XREFERENCE set ")+

2
rdrepld/rdrepld.cpp
View File

@@ -100,7 +100,7 @@ MainObject::MainObject(QObject *parent)
// SIGNAL(logText(RDConfig::LogPriority,const QString &)),
// this,SLOT(log(RDConfig::LogPriority,const QString &)));
if(qApp->argc()!=1) {
if(qApp->arguments().size()!=1) {
debug=true;
}