Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-19 17:11:15 +02: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
rdselect/Makefile.am
View File

@@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2012-2021 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2012-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
@@ -18,9 +18,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
@@ -46,7 +46,7 @@ dist_rdselect_SOURCES = rdselect.cpp rdselect.h
nodist_rdselect_SOURCES = moc_rdselect.cpp
rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdselect_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
EXTRA_DIST = rd.audiostore.autofs\
rdselect.pro\

16
rdselect/rdselect.cpp
View File

@@ -19,7 +19,6 @@
//
#include <QApplication>
#include <QDesktopWidget>
#include <QDir>
#include <QMessageBox>
#include <QProcess>
@@ -55,7 +54,6 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
//
monitor_config=new RDMonitorConfig();
monitor_config->load();
QDesktopWidget *dw=qApp->desktop();
int width=sizeHint().width();
int height=sizeHint().height();
switch(monitor_config->position()) {
@@ -64,25 +62,25 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
break;
case RDMonitorConfig::UpperCenter:
setGeometry((dw->size().width()-width)/2,RDMONITOR_HEIGHT,width,height);
// setGeometry((dw->size().width()-width)/2,RDMONITOR_HEIGHT,width,height);
break;
case RDMonitorConfig::UpperRight:
setGeometry(dw->size().width()-width,RDMONITOR_HEIGHT,width,height);
// setGeometry(dw->size().width()-width,RDMONITOR_HEIGHT,width,height);
break;
case RDMonitorConfig::LowerLeft:
setGeometry(0,dw->size().height()-height+RDMONITOR_HEIGHT,width,height);
// setGeometry(0,dw->size().height()-height+RDMONITOR_HEIGHT,width,height);
break;
case RDMonitorConfig::LowerCenter:
setGeometry((dw->size().width()-width)/2,
dw->size().height()-height+RDMONITOR_HEIGHT,width,height);
// setGeometry((dw->size().width()-width)/2,
// dw->size().height()-height+RDMONITOR_HEIGHT,width,height);
break;
case RDMonitorConfig::LowerRight:
setGeometry(dw->size().width()-width,
dw->size().height()-height+RDMONITOR_HEIGHT,width,height);
// setGeometry(dw->size().width()-width,
// dw->size().height()-height+RDMONITOR_HEIGHT,width,height);
break;
case RDMonitorConfig::LastPosition: