Skip to content

Commit efeae6f

Browse files
pcavpcav
committedMay 22, 2015
Merge branch 'master' of https://github.com/qgis/QGIS
·
ltr-3_40archive/master_2
2 parents 7dacddc + 06ae01e commit efeae6f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+736
-241
lines changed
 

‎.travis.yml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,43 @@ notifications:
1111
on_success: change
1212
skip_join: true
1313

14+
addons:
15+
postgresql: "9.1"
16+
1417
before_install:
1518
- sudo add-apt-repository ppa:ubuntugis/ppa -y
19+
- sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y # For postgresql-9.1-postgis-2.1
1620
- sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y
21+
- sudo rm -f /etc/apt/sources.list.d/pgdg-source.list # postgis from pgdg requires different gdal package than the grass package
1722
- sudo apt-get update -qq
18-
- sudo apt-get install --no-install-recommends bison cmake cmake-data doxygen flex git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqscintilla2-dev libqt4-dev libqt4-opengl-dev libqtwebkit-dev libqwt-dev libspatialindex-dev libspatialite-dev libsqlite3-dev lighttpd pkg-config poppler-utils pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb
23+
- sudo apt-get remove postgresql-9.1-postgis-2.1 # Remove postgis from pgdg, will install postgis from ubuntugis-unstable instead
24+
- sudo apt-get install --no-install-recommends
25+
bison cmake cmake-data doxygen flex git graphviz
26+
grass-dev libexpat1-dev libfcgi-dev libgdal1-dev
27+
libgeos-dev libgsl0-dev libpq-dev libproj-dev
28+
libqscintilla2-dev libqt4-dev libqt4-opengl-dev
29+
libqtwebkit-dev libqwt-dev libspatialindex-dev
30+
libspatialite-dev libsqlite3-dev lighttpd pkg-config
31+
poppler-utils pyqt4-dev-tools python python-dev
32+
python-qt4 python-qt4-dev python-sip python-sip-dev
33+
spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi
34+
xfonts-base xfonts-scalable xvfb
35+
postgresql-9.1-postgis-2.1
1936
- cmake --version
2037
- clang --version
2138

2239
install:
2340
- mkdir build
2441
- cd build
25-
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF \
26-
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON ..
42+
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
43+
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON
44+
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON ..
45+
46+
before_script:
47+
- printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf
48+
- psql -c 'CREATE DATABASE qgis_test;' -U postgres
49+
- psql -c 'CREATE EXTENSION postgis;' -U postgres -d qgis_test
50+
- psql -f $TRAVIS_BUILD_DIR/tests/testdata/postgres/testdata.sql -U postgres -d qgis_test
2751

2852
script: xvfb-run ctest -V -E 'PyQgsPalLabelingServer|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure
2953

‎python/core/qgsexpression.sip

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ class QgsExpression
194194
class Function
195195
{
196196
public:
197-
Function( QString fnname, int params, QString group, QString helpText = QString(), bool usesGeometry = false, QStringList referencedColumns = QStringList() );
197+
Function( const QString& fnname, int params, const QString& group, const QString& helpText = QString(), bool usesGeometry = false, QStringList referencedColumns = QStringList(), bool lazyEval = false );
198198
/** The name of the function. */
199199
QString name();
200200
/** The number of parameters this function takes. */
@@ -219,17 +219,15 @@ class QgsExpression
219219
/** The group the function belongs to. */
220220
QString group();
221221
/** The help text for the function. */
222-
QString helptext();
222+
const QString helptext();
223223

224224
virtual QVariant func( const QVariantList& values, const QgsFeature* f, QgsExpression* parent ) = 0;
225225
};
226226

227227

228-
static const QList<QgsExpression::Function *> &Functions();
229-
// static QList<Function*> gmFunctions;
228+
static const QList<QgsExpression::Function *>& Functions();
230229

231-
// static QStringList gmBuiltinFunctions;
232-
static const QStringList &BuiltinFunctions();
230+
static const QStringList& BuiltinFunctions();
233231

234232
static bool registerFunction( Function* function );
235233
static bool unregisterFunction( QString name );
@@ -311,7 +309,7 @@ class QgsExpression
311309
~NodeList();
312310
void append( QgsExpression::Node* node /Transfer/ );
313311
int count();
314-
QList<QgsExpression::Node*> list();
312+
const QList<QgsExpression::Node*>& list();
315313

316314
virtual QString dump() const;
317315

@@ -422,9 +420,9 @@ class QgsExpression
422420
class NodeLiteral : QgsExpression::Node
423421
{
424422
public:
425-
NodeLiteral( QVariant value );
423+
NodeLiteral( const QVariant& value );
426424

427-
QVariant value() const;
425+
const QVariant& value() const;
428426

429427
virtual QgsExpression::NodeType nodeType() const;
430428
virtual bool prepare( QgsExpression* parent, const QgsFields &fields );
@@ -439,7 +437,7 @@ class QgsExpression
439437
class NodeColumnRef : QgsExpression::Node
440438
{
441439
public:
442-
NodeColumnRef( QString name );
440+
NodeColumnRef( const QString& name );
443441

444442
QString name() const;
445443

0 commit comments

Comments
 (0)
Please sign in to comment.