Skip to content

Commit 0d9945d

Browse files
DelazJm-kuhn
authored andcommitted
Use JavaScript instead of javascript/Javascript
+ update INSTALL doc
1 parent 99ea2e8 commit 0d9945d

File tree

8 files changed

+16
-23
lines changed

8 files changed

+16
-23
lines changed

INSTALL

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

55

6-
Last Updated: Tuesday June 27, 2017
7-
Last Change : Tuesday June 27, 2017
6+
Last Updated: Saturday July 08, 2017
7+
Last Change : Tuesday July 04, 2017
88

99

1010
1. Introduction
@@ -261,7 +261,7 @@ be pressed several times before the 'g' option becomes available.
261261
After the 'g' generation is complete, press 'q' to exit the ccmake
262262
interactive dialog.
263263

264-
/!\ Warning: Make sure that your build directory is completely empty when you
264+
/!\ Warning: Make sure that your build directory is completely empty when you
265265
enter the command. Do never try to "re-use" an existing Qt4 build directory.
266266
If you want to use `ccmake` or other interactive tools, run the command in
267267
the empty build directory once before starting to use the interactive tools.
@@ -362,14 +362,7 @@ 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
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
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
373366

374367
To build QGIS server additional dependencies are required:
375368

@@ -747,7 +740,7 @@ successful install, they're not needed anymore.
747740
In order to check out QGIS sources from the repository, you need a git client.
748741
This installer should work fine:
749742

750-
https://github.com/git-for-windows/git/releases/download/v2.13.2.windows.1/Git-2.13.2-32-bit.exe (32bit) or https://github.com/git-for-windows/git/releases/download/v2.13.2.windows.1/Git-2.13.2-64-bit.exe (64bit)
743+
https://git-scm.com/download/win
751744

752745

753746
4.2.6. CMake

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ key new features.
511511
normal map view as well as in print composer.
512512
- HTML support has been added map composer label item to give you even
513513
more control over your final maps. HTML labels support full css styles
514-
sheets, html, and even javascript if you are that way inclined.
514+
sheets, html, and even JavaScript if you are that way inclined.
515515
- The labeling system has been totally overhauled - it now includes many
516516
new features such as drop shadows, 'highway shields', many more data bound
517517
options, and various performance enhancements. We are slowly doing away

cmake_templates/Doxyfile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
15061506

15071507
MATHJAX_EXTENSIONS =
15081508

1509-
# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
1509+
# The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
15101510
# of code that will be used on startup of the MathJax code. See the MathJax site
15111511
# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
15121512
# example see the documentation.
@@ -1515,11 +1515,11 @@ MATHJAX_EXTENSIONS =
15151515
MATHJAX_CODEFILE =
15161516

15171517
# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
1518-
# the HTML output. The underlying search engine uses javascript and DHTML and
1518+
# the HTML output. The underlying search engine uses JavaScript and DHTML and
15191519
# should work on any modern browser. Note that when using HTML help
15201520
# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
15211521
# there is already a search function so this one should typically be disabled.
1522-
# For large projects the javascript based search engine can be slow, then
1522+
# For large projects the JavaScript based search engine can be slow, then
15231523
# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
15241524
# search using the keyboard; to jump to the search box use <access key> + S
15251525
# (what the <access key> is depends on the OS and browser, but it is typically

doc/news.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ <H1>10. Whats new in Version 2.0.0 'Dufour'?</H1>
616616
normal map view as well as in print composer.
617617
<LI>HTML support has been added map composer label item to give you even
618618
more control over your final maps. HTML labels support full css styles
619-
sheets, html, and even javascript if you are that way inclined.
619+
sheets, html, and even JavaScript if you are that way inclined.
620620
<LI>The labeling system has been totally overhauled - it now includes many
621621
new features such as drop shadows, 'highway shields', many more data bound
622622
options, and various performance enhancements. We are slowly doing away

doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ key new features.
498498
normal map view as well as in print composer.
499499
- HTML support has been added map composer label item to give you even
500500
more control over your final maps. HTML labels support full css styles
501-
sheets, html, and even javascript if you are that way inclined.
501+
sheets, html, and even JavaScript if you are that way inclined.
502502
- The labeling system has been totally overhauled - it now includes many
503503
new features such as drop shadows, 'highway shields', many more data bound
504504
options, and various performance enhancements. We are slowly doing away

src/core/composer/qgscomposerhtml.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ void QgsComposerHtml::loadHtml( const bool useCache, const QgsExpressionContext
210210
if ( !mAtlasFeatureJSON.isEmpty() )
211211
{
212212
mWebPage->mainFrame()->evaluateJavaScript( QStringLiteral( "if ( typeof setFeature === \"function\" ) { setFeature(%1); }" ).arg( mAtlasFeatureJSON ) );
213-
//needs an extra process events here to give javascript a chance to execute
213+
//needs an extra process events here to give JavaScript a chance to execute
214214
qApp->processEvents();
215215
}
216216

src/core/geometry/qgsinternalgeometryengine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y ) const
9595

9696

9797
// polylabel implementation
98-
// ported from the original Javascript implementation developed by Vladimir Agafonkin
98+
// ported from the original JavaScript implementation developed by Vladimir Agafonkin
9999
// originally licensed under the ISC License
100100

101101
/// @cond PRIVATE

src/core/qgswebpage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ class CORE_EXPORT QgsWebPage : public QWebPage
243243
virtual void javaScriptConsoleMessage( const QString &message, int lineNumber, const QString & ) override
244244
{
245245
if ( mIdentifier.isEmpty() )
246-
QgsMessageLog::logMessage( tr( "Line %1: %2" ).arg( lineNumber ).arg( message ), tr( "Javascript" ) );
246+
QgsMessageLog::logMessage( tr( "Line %1: %2" ).arg( lineNumber ).arg( message ), tr( "JavaScript" ) );
247247
else
248-
QgsMessageLog::logMessage( tr( "%1 (line %2): %3" ).arg( mIdentifier ).arg( lineNumber ).arg( message ), tr( "Javascript" ) );
248+
QgsMessageLog::logMessage( tr( "%1 (line %2): %3" ).arg( mIdentifier ).arg( lineNumber ).arg( message ), tr( "JavaScript" ) );
249249
}
250250

251251
private:

0 commit comments

Comments
 (0)