Skip to content

Commit

Permalink
fix groovy build (Qt 5.14.2; Qt::ReturnByValue introduced in Qt 5.15 …
Browse files Browse the repository at this point in the history 
…not 5.13; followup 5612703)
  • Loading branch information
@jef-n
jef-n committed Aug 17, 2021
1 parent 179cb1d commit 6d66dd2
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tests/src/gui/testqgsexternalresourcewidgetwrapper.cpp
View file
Expand Up @@ -358,7 +358,7 @@ void TestQgsExternalResourceWidgetWrapper::testLoadExternalDocument()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -398,7 +398,7 @@ void TestQgsExternalResourceWidgetWrapper::testLoadExternalDocument()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -439,7 +439,7 @@ void TestQgsExternalResourceWidgetWrapper::testLoadExternalDocument()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -542,7 +542,7 @@ void TestQgsExternalResourceWidgetWrapper::testLoadNullExternalDocument()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -570,7 +570,7 @@ void TestQgsExternalResourceWidgetWrapper::testLoadNullExternalDocument()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -641,7 +641,7 @@ void TestQgsExternalResourceWidgetWrapper::testStoreExternalDocument()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -734,7 +734,7 @@ void TestQgsExternalResourceWidgetWrapper::testStoreExternalDocumentError()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -766,7 +766,7 @@ void TestQgsExternalResourceWidgetWrapper::testStoreExternalDocumentError()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -845,7 +845,7 @@ void TestQgsExternalResourceWidgetWrapper::testStoreExternalDocumentCancel()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -880,7 +880,7 @@ void TestQgsExternalResourceWidgetWrapper::testStoreExternalDocumentCancel()
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down Expand Up @@ -956,7 +956,7 @@ void TestQgsExternalResourceWidgetWrapper::testStoreExternalDocumentNoExpression
if ( documentType == QgsExternalResourceWidget::Image )
{
QVERIFY( ww.mQgsWidget->mPixmapLabel->isVisible() );
#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QVERIFY( !ww.mQgsWidget->mPixmapLabel->pixmap() );
#else
QVERIFY( ww.mQgsWidget->mPixmapLabel->pixmap( Qt::ReturnByValue ).isNull() );
Expand Down

1 comment on commit 6d66dd2

@jef-n
Copy link
Member Author

@jef-n jef-n commented on 6d66dd2 Aug 17, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://cdash.orfeo-toolbox.org/viewBuildError.php?buildid=68785

Please sign in to comment.