Merge lp:~sbaldassin/autopilot-qt/removing_qt4 into lp:autopilot-qt

[Santiago Baldassin]

This mp removes qt4 deps from autopilot-qt

This mp removes qt4 deps from autopilot-qt

Unmerged revisions

95. By Santiago Baldassin on 2017-01-16

Removing Qt4 deps

=== modified file 'debian/control'
--- debian/control	2015-08-24 16:09:33 +0000
+++ debian/control	2017-01-16 19:34:26 +0000
@@ -5,11 +5,9 @@
 Build-Depends: debhelper (>= 9),
                libgl1-mesa-dev,
                libgles2-mesa-dev,
-               libqt4-dev,
                libxpathselect-dev (>= 1.4),
                mesa-common-dev,
                pkg-config,
-               qt4-qmake,
                qt5-qmake,
                qtbase5-dev,
                qtchooser,
@@ -27,8 +25,7 @@
 Package: libautopilot-qt
 Section: libs
 Architecture: any
-Depends: autopilot-qt4,
-         autopilot-qt5,
+Depends: autopilot-qt5,
          qttestability-autopilot,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -36,22 +33,7 @@
  autopilot-qt allows autopilot to test any existing Qt application, without
  having to rebuild the application under test.
  .
- This is a compatibility package depending on both the Qt4 and Qt5 drivers.
-
-Package: autopilot-qt4
-Section: libs
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Replaces: autopilot-qt, libautopilot-qt (<< 1.4+14.10.20140724.1-0ubuntu2)
-Conflicts: autopilot-qt
-Breaks: libautopilot-qt (<< 1.4+14.10.20140724.1-0ubuntu2)
-Provides: autopilot-qt
-Description: make Qt applications introspectable by autopilot - Qt4 plugin
- autopilot-qt allows autopilot to test any existing Qt application, without
- having to rebuild the application under test.
- .
- This package provides the driver used for packages built against Qt4.
+ This is a compatibility package depending on Qt5 drivers.
 
 Package: autopilot-qt5
 Section: libs
@@ -70,7 +52,7 @@
 Section: libs
 Architecture: any
 Depends: python3-autopilot (>= 1.4),
-         autopilot-qt5 | autopilot-qt4
+         autopilot-qt5
          ${misc:Depends},
          ${shlibs:Depends}
 Replaces: libautopilot-qt (<< 1.4+14.10.20140724.1-0ubuntu2)

=== modified file 'debian/rules'
--- debian/rules	2014-08-03 03:02:18 +0000
+++ debian/rules	2017-01-16 19:34:26 +0000
@@ -6,29 +6,21 @@
 	dh $@
 
 override_dh_auto_configure:
-	mkdir qt4
 	mkdir qt5
-	cd qt4 && \
-	qmake -qt=qt4 QMAKE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
-	QMAKE_CXXFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
-	QMAKE_LFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ../autopilot-qt.pro
 	cd qt5 && \
 	qmake -qt=qt5 QMAKE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
 	QMAKE_CXXFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
 	QMAKE_LFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ../autopilot-qt.pro
 
 override_dh_auto_build:
-	cd qt4 && make
 	cd qt5 && make
 
 override_dh_clean:
 	dh_clean
-	rm -rf qt4
 	rm -rf qt5
 
 override_dh_install:
 	dh_install --fail-missing
 
 override_dh_auto_test:
-	cd qt4 && xvfb-run -a make check
 	cd qt5 && xvfb-run -a make check

=== modified file 'tests/unittests/tst_introspection.cpp'
--- tests/unittests/tst_introspection.cpp	2015-08-24 23:54:49 +0000
+++ tests/unittests/tst_introspection.cpp	2017-01-16 19:34:26 +0000
@@ -112,8 +112,8 @@
                     )
             );
 
-    QTest::newRow("//QWidget[id=8]")
-        << "//QWidget[id=8]"
+    QTest::newRow("//QWidget[id=7]")
+        << "//QWidget[id=7]"
         << 1
         << "/tst_introspection/QMainWindow/QWidget"
         << "objectName"
@@ -123,8 +123,8 @@
                 << "centralTestWidget"
             );
 
-    QTest::newRow("//QPushButton[id=11]")
-        << "//QPushButton[id=11]"
+    QTest::newRow("//QPushButton[id=10]")
+        << "//QPushButton[id=10]"
         << 1
         << "/tst_introspection/QMainWindow/QWidget/QPushButton"
         << "objectName"