Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-12 17:43:41 +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
rdairplay/Makefile.am
View File

@@ -20,7 +20,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing @QT4_CFLAGS@ @MUSICBRAINZ_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -74,7 +74,7 @@ nodist_rdairplay_SOURCES = moc_button_log.cpp\
moc_stop_counter.cpp\
moc_wall_clock.cpp
rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ @MUSICBRAINZ_LIBS@
rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@
rdairplay_LDFLAGS = -rdynamic
EXTRA_DIST = rdairplay.pro\

5
rdairplay/loglinebox.cpp
View File

@@ -18,6 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QDrag>
#include <QMouseEvent>
#include <QPainter>
@@ -838,7 +839,7 @@ void LogLineBox::paintEvent(QPaintEvent *e)
void LogLineBox::dragEnterEvent(QDragEnterEvent *e)
{
if(RDCartDrag::canDecode(e)&&
if(RDCartDrag::canDecode(e->mimeData())&&
((line_status==RDLogLine::Scheduled)||
(line_status==RDLogLine::Paused))) {
e->accept();
@@ -850,7 +851,7 @@ void LogLineBox::dropEvent(QDropEvent *e)
{
RDLogLine ll;
if(RDCartDrag::decode(e,&ll)) {
if(RDCartDrag::decode(e->mimeData(),&ll)) {
emit cartDropped(log_line,&ll);
}
}

6
rdairplay/logtableview.cpp
View File

@@ -33,7 +33,7 @@ LogTableView::LogTableView(QWidget *parent)
void LogTableView::dragEnterEvent(QDragEnterEvent *e)
{
if(RDCartDrag::canDecode(e)) {
if(RDCartDrag::canDecode(e->mimeData())) {
e->accept();
}
}
@@ -41,7 +41,7 @@ void LogTableView::dragEnterEvent(QDragEnterEvent *e)
void LogTableView::dragMoveEvent(QDragMoveEvent *e)
{
if(RDCartDrag::canDecode(e)) {
if(RDCartDrag::canDecode(e->mimeData())) {
e->accept();
}
}
@@ -53,7 +53,7 @@ void LogTableView::dropEvent(QDropEvent *e)
int line=-1;
int y_pos=e->pos().y();
if(RDCartDrag::decode(e,&ll)) {
if(RDCartDrag::decode(e->mimeData(),&ll)) {
line=rowAt(y_pos);
emit cartDropped(line,&ll);
}