[QGIS Commit] r8713 - trunk/qgis/tests/src/core

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sun Jul 6 07:41:07 EDT 2008


Author: timlinux
Date: 2008-07-06 07:41:07 -0400 (Sun, 06 Jul 2008)
New Revision: 8713

Modified:
   trunk/qgis/tests/src/core/testqgsrasterlayer.cpp
Log:
Use new prefix path mechanism to locate resources


Modified: trunk/qgis/tests/src/core/testqgsrasterlayer.cpp
===================================================================
--- trunk/qgis/tests/src/core/testqgsrasterlayer.cpp	2008-07-06 11:36:54 UTC (rev 8712)
+++ trunk/qgis/tests/src/core/testqgsrasterlayer.cpp	2008-07-06 11:41:07 UTC (rev 8713)
@@ -70,17 +70,9 @@
 {
   // init QGIS's paths - true means that all path will be inited from prefix
   QString qgisPath = QCoreApplication::applicationDirPath ();
-  QgsApplication::setPrefixPath(qgisPath, TRUE);
-#ifdef Q_OS_LINUX
-  QgsApplication::setPkgDataPath(qgisPath + "/../share/qgis");
-#endif
+  QgsApplication::setPrefixPath(INSTALL_PREFIX, true);
+  QgsApplication::showSettings();
   //create some objects that will be used in all tests...
-
-  std::cout << "Prefix  PATH: " << QgsApplication::prefixPath().toLocal8Bit().data() << std::endl;
-  std::cout << "Plugin  PATH: " << QgsApplication::pluginPath().toLocal8Bit().data() << std::endl;
-  std::cout << "PkgData PATH: " << QgsApplication::pkgDataPath().toLocal8Bit().data() << std::endl;
-  std::cout << "User DB PATH: " << QgsApplication::qgisUserDbFilePath().toLocal8Bit().data() << std::endl;
-
   //create a raster layer that will be used in all tests...
   mTestDataDir = QString(TEST_DATA_DIR) + QDir::separator(); //defined in CmakeLists.txt
   QString myFileName = mTestDataDir + "tenbytenraster.asc";



More information about the QGIS-commit mailing list