Changeset 181 for smplayer/trunk/src/translator.cpp
- Timestamp:
- Aug 31, 2016, 5:31:04 PM (9 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
- Property svn:mergeinfo changed
/smplayer/vendor/current merged: 179
- Property svn:mergeinfo changed
-
smplayer/trunk/src/translator.cpp
r176 r181 26 26 qApp->installTranslator( &app_trans ); 27 27 qApp->installTranslator( &qt_trans ); 28 #if QT_VERSION >= 0x050000 29 qApp->installTranslator( &qtbase_trans ); 30 #endif 28 31 } 29 32 … … 53 56 // most users won't have Qt installed. 54 57 loadCatalog(qt_trans, "qt", locale, trans_path ); 58 #if QT_VERSION >= 0x050000 59 loadCatalog(qtbase_trans, "qtbase", locale, trans_path); 60 #endif 55 61 #else 56 62 // In linux try to load it first from app path (in case there's an updated … … 59 65 loadCatalog(qt_trans, "qt", locale, qt_trans_path); 60 66 } 67 #if QT_VERSION >= 0x050000 68 if (! loadCatalog(qtbase_trans, "qtbase", locale, trans_path ) ) { 69 loadCatalog(qtbase_trans, "qtbase", locale, qt_trans_path); 70 } 71 #endif 61 72 #endif 62 73 loadCatalog(app_trans, "smplayer", locale, trans_path);
Note:
See TracChangeset
for help on using the changeset viewer.