head	1.3;
access;
symbols;
locks; strict;
comment	@// @;


1.3
date	2022.03.17.22.23.17;	author gdt;	state dead;
branches;
next	1.2;
commitid	AQDHIPD9Q6SZvCwD;

1.2
date	2022.02.15.12.59.21;	author gdt;	state Exp;
branches;
next	1.1;
commitid	0MBrBIvx9I5xmIsD;

1.1
date	2022.01.18.23.33.59;	author gdt;	state Exp;
branches;
next	;
commitid	cwfu6jgOVpdBLapD;


desc
@@


1.3
log
@geography/qgis: Update to 3.22.4

This is a micro along a stable branch and upstream changes are
bugfixes and minor improvements.  Tested on netbsd-9 amd64.
@
text
@$NetBSD: patch-tests_src_gui_testqgsexternalresourcewidgetwrapper.cpp,v 1.2 2022/02/15 12:59:21 gdt Exp $

Fix a test that should have been guarded on WITH_QTWEKBIT.

Not yet reported upstream.

--- tests/src/gui/testqgsexternalresourcewidgetwrapper.cpp.orig	2022-01-14 12:06:34.000000000 +0000
+++ tests/src/gui/testqgsexternalresourcewidgetwrapper.cpp
@@@@ -1258,7 +1258,9 @@@@ void TestQgsExternalResourceWidgetWrappe
 
   // content still null, fetching in progress...
   QVERIFY( !ww.mQgsWidget->mPixmapLabel->isVisible() );
+#ifdef WITH_QTWEBKIT
   QVERIFY( !ww.mQgsWidget->mWebView->isVisible() );
+#endif
   QVERIFY( ww.mQgsWidget->mLoadingLabel->isVisible() );
   QVERIFY( ww.mQgsWidget->mLoadingMovie->state() == QMovie::Running );
   QVERIFY( !ww.mQgsWidget->mErrorLabel->isVisible() );
@


1.2
log
@geography/qgis: Update to 3.22.3

Upstream changes:

  Many bug fixes and improvements.

3.22:

  Annotation layer improvements.
  Substantial mesh layer improvements.

3.20:

3.18:
  Improved simulation of color vision deficiency.
  Drop DB2 provider.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@geography/qgis: Update to 3.16.16

Upstream changes are minor.

Packaging changes:

  Work around a new upstream bug where a test that depends on qtwebkit
  was not ifdefed.

  Start to try to adapt to the changes in py-sip.
@
text
@d3 1
a3 1
Fix a  test that should have been guarded based on qt5-webkit.
d5 1
a5 1
Reported upstream via email 20210118.
d7 1
a7 1
--- tests/src/gui/testqgsexternalresourcewidgetwrapper.cpp.orig	2022-01-14 12:06:23.000000000 +0000
d9 1
a9 13
@@@@ -44,7 +44,9 @@@@ class TestQgsExternalResourceWidgetWrapp
     void init();// will be called before each testfunction is executed.
     void cleanup();// will be called after every testfunction.
     void test_setNullValues();
+#ifdef WITH_QTWEBKIT
     void testBlankAfterValue();
+#endif /* WITH_QTWEBKIT */
 
   private:
     std::unique_ptr<QgsVectorLayer> vl;
@@@@ -115,6 +117,8 @@@@ void TestQgsExternalResourceWidgetWrappe
   delete widget;
 }
d11 2
d14 5
a18 12
+
 void TestQgsExternalResourceWidgetWrapper::testBlankAfterValue()
 {
   // test that application doesn't crash when we set a blank page in web preview
@@@@ -152,5 +156,7 @@@@ void TestQgsExternalResourceWidgetWrappe
   QCOMPARE( ww.mQgsWidget->mWebView->url().toString(), QStringLiteral( "about:blank" ) );
 }
 
+#endif /* WITH_QTWEBKIT */
+
 QGSTEST_MAIN( TestQgsExternalResourceWidgetWrapper )
 #include "testqgsexternalresourcewidgetwrapper.moc"
@