Fix pb. with resources

diff --git a/src/Qtx/QtxTranslator.cxx b/src/Qtx/QtxTranslator.cxx
index ff656d09389bfcb2e945d7dfd873cd4d8dbfb7a4..683a3ce68e57a8f57fab732b64967269d0a0006c 100644 (file)
--- a/src/Qtx/QtxTranslator.cxx
+++ b/src/Qtx/QtxTranslator.cxx
@@ -70,6 +70,15 @@ QtxTranslator::~QtxTranslator()
   \param comment message comment (optional)
   \return Translated text if found or \a sourceText otherwise
 */
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+QString QtxTranslator::translate( const char* context, const char* sourceText, const char* comment ) const
+{
+  QString res = QTranslator::translate( context, sourceText, comment );
+  if( res.isNull() )
+    res = QTranslator::translate( GLOBAL_CONTEXT, sourceText, comment );
+  return res;
+}
+#else
 QString QtxTranslator::translate( const char* context, const char* sourceText, const char* comment, int n ) const
 {
   QString res = QTranslator::translate( context, sourceText, comment, n );
@@ -77,3 +86,4 @@ QString QtxTranslator::translate( const char* context, const char* sourceText, c
     res = QTranslator::translate( GLOBAL_CONTEXT, sourceText, comment, n );
   return res;
 }
+#endif

diff --git a/src/Qtx/QtxTranslator.h b/src/Qtx/QtxTranslator.h
index 9cc672541c4fb2ac6ae4f7681da00b62025b87cc..db6909ee2305732e8098d8bf130ff5d1f750943c 100644 (file)
--- a/src/Qtx/QtxTranslator.h
+++ b/src/Qtx/QtxTranslator.h
@@ -32,7 +32,11 @@ class QTX_EXPORT QtxTranslator : public QTranslator
 public:
   QtxTranslator( QObject* parent = 0 );
   ~QtxTranslator();
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+  virtual QString translate( const char*, const char*, const char* = 0 ) const;
+#else
   virtual QString translate( const char*, const char*, const char* = 0, int n = -1 ) const;
+#endif
 };
 
 #endif