Skip to content

Commit 5c80e50

Browse files
committed
raise Qt dependency to 4.5
1 parent a261812 commit 5c80e50

14 files changed

+39
-38
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ SET (HAVE_MSSQL TRUE)
220220

221221
#############################################################
222222
# search for Qt4
223-
SET(QT_MIN_VERSION 4.4.0)
223+
SET(QT_MIN_VERSION 4.5.0)
224224
FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
225225
SET(QT_USE_QTXML 1)
226226
SET(QT_USE_QTNETWORK 1)

INSTALL

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Sunday July 21, 2013
3+
Saturday July 27, 2013
44

55

6-
Last Updated: Sunday July 21, 2013
7-
Last Change : Wednesday May 22, 2013
6+
Last Updated: Saturday July 27, 2013
7+
Last Change : Saturday July 27, 2013
88

99

1010
1. Introduction
@@ -98,7 +98,7 @@ Required build tools:
9898

9999
Required build deps:
100100

101-
- Qt >= 4.4.0
101+
- Qt >= 4.5.0
102102
- Proj >= 4.4.x
103103
- GEOS >= 3.0
104104
- Sqlite3 >= 3.0.0

debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
1818
* drop context_help, function_help and qgis_help.db files
1919
* use dh_sip
2020
* add build dependency to xfonts (100dpi, 75dpi, scalable) for tests
21+
* raise Qt dependency to 4.6
2122

22-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 20 Jul 2013 13:18:52 +0200
23+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 27 Jul 2013 16:45:43 +0200
2324

2425
qgis (1.8.0) UNRELEASED; urgency=low
2526

debian/control.lucid

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqwt5-qt4-dev,
2020
libspatialite-dev,
2121
libsqlite3-dev,
@@ -88,11 +88,11 @@ Depends:
8888
libpq-dev,
8989
libproj-dev,
9090
libqgis{QGIS_ABI} (= ${binary:Version}),
91-
libqt4-dev (>=4.4.0),
91+
libqt4-dev (>=4.6.0),
9292
libsqlite3-dev,
9393
python-qt4 (>=4.1.0),
9494
python-qt4-dev (>=4.1.0),
95-
qt4-designer (>=4.4.0),
95+
qt4-designer (>=4.6.0),
9696
${misc:Depends}
9797
Provides: qgis-dev
9898
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

debian/control.oneiric

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqtwebkit-dev,
2020
libqwt5-qt4-dev,
2121
libspatialite-dev,
@@ -89,11 +89,11 @@ Depends:
8989
libpq-dev,
9090
libproj-dev,
9191
libqgis{QGIS_ABI} (= ${binary:Version}),
92-
libqt4-dev (>=4.4.0),
92+
libqt4-dev (>=4.6.0),
9393
libsqlite3-dev,
9494
python-qt4 (>=4.1.0),
9595
python-qt4-dev (>=4.1.0),
96-
qt4-designer (>=4.4.0),
96+
qt4-designer (>=4.6.0),
9797
${misc:Depends}
9898
Provides: qgis-dev
9999
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

debian/control.precise

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqt4-opengl-dev,
2020
libqtwebkit-dev,
2121
libqwt5-qt4-dev,
@@ -92,11 +92,11 @@ Depends:
9292
libpq-dev,
9393
libproj-dev,
9494
libqgis{QGIS_ABI} (= ${binary:Version}),
95-
libqt4-dev (>=4.4.0),
95+
libqt4-dev (>=4.6.0),
9696
libsqlite3-dev,
9797
python-qt4 (>=4.1.0),
9898
python-qt4-dev (>=4.1.0),
99-
qt4-designer (>=4.4.0),
99+
qt4-designer (>=4.6.0),
100100
${misc:Depends}
101101
Provides: qgis-dev
102102
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

debian/control.quantal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqt4-opengl-dev,
2020
libqtwebkit-dev,
2121
libqwt-dev,
@@ -91,11 +91,11 @@ Depends:
9191
libpq-dev,
9292
libproj-dev,
9393
libqgis{QGIS_ABI} (= ${binary:Version}),
94-
libqt4-dev (>=4.4.0),
94+
libqt4-dev (>=4.6.0),
9595
libsqlite3-dev,
9696
python-qt4 (>=4.1.0),
9797
python-qt4-dev (>=4.1.0),
98-
qt4-designer (>=4.4.0),
98+
qt4-designer (>=4.6.0),
9999
${misc:Depends}
100100
Provides: qgis-dev
101101
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

debian/control.raring

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqt4-opengl-dev,
2020
libqtwebkit-dev,
2121
libqwt5-qt4-dev,
@@ -93,11 +93,11 @@ Depends:
9393
libpq-dev,
9494
libproj-dev,
9595
libqgis{QGIS_ABI} (= ${binary:Version}),
96-
libqt4-dev (>=4.4.0),
96+
libqt4-dev (>=4.6.0),
9797
libsqlite3-dev,
9898
python-qt4 (>=4.1.0),
9999
python-qt4-dev (>=4.1.0),
100-
qt4-designer (>=4.4.0),
100+
qt4-designer (>=4.6.0),
101101
${misc:Depends}
102102
Provides: qgis-dev
103103
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

debian/control.sid

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqt4-opengl-dev,
2020
libqtwebkit-dev,
2121
libqwt-dev,
@@ -91,7 +91,7 @@ Depends:
9191
libpq-dev,
9292
libproj-dev,
9393
libqgis{QGIS_ABI} (= ${binary:Version}),
94-
libqt4-dev (>=4.4.0),
94+
libqt4-dev (>=4.6.0),
9595
libsqlite3-dev,
9696
python-qt4 (>=4.1.0),
9797
python-qt4-dev (>=4.1.0),

debian/control.sid-oracle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Build-Depends:
1515
libgsl0-dev,
1616
libpq-dev,
1717
libproj-dev,
18-
libqt4-dev (>=4.4.0),
18+
libqt4-dev (>=4.6.0),
1919
libqt4-opengl-dev,
2020
libqtwebkit-dev,
2121
libqwt-dev,
@@ -92,11 +92,11 @@ Depends:
9292
libpq-dev,
9393
libproj-dev,
9494
libqgis{QGIS_ABI} (= ${binary:Version}),
95-
libqt4-dev (>=4.4.0),
95+
libqt4-dev (>=4.6.0),
9696
libsqlite3-dev,
9797
python-qt4 (>=4.1.0),
9898
python-qt4-dev (>=4.1.0),
99-
qt4-designer (>=4.4.0),
99+
qt4-designer (>=4.6.0),
100100
${misc:Depends}
101101
Provides: qgis-dev
102102
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

0 commit comments

Comments
 (0)