sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

osgeo4w: support separate symstores

Browse Source
This commit is contained in:
Juergen E. Fischer 2019-07-20 02:15:54 +02:00
parent 6749cb3d1f
commit 5ed9efb3b6
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/qgisapp.cpp
View File

@ -13457,6 +13457,13 @@ void QgisApp::keyPressEvent( QKeyEvent *e )
// QgsDebugMsg( QStringLiteral( "%1 (keypress received)" ).arg( e->text() ) ); // QgsDebugMsg( QStringLiteral( "%1 (keypress received)" ).arg( e->text() ) );
emit keyPressed( e ); emit keyPressed( e );
#if 0 && defined(_MSC_VER) && defined(QGISDEBUG)
if ( e->key() == Qt::Key_Backslash && e->modifiers() == Qt::ControlModifier )
{
QgsCrashHandler::handle( 0 );
}
#endif
//cancel rendering progress with esc key //cancel rendering progress with esc key
if ( e->key() == Qt::Key_Escape ) if ( e->key() == Qt::Key_Escape )
{ {

17
src/app/qgscrashhandler.cpp
View File

@ -39,20 +39,19 @@ LONG WINAPI QgsCrashHandler::handle( LPEXCEPTION_POINTERS exception )
QString symbolPath; QString symbolPath;
if ( !QgsApplication::isRunningFromBuildDir() ) if ( !QgsApplication::isRunningFromBuildDir() )
{ {
symbolPath = getenv( "QGIS_PREFIX_PATH" ); symbolPath = QStringLiteral( "%1\\pdb;http://msdl.microsoft.com/download/symbols;http://download.osgeo.org/osgeo4w/%2/symstores/%3" )
symbolPath = symbolPath + "\\pdb;http://msdl.microsoft.com/download/symbols;http://download.osgeo.org/osgeo4w/symstore"; .arg( getenv( "QGIS_PREFIX_PATH" ) )
.arg( QSysInfo::WordSize == 64 ? QStringLiteral( "x86_64" ) : QStringLiteral( "x86" ) )
.arg( QFileInfo( getenv( "QGIS_PREFIX_PATH" ) ).baseName() );
} }
else else
{ {
QString pdbPath = getenv( "QGIS_PDB_PATH" ); symbolPath = QStringLiteral( "%1;%2;http://msdl.microsoft.com/download/symbols" )
QString appPath = QgsApplication::applicationDirPath(); .arg( getenv( "QGIS_PDB_PATH" ) )
symbolPath += QString( "%1;%2;http://msdl.microsoft.com/download/symbols;http://download.osgeo.org/osgeo4w/symstore" ) .arg( QgsApplication::applicationDirPath() );
.arg( appPath )
.arg( pdbPath );
} }
QString ptrStr = QString( "0x%1" ).arg( ( quintptr )exception, QString ptrStr = QString( "0x%1" ).arg( ( quintptr )exception, QT_POINTER_SIZE * 2, 16, QChar( '0' ) );
QT_POINTER_SIZE * 2, 16, QChar( '0' ) );
QString fileName = QStandardPaths::standardLocations( QStandardPaths::TempLocation ).at( 0 ) + "/qgis-crash-info-" + QString::number( processID ); QString fileName = QStandardPaths::standardLocations( QStandardPaths::TempLocation ).at( 0 ) + "/qgis-crash-info-" + QString::number( processID );
QgsDebugMsg( fileName ); QgsDebugMsg( fileName );