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

Proposed by Santiago Baldassin on 2017-01-16
Status: Needs review
Proposed branch: lp:~sbaldassin/autopilot-qt/removing_qt4
Merge into: lp:autopilot-qt
Diff against target: 118 lines (+7/-33)
3 files modified
debian/control (+3/-21)
debian/rules (+0/-8)
tests/unittests/tst_introspection.cpp (+4/-4)
To merge this branch: bzr merge lp:~sbaldassin/autopilot-qt/removing_qt4
Reviewer Review Type Date Requested Status
Autopilot Hackers 2017-01-16 Pending
Review via email: mp+314871@code.launchpad.net

Commit message

This mp removes qt4 deps from autopilot-qt

Description of the change

This mp removes qt4 deps from autopilot-qt

To post a comment you must log in.

Unmerged revisions

95. By Santiago Baldassin on 2017-01-16

Removing Qt4 deps

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-08-24 16:09:33 +0000
3+++ debian/control 2017-01-16 19:34:26 +0000
4@@ -5,11 +5,9 @@
5 Build-Depends: debhelper (>= 9),
6 libgl1-mesa-dev,
7 libgles2-mesa-dev,
8- libqt4-dev,
9 libxpathselect-dev (>= 1.4),
10 mesa-common-dev,
11 pkg-config,
12- qt4-qmake,
13 qt5-qmake,
14 qtbase5-dev,
15 qtchooser,
16@@ -27,8 +25,7 @@
17 Package: libautopilot-qt
18 Section: libs
19 Architecture: any
20-Depends: autopilot-qt4,
21- autopilot-qt5,
22+Depends: autopilot-qt5,
23 qttestability-autopilot,
24 ${misc:Depends},
25 ${shlibs:Depends},
26@@ -36,22 +33,7 @@
27 autopilot-qt allows autopilot to test any existing Qt application, without
28 having to rebuild the application under test.
29 .
30- This is a compatibility package depending on both the Qt4 and Qt5 drivers.
31-
32-Package: autopilot-qt4
33-Section: libs
34-Architecture: any
35-Depends: ${misc:Depends},
36- ${shlibs:Depends},
37-Replaces: autopilot-qt, libautopilot-qt (<< 1.4+14.10.20140724.1-0ubuntu2)
38-Conflicts: autopilot-qt
39-Breaks: libautopilot-qt (<< 1.4+14.10.20140724.1-0ubuntu2)
40-Provides: autopilot-qt
41-Description: make Qt applications introspectable by autopilot - Qt4 plugin
42- autopilot-qt allows autopilot to test any existing Qt application, without
43- having to rebuild the application under test.
44- .
45- This package provides the driver used for packages built against Qt4.
46+ This is a compatibility package depending on Qt5 drivers.
47
48 Package: autopilot-qt5
49 Section: libs
50@@ -70,7 +52,7 @@
51 Section: libs
52 Architecture: any
53 Depends: python3-autopilot (>= 1.4),
54- autopilot-qt5 | autopilot-qt4
55+ autopilot-qt5
56 ${misc:Depends},
57 ${shlibs:Depends}
58 Replaces: libautopilot-qt (<< 1.4+14.10.20140724.1-0ubuntu2)
59
60=== modified file 'debian/rules'
61--- debian/rules 2014-08-03 03:02:18 +0000
62+++ debian/rules 2017-01-16 19:34:26 +0000
63@@ -6,29 +6,21 @@
64 dh $@
65
66 override_dh_auto_configure:
67- mkdir qt4
68 mkdir qt5
69- cd qt4 && \
70- qmake -qt=qt4 QMAKE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
71- QMAKE_CXXFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
72- QMAKE_LFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ../autopilot-qt.pro
73 cd qt5 && \
74 qmake -qt=qt5 QMAKE_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
75 QMAKE_CXXFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
76 QMAKE_LFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" ../autopilot-qt.pro
77
78 override_dh_auto_build:
79- cd qt4 && make
80 cd qt5 && make
81
82 override_dh_clean:
83 dh_clean
84- rm -rf qt4
85 rm -rf qt5
86
87 override_dh_install:
88 dh_install --fail-missing
89
90 override_dh_auto_test:
91- cd qt4 && xvfb-run -a make check
92 cd qt5 && xvfb-run -a make check
93
94=== modified file 'tests/unittests/tst_introspection.cpp'
95--- tests/unittests/tst_introspection.cpp 2015-08-24 23:54:49 +0000
96+++ tests/unittests/tst_introspection.cpp 2017-01-16 19:34:26 +0000
97@@ -112,8 +112,8 @@
98 )
99 );
100
101- QTest::newRow("//QWidget[id=8]")
102- << "//QWidget[id=8]"
103+ QTest::newRow("//QWidget[id=7]")
104+ << "//QWidget[id=7]"
105 << 1
106 << "/tst_introspection/QMainWindow/QWidget"
107 << "objectName"
108@@ -123,8 +123,8 @@
109 << "centralTestWidget"
110 );
111
112- QTest::newRow("//QPushButton[id=11]")
113- << "//QPushButton[id=11]"
114+ QTest::newRow("//QPushButton[id=10]")
115+ << "//QPushButton[id=10]"
116 << 1
117 << "/tst_introspection/QMainWindow/QWidget/QPushButton"
118 << "objectName"

Subscribers

People subscribed via source and target branches