Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +01: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
utils/rdpopup/Makefile.am
View File

@@ -17,7 +17,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -29,7 +29,7 @@ bin_PROGRAMS = rdpopup
dist_rdpopup_SOURCES = rdpopup.cpp rdpopup.h
rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
rdpopup_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
CLEANFILES = *~\
*.idb\

14
utils/rdpopup/rdpopup.cpp
View File

@@ -2,7 +2,7 @@
//
// A utility for displaying messages on the desktop
//
// (C) Copyright 2009-2019 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2009-2021 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
@@ -18,10 +18,9 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <qapplication.h>
#include <qmessagebox.h>
#include <qwindowsstyle.h>
#include <QApplication>
#include <QIcon>
#include <QMessageBox>
#include <rd.h>
#include <rdapplication.h>
@@ -62,8 +61,7 @@ int main(int argc,char *argv[])
QApplication::setStyle(RD_GUI_STYLE);
QApplication a(argc,argv);
RDCmdSwitch *cmd=
new RDCmdSwitch(qApp->argc(),qApp->argv(),"rdpopup",RDPOPUP_USAGE);
RDCmdSwitch *cmd=new RDCmdSwitch("rdpopup",RDPOPUP_USAGE);
delete cmd;
if(argc<2) {
@@ -119,7 +117,7 @@ int main(int argc,char *argv[])
QMessageBox::NoButton);
break;
}
mb->setWindowIcon(QPixmap(rivendell_22x22_xpm));
mb->setWindowIcon(QIcon(QPixmap(rivendell_22x22_xpm)));
RDFontEngine *fs=new RDFontEngine(config);
mb->setFont(fs->progressFont());