Skip to content

Commit 8c5838f

Browse files
jef-njef-n
committedJun 27, 2017
update INSTALL
Followup 775e8cd, 8bfb695, 23ddace and e70f741
·
ltr-3_40final-3_0_0
1 parent 7f7842a commit 8c5838f

File tree

3 files changed

+53
-21
lines changed

3 files changed

+53
-21
lines changed
 

‎INSTALL

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Saturday June 10, 2017
3+
Tuesday June 27, 2017
44

55

6-
Last Updated: Saturday June 10, 2017
7-
Last Change : Saturday June 10, 2017
6+
Last Updated: Tuesday June 27, 2017
7+
Last Change : Tuesday June 27, 2017
88

99

1010
1. Introduction
@@ -362,7 +362,14 @@ new subdirectory called `build` or `build-qt5` in it.
362362
3.9.1. Install build dependencies
363363
=================================
364364

365-
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OSWLib qca-qt5-ossl qwt-devel qtkeychain-qt5-devel
365+
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
366+
qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel
367+
qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5
368+
clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel
369+
qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel
370+
qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
371+
python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OSWLib
372+
qca-qt5-ossl
366373

367374
To build QGIS server additional dependencies are required:
368375

@@ -399,11 +406,10 @@ the useful debug output which is normally printed when running the unit tests.
399406

400407
To enable debug prints for the current user, execute:
401408

402-
cat > ~/.config/QtProject/qtlogging.ini << EOL
403-
[Rules]
404-
default.debug=true
405-
EOL
406-
409+
cat > ~/.config/QtProject/qtlogging.ini << EOL
410+
[Rules]
411+
default.debug=true
412+
EOL
407413

408414

409415
4. Building on Windows

‎doc/INSTALL.html

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Saturday June 10, 2017</H3>
80+
<H3>Tuesday June 27, 2017</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Saturday June 10, 2017
86-
Last Change : Saturday June 10, 2017
85+
Last Updated: Tuesday June 27, 2017
86+
Last Change : Tuesday June 27, 2017
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -596,7 +596,8 @@ <H3>3.9.1. Install build dependencies</H3>
596596
clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel
597597
qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel
598598
qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
599-
python3-psycopg2 python3-PyYAML qca-qt5-ossl
599+
python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OSWLib
600+
qca-qt5-ossl
600601
</PRE></div>
601602

602603
<P>
@@ -645,6 +646,23 @@ <H3>3.9.1. Install build dependencies</H3>
645646
make install
646647
</PRE></div>
647648

649+
<H3>3.9.2. Suggested system tweaks</H3>
650+
651+
<P>
652+
By default Fedora disables debugging calls from Qt applications. This prevents
653+
the useful debug output which is normally printed when running the unit tests.
654+
</P>
655+
<P>
656+
To enable debug prints for the current user, execute:
657+
</P>
658+
659+
<div class="code"><PRE>
660+
cat &gt; ~/.config/QtProject/qtlogging.ini &lt;&lt; EOL
661+
[Rules]
662+
default.debug=true
663+
EOL
664+
</PRE></div>
665+
648666
<A NAME="toc13"></A>
649667
<H1>4. Building on Windows</H1>
650668

‎doc/linux.t2t

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ be pressed several times before the 'g' option becomes available.
130130
After the 'g' generation is complete, press 'q' to exit the ccmake
131131
interactive dialog.
132132

133-
/!\ **Warning:** Make sure that your build directory is completely empty when you
133+
/!\ **Warning:** Make sure that your build directory is completely empty when you
134134
enter the command. Do never try to "re-use" an existing **Qt4** build directory.
135135
If you want to use `ccmake` or other interactive tools, run the command in
136136
the empty build directory once before starting to use the interactive tools.
@@ -252,13 +252,7 @@ new subdirectory called `build` or `build-qt5` in it.
252252
=== Install build dependencies ===
253253

254254
```
255-
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
256-
qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel
257-
qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5
258-
clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel
259-
qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel
260-
qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
261-
python3-psycopg2 python3-PyYAML qca-qt5-ossl
255+
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OSWLib qca-qt5-ossl
262256
```
263257

264258
To build QGIS server additional dependencies are required:
@@ -297,3 +291,17 @@ Or install to your system
297291
```
298292
make install
299293
```
294+
295+
=== Suggested system tweaks ===
296+
297+
By default Fedora disables debugging calls from Qt applications. This prevents
298+
the useful debug output which is normally printed when running the unit tests.
299+
300+
To enable debug prints for the current user, execute:
301+
302+
```
303+
cat > ~/.config/QtProject/qtlogging.ini << EOL
304+
[Rules]
305+
default.debug=true
306+
EOL
307+
```

0 commit comments

Comments
 (0)
Please sign in to comment.