fix help viewer on windows

jef · jef · commit 94473877d8c6 · 2011-03-01T07:03:02.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15299 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -41,9 +41,11 @@ int main( int argc, char ** argv )
   {
     context = argv[1];
   }
-#ifdef Q_WS_MACX
+#if defined(Q_WS_MACX)
   // If we're on Mac, we have the resource library way above us...
   a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
+#elif defined(Q_WS_WIN)
+  a.setPkgDataPath( QgsApplication::prefixPath() + "/" QGIS_DATA_SUBDIR );
 #else
   a.setPkgDataPath( QgsApplication::prefixPath() + "/../" QGIS_DATA_SUBDIR );
 #endif

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,11 @@ int main( int argc, char ** argv )`
`41`	`41`	`{`
`42`	`42`	`context = argv[1];`
`43`	`43`	`}`
`44`		`-#ifdef Q_WS_MACX`
	`44`	`+#if defined(Q_WS_MACX)`
`45`	`45`	`// If we're on Mac, we have the resource library way above us...`
`46`	`46`	`a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );`
	`47`	`+#elif defined(Q_WS_WIN)`
	`48`	`+ a.setPkgDataPath( QgsApplication::prefixPath() + "/" QGIS_DATA_SUBDIR );`
`47`	`49`	`#else`
`48`	`50`	`a.setPkgDataPath( QgsApplication::prefixPath() + "/../" QGIS_DATA_SUBDIR );`
`49`	`51`	`#endif`