sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use JavaScript instead of javascript/Javascript

Browse Source 
+ update INSTALL doc
This commit is contained in:
Harrissou Sant-anna 2017-07-08 07:29:33 +02:00 committed by Matthias Kuhn
parent 99ea2e8e8f
commit 0d9945deac
8 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
INSTALL
View File

@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Tuesday June 27, 2017
Saturday July 08, 2017
Last Updated: Tuesday June 27, 2017
Last Change : Tuesday June 27, 2017
Last Updated: Saturday July 08, 2017
Last Change : Tuesday July 04, 2017
1. Introduction
@ -261,7 +261,7 @@ be pressed several times before the 'g' option becomes available.
After the 'g' generation is complete, press 'q' to exit the ccmake
interactive dialog.
/!\ Warning: Make sure that your build directory is completely empty when you
/!\ Warning: Make sure that your build directory is completely empty when you
enter the command. Do never try to "re-use" an existing Qt4 build directory.
If you want to use `ccmake` or other interactive tools, run the command in
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.
3.9.1. Install build dependencies
=================================
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
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
To build QGIS server additional dependencies are required:
@ -747,7 +740,7 @@ successful install, they're not needed anymore.
In order to check out QGIS sources from the repository, you need a git client.
This installer should work fine:
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)
https://git-scm.com/download/win
4.2.6. CMake

2
NEWS
View File

@ -511,7 +511,7 @@ key new features.
normal map view as well as in print composer.
- HTML support has been added map composer label item to give you even
more control over your final maps. HTML labels support full css styles
sheets, html, and even javascript if you are that way inclined.
sheets, html, and even JavaScript if you are that way inclined.
- The labeling system has been totally overhauled - it now includes many
new features such as drop shadows, 'highway shields', many more data bound
options, and various performance enhancements. We are slowly doing away

6
cmake_templates/Doxyfile.in
View File

@ -1506,7 +1506,7 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
MATHJAX_EXTENSIONS =
# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
# The MATHJAX_CODEFILE tag can be used to specify a file with JavaScript pieces
# of code that will be used on startup of the MathJax code. See the MathJax site
# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
# example see the documentation.
@ -1515,11 +1515,11 @@ MATHJAX_EXTENSIONS =
MATHJAX_CODEFILE =
# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
# the HTML output. The underlying search engine uses javascript and DHTML and
# the HTML output. The underlying search engine uses JavaScript and DHTML and
# should work on any modern browser. Note that when using HTML help
# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
# there is already a search function so this one should typically be disabled.
# For large projects the javascript based search engine can be slow, then
# For large projects the JavaScript based search engine can be slow, then
# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
# search using the keyboard; to jump to the search box use <access key> + S
# (what the <access key> is depends on the OS and browser, but it is typically

2
doc/news.html
View File

@ -616,7 +616,7 @@ key new features.
normal map view as well as in print composer.
<LI>HTML support has been added map composer label item to give you even
more control over your final maps. HTML labels support full css styles
sheets, html, and even javascript if you are that way inclined.
sheets, html, and even JavaScript if you are that way inclined.
<LI>The labeling system has been totally overhauled - it now includes many
new features such as drop shadows, 'highway shields', many more data bound
options, and various performance enhancements. We are slowly doing away

2
doc/news.t2t
View File

@ -498,7 +498,7 @@ key new features.
normal map view as well as in print composer.
- HTML support has been added map composer label item to give you even
more control over your final maps. HTML labels support full css styles
sheets, html, and even javascript if you are that way inclined.
sheets, html, and even JavaScript if you are that way inclined.
- The labeling system has been totally overhauled - it now includes many
new features such as drop shadows, 'highway shields', many more data bound
options, and various performance enhancements. We are slowly doing away

2
src/core/composer/qgscomposerhtml.cpp
View File

@ -210,7 +210,7 @@ void QgsComposerHtml::loadHtml( const bool useCache, const QgsExpressionContext
if ( !mAtlasFeatureJSON.isEmpty() )
{
mWebPage->mainFrame()->evaluateJavaScript( QStringLiteral( "if ( typeof setFeature === \"function\" ) { setFeature(%1); }" ).arg( mAtlasFeatureJSON ) );
//needs an extra process events here to give javascript a chance to execute
//needs an extra process events here to give JavaScript a chance to execute
qApp->processEvents();
}

2
src/core/geometry/qgsinternalgeometryengine.cpp
View File

@ -95,7 +95,7 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y ) const
// polylabel implementation
// ported from the original Javascript implementation developed by Vladimir Agafonkin
// ported from the original JavaScript implementation developed by Vladimir Agafonkin
// originally licensed under the ISC License
/// @cond PRIVATE

4
src/core/qgswebpage.h
View File

@ -243,9 +243,9 @@ class CORE_EXPORT QgsWebPage : public QWebPage
virtual void javaScriptConsoleMessage( const QString &message, int lineNumber, const QString & ) override
{
if ( mIdentifier.isEmpty() )
QgsMessageLog::logMessage( tr( "Line %1: %2" ).arg( lineNumber ).arg( message ), tr( "Javascript" ) );
QgsMessageLog::logMessage( tr( "Line %1: %2" ).arg( lineNumber ).arg( message ), tr( "JavaScript" ) );
else
QgsMessageLog::logMessage( tr( "%1 (line %2): %3" ).arg( mIdentifier ).arg( lineNumber ).arg( message ), tr( "Javascript" ) );
QgsMessageLog::logMessage( tr( "%1 (line %2): %3" ).arg( mIdentifier ).arg( lineNumber ).arg( message ), tr( "JavaScript" ) );
}
private: