Skip to content
Permalink
Browse files

Fixup for AppStartup test which requires SIP API V1

  • Loading branch information
m-kuhn committed May 2, 2016
1 parent a230fc9 commit dd136f61eaf76f2d6a0dcab3d4f72d15b25a1e5f
Showing with 3 additions and 4 deletions.
  1. +1 −1 python/core/__init__.py
  2. +0 −1 tests/src/python/test_qgsappstartup.py
  3. +2 −2 tests/src/python/utilities.py
@@ -174,7 +174,7 @@ def __hash__(self):
# TODO: Fixme, this creates an invalid variant, not a NULL one
from PyQt5.QtCore import QVariant
NULL = QVariant()
except ImportError:
except (ImportError, RuntimeError):
pass


@@ -14,7 +14,6 @@
# This will get replaced with a git SHA1 when you do a git archive
__revision__ = '$Format:%H$'

import qgis
from PyQt4 import QtCore
import sys
import os
@@ -18,8 +18,8 @@
import platform
import tempfile

from qgis.PyQt.QtCore import QSize, QDir
from qgis.PyQt.QtWidgets import QWidget
from PyQt4.QtCore import QSize, QDir
from PyQt4.QtGui import QWidget

from qgis.core import (
QgsApplication,

0 comments on commit dd136f6

Please sign in to comment.
You can’t perform that action at this time.