Qt: update QUrlValidator (fix #9932)

somehow #3435

modules/gui/qt4/util/validators.cpp

@@ -24,12 +24,27 @@
 
 #include "validators.hpp"
 
+#include <QUrl>
+
 QValidator::State UrlValidator::validate( QString& str, int& ) const
 {
-    str = str.trimmed();
-    if( str.contains( ' ' ) )
+    if( str.startsWith( ' ' ) )
         return QValidator::Invalid;
-    if( !str.contains( "://" ) )
+
+    if ( str.isEmpty() )
+        return QValidator::Intermediate;
+
+    QUrl url( str );
+    if ( url.scheme().isEmpty() )
         return QValidator::Intermediate;
-    return QValidator::Acceptable;
+
+    return ( url.isValid() ) ? QValidator::Acceptable : QValidator::Intermediate;
+}
+
+void UrlValidator::fixup( QString & input ) const
+{
+    while( input.startsWith( ' ' ) )
+        input.chop( 1 );
+    QUrl fixed( input, QUrl::TolerantMode );
+    input = fixed.toString();
 }

modules/gui/qt4/util/validators.hpp

@@ -29,6 +29,7 @@ class UrlValidator : public QValidator
 public:
    UrlValidator( QObject *parent ) : QValidator( parent ) { }
    virtual QValidator::State validate( QString&, int& ) const;
+   virtual void fixup ( QString & input ) const;
 };
 
 #endif // VALIDATORS_HPP