Fix windows build

NathanW2 · NathanW2 · commit f639d1e4f025 · 2016-01-14T09:13:03.000+10:00
diff --git a/src/gui/qgsfilepickerwidget.cpp b/src/gui/qgsfilepickerwidget.cpp
@@ -280,7 +280,7 @@ QString QgsFilePickerWidget::toUrl( const QString& path ) const
 
   QString urlStr = relativePath( path, false );
   QUrl url = QUrl::fromUserInput( urlStr );
-  if ( !url.isValid() or !url.isLocalFile() )
+  if ( !url.isValid() || !url.isLocalFile() )
   {
     QgsDebugMsg( QString( "URL: %1 is not valid or not a local file !" ).arg( path ) );
     rep =  path;

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ QString QgsFilePickerWidget::toUrl( const QString& path ) const`
`280`	`280`
`281`	`281`	`QString urlStr = relativePath( path, false );`
`282`	`282`	`QUrl url = QUrl::fromUserInput( urlStr );`
`283`		`- if ( !url.isValid() or !url.isLocalFile() )`
	`283`	`+ if ( !url.isValid() \|\| !url.isLocalFile() )`
`284`	`284`	`{`
`285`	`285`	`QgsDebugMsg( QString( "URL: %1 is not valid or not a local file !" ).arg( path ) );`
`286`	`286`	`rep = path;`