jef-n

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc959e5..d014184 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -566,6 +566,10 @@ IF (WITH_BINDINGS)
   SET(SIP_CONCAT_PARTS 4)
   SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS})
 
+  IF(PYQT4_VERSION STRGREATER "040904")
+    SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})

jef-n

diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
index a69fb30..8ee7107 100644
--- a/src/plugins/coordinate_capture/coordinatecapture.cpp
+++ b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -114,7 +114,6 @@ void CoordinateCapture::initGui()
   connect( mpMapTool, SIGNAL( mouseMoved( QgsPoint ) ), this, SLOT( mouseMoved( QgsPoint ) ) );
   connect( mpMapTool, SIGNAL( mouseClicked( QgsPoint ) ), this, SLOT( mouseClicked( QgsPoint ) ) );
 
-
   // create a little widget with x and y display to put into our dock widget

jef-n

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 989c52e..268cdba 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -799,10 +799,6 @@ QgisApp::~QgisApp()
   QgsApplication::exitQgis();
 
   delete QgsProject::instance();
-
-  if ( mPythonUtils )

jef-n

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index d1e72f6..6989587 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -2897,8 +2897,8 @@ void QgisApp::addDatabaseLayer()
     QMessageBox::warning( this, tr( "PostgreSQL" ), tr( "Cannot get PostgreSQL select dialog from provider." ) );
     return;
   }
-  connect( dbs, SIGNAL( addDatabaseLayers( QStringList const &, QString const & ) ),
-           this, SLOT( addDatabaseLayers( QStringList const &, QString const & ) ) );

jef-n

diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
index 0e23f97..24fba43 100644
--- a/src/providers/memory/qgsmemoryfeatureiterator.cpp
+++ b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -106,6 +106,8 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )
   if ( hasFeature )
   {
     feature = P->mFeatures[*mFeatureIdListIterator];
+    if( !feature.fields() )
+      feature.setFields( &P->mFields ); // allow name-based attribute lookups

jef-n

diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
index 220460c..713488a 100644
--- a/src/app/qgsmaptoolshowhidelabels.cpp
+++ b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -212,7 +212,7 @@ bool QgsMapToolShowHideLabels::selectedFeatures( QgsVectorLayer* vlayer,
 
   QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest()
                            .setFilterRect( selectGeomTrans.boundingBox() )
-                           .setFlags( QgsFeatureRequest::ExactIntersect )
+                           .setFlags( QgsFeatureRequest::NoGeometry | QgsFeatureRequest::ExactIntersect )

jef-n

diff --git a/gdal/ogr/ogrsf_frmts/makefile.vc b/gdal/ogr/ogrsf_frmts/makefile.vc
index 03c3fa9..0e77702 100644
--- a/gdal/ogr/ogrsf_frmts/makefile.vc
+++ b/gdal/ogr/ogrsf_frmts/makefile.vc
@@ -236,8 +236,7 @@ default:
                                 ..\..\frmts\sdts\sdtsxref.obj
 
 plugindirs:
-       @echo plugins: $(PLUGINDIRLIST)
-        for %d in ( $(PLUGINDIRLIST) ) do \

jef-n

diff --git a/python/plugins/fTools/tools/doIntersectLines.py b/python/plugins/fTools/tools/doIntersectLines.py
index 5df0975..03725cd 100644
--- a/python/plugins/fTools/tools/doIntersectLines.py
+++ b/python/plugins/fTools/tools/doIntersectLines.py
@@ -111,69 +111,67 @@ class Dialog(QDialog, Ui_Dialog):
         self.outShape.setText( QString( self.shapefileName ) )
 
     def compute(self, line1, line2, field1, field2, outPath, progressBar):
+
         layer1 = ftools_utils.getVectorLayerByName(line1)

jef-n

#!/bin/bash

if [ -f /var/run/apache2.pid ]; then
  if kill -0 $(</var/run/apache2.pid); then
		if ! wget -q --timeout=10 --tries=1 -O /dev/null http://localhost; then
			echo "apache running, but not responding"
			ps auxwf
			date
			tail -20 /var/log/apache2/*.log 
			/etc/init.d/apache2 restart

jef-n

diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
index 7375226..69b46fa 100644
--- a/src/python/qgspythonutilsimpl.cpp
+++ b/src/python/qgspythonutilsimpl.cpp
@@ -457,7 +457,7 @@ QString QgsPythonUtilsImpl::homePythonPath()
   }
   else
   {
-    return '"' + settingsDir + "python\"";
+    return '"' + settingsDir.replace( '\\', "\\\\" ) + "python\"";