Fix some warnings and test failures on nightlies

This commit is contained in:
Nyall Dawson 2016-01-15 08:32:56 +11:00
parent f5373ac3b9
commit c452c3d85f
5 changed files with 2 additions and 2 deletions

View File

@ -84,7 +84,7 @@ class Merge(GeoAlgorithm):
total = 100.0 / float(totalFeatureCount)
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
fields.toList(), layers[0].dataProvider().geometryType(),
layers[0].crs())
layers[0].crs())
featureCount = 0
for layer in layers:

View File

@ -307,7 +307,7 @@ void qgisCrash( int signal )
if ( gdbpid == 0 )
{
// attach, backtrace and continue
execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, nullptr );
execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, NULL );
perror( "cannot exec gdb" );
exit( 1 );
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB