Date: Wed, 3 Jun 2020 23:44:52 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537857 - head/audio/hydrogen/files Message-ID: <202006032344.053NiqNb089881@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Wed Jun 3 23:44:52 2020 New Revision: 537857 URL: https://svnweb.freebsd.org/changeset/ports/537857 Log: Prep-work for Qt 5.15 An ambiguous constructor for QSplashScreen has appeared in Qt 5.14, so previous uses of NULL / nullptr now cause a compile error like src/gui/src/SplashScreen.cpp:35:4: error: call to constructor of 'QSplashScreen' is ambiguous : QSplashScreen( NULL ) ^ ~~~~ /usr/local/include/qt5/QtWidgets/qsplashscreen.h:58:5: note: candidate constructor QSplashScreen(QScreen *screen, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags()); /usr/local/include/qt5/QtWidgets/qsplashscreen.h:61:5: note: candidate constructor QSplashScreen(QWidget *parent, const QPixmap &pixmap = QPixmap(), Qt::WindowFlags f = Qt::WindowFlags()); This patch just explicitly casts to the right type of nullptr. Mentioned in an issue upstream as well. Not bumping PORTREVISION since this doesn't affect the built code at all and it will get rebuilt when Qt 5.15 lands anyway. Added: head/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp (contents, props changed) Added: head/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/hydrogen/files/patch-src_gui_src_SplashScreen.cpp Wed Jun 3 23:44:52 2020 (r537857) @@ -0,0 +1,11 @@ +--- src/gui/src/SplashScreen.cpp.orig 2020-06-03 21:33:30 UTC ++++ src/gui/src/SplashScreen.cpp +@@ -32,7 +32,7 @@ + const char* SplashScreen::__class_name = "SplashScreen"; + + SplashScreen::SplashScreen() +- : QSplashScreen( NULL ) ++ : QSplashScreen( (QWidget*)nullptr ) + , Object( __class_name ) + { + //INFOLOG( "SplashScreen" );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006032344.053NiqNb089881>