This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Running tests... | |
Test project /home/fischer/src/qgis/debian/build | |
Start 1: qgis_applicationtest | |
1/17 Test #1: qgis_applicationtest ................. Passed 0.30 sec | |
Start 2: qgis_expressiontest | |
2/17 Test #2: qgis_expressiontest .................. Passed 0.12 sec | |
Start 3: qgis_filewritertest | |
3/17 Test #3: qgis_filewritertest .................. Passed 0.16 sec | |
Start 4: qgis_regression992 | |
4/17 Test #4: qgis_regression992 ................... Passed 0.42 sec |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
make[1]: Entering directory `/home/fischer/src/qgis/debian/build' | |
Running tests... | |
Test project /home/fischer/src/qgis/debian/build | |
Start 1: qgis_applicationtest | |
1/17 Test #1: qgis_applicationtest ................. Passed 0.12 sec | |
Start 2: qgis_expressiontest | |
2/17 Test #2: qgis_expressiontest .................. Passed 0.12 sec | |
Start 3: qgis_filewritertest | |
3/17 Test #3: qgis_filewritertest .................. Passed 0.16 sec | |
Start 4: qgis_regression992 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
export DEBEMAIL=jef@norbit.de | |
export DEBFULLNAME="Jürgen E. Fischer" | |
export PPA=${1:-qgis-unstable-ubuntugis-jef} | |
export T=$(mktemp) | |
cp debian/changelog $T | |
trap "cp $T debian/changelog && rm -f $T" EXIT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/main.cpp b/src/app/main.cpp | |
index 3253a34..f73ab00 100644 | |
--- a/src/app/main.cpp | |
+++ b/src/app/main.cpp | |
@@ -649,11 +649,13 @@ int main( int argc, char *argv[] ) | |
QgisApp *qgis = new QgisApp( mypSplash, myRestorePlugins ); // "QgisApp" used to find canonical instance | |
qgis->setObjectName( "QgisApp" ); | |
+#if 0 | |
myApp.connect( |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp | |
index 0f1c943..cbaeacb 100644 | |
--- a/src/core/qgsapplication.cpp | |
+++ b/src/core/qgsapplication.cpp | |
@@ -200,7 +200,8 @@ bool QgsApplication::event( QEvent * event ) | |
bool QgsApplication::notify( QObject * receiver, QEvent * event ) | |
{ | |
bool done = false; | |
- emit preNotify( receiver, event, &done ); | |
+ if( thread() == receiver->thread() ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp | |
index b4e06a7..3dad784 100644 | |
--- a/src/core/qgsvectorlayer.cpp | |
+++ b/src/core/qgsvectorlayer.cpp | |
@@ -1828,6 +1828,12 @@ bool QgsVectorLayer::nextFeature( QgsFeature &f ) | |
{ | |
updateFeatureAttributes( f ); //check joined attributes / changed attributes | |
} | |
+ | |
+ if ( mFetchGeometry && mChangedGeometries.contains( f.id() ) ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp | |
index 3fbbf2c..29ea24b 100644 | |
--- a/src/app/composer/qgscomposer.cpp | |
+++ b/src/app/composer/qgscomposer.cpp | |
@@ -83,7 +83,9 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title ) | |
int size = settings.value( "/IconSize", QGIS_ICON_SIZE ).toInt(); | |
setIconSize( QSize( size, size ) ); | |
+#ifndef Q_WS_MAC | |
setFontSize( settings.value( "/fontPointSize", QGIS_DEFAULT_FONTSIZE ).toInt() ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp | |
index 9770078..ef15b4e 100644 | |
--- a/src/core/composer/qgscomposerattributetable.cpp | |
+++ b/src/core/composer/qgscomposerattributetable.cpp | |
@@ -264,7 +264,7 @@ bool QgsComposerAttributeTable::writeXML( QDomElement& elem, QDomDocument & doc | |
for ( ; sortIt != mSortInformation.constEnd(); ++sortIt ) | |
{ | |
QDomElement columnElem = doc.createElement( "column" ); | |
- columnElem.setAttribute( "index", QString::number( sortIt->first ) ); | |
+ columnElem.setAttribute( "index", sortIt->first ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp | |
index c167af8..94672c0 100644 | |
--- a/src/core/composer/qgscomposerarrow.cpp | |
+++ b/src/core/composer/qgscomposerarrow.cpp | |
@@ -284,8 +284,8 @@ void QgsComposerArrow::adaptItemSceneRect() | |
bool QgsComposerArrow::writeXML( QDomElement& elem, QDomDocument & doc ) const | |
{ | |
QDomElement composerArrowElem = doc.createElement( "ComposerArrow" ); | |
- composerArrowElem.setAttribute( "outlineWidth", outlineWidth() ); | |
- composerArrowElem.setAttribute( "arrowHeadWidth", mArrowHeadWidth ); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: ogr/ogrfeature.cpp | |
=================================================================== | |
--- ogr/ogrfeature.cpp (revision 24702) | |
+++ ogr/ogrfeature.cpp (working copy) | |
@@ -1927,8 +1927,13 @@ void OGR_F_SetFieldDouble( OGRFeatureH hFeat, int | |
void OGRFeature::SetField( int iField, const char * pszValue ) | |
{ | |
- OGRFieldDefn *poFDefn = poDefn->GetFieldDefn( iField ); | |
+ static int bWarn = -1; |