summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-05-14 08:03:42 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-05-14 08:03:42 (GMT)
commit572d57b255227f74c7ce61ab67476d4971955ea9 (patch)
treed0205fad1f2b3a4fa7738fb2ca89470543dde2db
parenta8e4628a1f74b52a61b11b4b1fcc8ccdd4002a46 (diff)
downloadQt-572d57b255227f74c7ce61ab67476d4971955ea9.zip
Qt-572d57b255227f74c7ce61ab67476d4971955ea9.tar.gz
Qt-572d57b255227f74c7ce61ab67476d4971955ea9.tar.bz2
Fixes missing translations in QFileIconProvider
While lupdate ignores ifdefs, it cannot handle ifdefs inside the translate statement itself. Task-number: 188337 Reviewed-by: janarve
-rw-r--r--src/gui/itemviews/qfileiconprovider.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index 9f33af3..054f4cf 100644
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -416,26 +416,22 @@ QString QFileIconProvider::type(const QFileInfo &info) const
}
if (info.isDir())
- return QApplication::translate("QFileDialog",
#ifdef Q_WS_WIN
- "File Folder", "Match Windows Explorer"
+ return QApplication::translate("QFileDialog", "File Folder", "Match Windows Explorer");
#else
- "Folder", "All other platforms"
+ return QApplication::translate("QFileDialog", "Folder", "All other platforms");
#endif
- );
// Windows - "File Folder"
// OS X - "Folder"
// Konqueror - "Folder"
// Nautilus - "folder"
if (info.isSymLink())
- return QApplication::translate("QFileDialog",
#ifdef Q_OS_MAC
- "Alias", "Mac OS X Finder"
+ return QApplication::translate("QFileDialog", "Alias", "Mac OS X Finder");
#else
- "Shortcut", "All other platforms"
+ return QApplication::translate("QFileDialog", "Shortcut", "All other platforms");
#endif
- );
// OS X - "Alias"
// Windows - "Shortcut"
// Konqueror - "Folder" or "TXT File" i.e. what it is pointing to