[QGIS Commit] r14856 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-12-06 14:27:07 -0800 (Mon, 06 Dec 2010)
New Revision: 14856

Modified:
   trunk/qgis/src/app/main.cpp
Log:
use system qt translations

Modified: trunk/qgis/src/app/main.cpp
===================================================================
--- trunk/qgis/src/app/main.cpp	2010-12-06 22:14:50 UTC (rev 14855)
+++ trunk/qgis/src/app/main.cpp	2010-12-06 22:27:07 UTC (rev 14856)
@@ -592,13 +592,14 @@
   {
     myApp.installTranslator( &qgistor );
   }
+
   /* Translation file for Qt.
    * The strings from the QMenuBar context section are used by Qt/Mac to shift
    * the About, Preferences and Quit items to the Mac Application menu.
    * These items must be translated identically in both qt_ and qgis_ files.
    */
   QTranslator qttor( 0 );
-  if ( qttor.load( QString( "qt_" ) + myTranslationCode, i18nPath ) )
+  if ( qttor.load( QString( "qt_" ) + myTranslationCode, QLibraryInfo::location( QLibraryInfo::TranslationsPath ) ) )
   {
     myApp.installTranslator( &qttor );
   }