Skip to content

Commit

Permalink
raise Qt dependency to 4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jul 27, 2013
1 parent a261812 commit 5c80e50
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ SET (HAVE_MSSQL TRUE)

#############################################################
# search for Qt4
SET(QT_MIN_VERSION 4.4.0)
SET(QT_MIN_VERSION 4.5.0)
FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
SET(QT_USE_QTXML 1)
SET(QT_USE_QTNETWORK 1)
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Sunday July 21, 2013
Saturday July 27, 2013


Last Updated: Sunday July 21, 2013
Last Change : Wednesday May 22, 2013
Last Updated: Saturday July 27, 2013
Last Change : Saturday July 27, 2013


1. Introduction
Expand Down Expand Up @@ -98,7 +98,7 @@ Required build tools:

Required build deps:

- Qt >= 4.4.0
- Qt >= 4.5.0
- Proj >= 4.4.x
- GEOS >= 3.0
- Sqlite3 >= 3.0.0
Expand Down
3 changes: 2 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
* drop context_help, function_help and qgis_help.db files
* use dh_sip
* add build dependency to xfonts (100dpi, 75dpi, scalable) for tests
* raise Qt dependency to 4.6

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

qgis (1.8.0) UNRELEASED; urgency=low

Expand Down
6 changes: 3 additions & 3 deletions debian/control.lucid
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
Expand Down Expand Up @@ -88,11 +88,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
6 changes: 3 additions & 3 deletions debian/control.oneiric
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqtwebkit-dev,
libqwt5-qt4-dev,
libspatialite-dev,
Expand Down Expand Up @@ -89,11 +89,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
6 changes: 3 additions & 3 deletions debian/control.precise
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt5-qt4-dev,
Expand Down Expand Up @@ -92,11 +92,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
6 changes: 3 additions & 3 deletions debian/control.quantal
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt-dev,
Expand Down Expand Up @@ -91,11 +91,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
6 changes: 3 additions & 3 deletions debian/control.raring
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt5-qt4-dev,
Expand Down Expand Up @@ -93,11 +93,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
4 changes: 2 additions & 2 deletions debian/control.sid
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt-dev,
Expand Down Expand Up @@ -91,7 +91,7 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
Expand Down
6 changes: 3 additions & 3 deletions debian/control.sid-oracle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt-dev,
Expand Down Expand Up @@ -92,11 +92,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
6 changes: 3 additions & 3 deletions debian/control.squeeze
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqwt5-qt4-dev,
libspatialite-dev,
libsqlite3-dev,
Expand Down Expand Up @@ -89,11 +89,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
6 changes: 3 additions & 3 deletions debian/control.wheezy
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Build-Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libqt4-opengl-dev,
libqtwebkit-dev,
libqwt-dev,
Expand Down Expand Up @@ -91,11 +91,11 @@ Depends:
libpq-dev,
libproj-dev,
libqgis{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>=4.4.0),
libqt4-dev (>=4.6.0),
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
qt4-designer (>=4.4.0),
qt4-designer (>=4.6.0),
${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Expand Down
10 changes: 5 additions & 5 deletions doc/INSTALL.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Sunday July 21, 2013</H3>
<H3>Saturday July 27, 2013</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Sunday July 21, 2013
Last Change : Wednesday May 22, 2013
Last Updated: Saturday July 27, 2013
Last Change : Saturday July 27, 2013
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -195,7 +195,7 @@ <H1>2. Overview</H1>
</P>

<UL>
<LI>CMake &gt;= 2.6.2
<LI>CMake &gt;= 2.8.0
<LI>Flex
<LI>Bison &gt;= 2.4
</UL>
Expand All @@ -205,7 +205,7 @@ <H1>2. Overview</H1>
</P>

<UL>
<LI>Qt &gt;= 4.4.0
<LI>Qt &gt;= 4.5.0
<LI>Proj &gt;= 4.4.x
<LI>GEOS &gt;= 3.0
<LI>Sqlite3 &gt;= 3.0.0
Expand Down
2 changes: 1 addition & 1 deletion doc/overview.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Required build tools:

Required build deps:

- Qt >= 4.4.0
- Qt >= 4.5.0
- Proj >= 4.4.x
- GEOS >= 3.0
- Sqlite3 >= 3.0.0
Expand Down

0 comments on commit 5c80e50

Please sign in to comment.