Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/E5Gui/E5ModelToolBar.py	Tue Jul 01 18:57:23 2014 +0200
+++ b/E5Gui/E5ModelToolBar.py	Tue Jul 01 19:55:15 2014 +0200
@@ -61,7 +61,7 @@
                 self._build)
             self.__model.rowsRemoved[QModelIndex, int, int].disconnect(
                 self._build)
-            self.__model.dataChanged[QModelIndex, QModelIndex].disconnect(
+            self.__model.dataChanged.disconnect(
                 self._build)
         
         self.__model = model
@@ -72,7 +72,7 @@
                 self._build)
             self.__model.rowsRemoved[QModelIndex, int, int].connect(
                 self._build)
-            self.__model.dataChanged[QModelIndex, QModelIndex].connect(
+            self.__model.dataChanged.connect(
                 self._build)
     
     def model(self):

--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Tue Jul 01 18:57:23 2014 +0200
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Tue Jul 01 19:55:15 2014 +0200
@@ -15,7 +15,8 @@
 import base64
 
 from PyQt5.QtCore import pyqtSignal, Qt, QObject, QByteArray, QDateTime, \
-    QUrl, QCryptographicHash, QFile, QIODevice, QTextStream, QDate, QTime
+    QUrl, QUrlQuery, QCryptographicHash, QFile, QIODevice, QTextStream, \
+    QDate, QTime
 from PyQt5.QtNetwork import QNetworkReply
 
 from E5Gui import E5MessageBox
@@ -157,7 +158,9 @@
         if self.__lastUpdate.isValid():
             queryItems.append(("lastUpdate",
                                self.__lastUpdate.toString(Qt.ISODate)))
-        url.setQueryItems(queryItems)
+        query = QUrlQuery()
+        query.setQueryItems(queryItems)
+        url.setQuery(query)
         return url
     
     def isEnabled(self):

--- a/Helpviewer/HelpLanguagesDialog.py	Tue Jul 01 18:57:23 2014 +0200
+++ b/Helpviewer/HelpLanguagesDialog.py	Tue Jul 01 19:55:15 2014 +0200
@@ -168,7 +168,8 @@
         @return list of expanded language names (list of strings)
         """
         allLanguages = []
-        countries = QLocale.countriesForLanguage(language)
+        countries = [l.country() for l in QLocale.matchingLocales(
+            language, QLocale.AnyScript, QLocale.AnyCountry)]
         languageString = "{0} [{1}]"\
             .format(QLocale.languageToString(language),
                     QLocale(language).name().split('_')[0])

--- a/Helpviewer/Passwords/PasswordManager.py	Tue Jul 01 18:57:23 2014 +0200
+++ b/Helpviewer/Passwords/PasswordManager.py	Tue Jul 01 19:55:15 2014 +0200
@@ -434,7 +434,7 @@
         @return stripped URL (QUrl)
         """
         cleanUrl = QUrl(url)
-        cleanUrl.setQueryItems([])
+        cleanUrl.setQuery("")
         cleanUrl.setFragment("")
         cleanUrl.setUserInfo("")
         return cleanUrl

--- a/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Tue Jul 01 18:57:23 2014 +0200
+++ b/Preferences/ConfigurationPages/HelpWebBrowserPage.py	Tue Jul 01 19:55:15 2014 +0200
@@ -125,7 +125,9 @@
         self.expireHistory.setCurrentIndex(idx)
         
         for language in range(2, QLocale.LastLanguage + 1):
-            if len(QLocale.countriesForLanguage(language)) > 0:
+            countries = [l.country() for l in QLocale.matchingLocales(
+                language, QLocale.AnyScript, QLocale.AnyCountry)]
+            if len(countries) > 0:
                 self.languageCombo.addItem(
                     QLocale.languageToString(language), language)
         self.languageCombo.model().sort(0)

--- a/Preferences/PreferencesLexer.py	Tue Jul 01 18:57:23 2014 +0200
+++ b/Preferences/PreferencesLexer.py	Tue Jul 01 19:55:15 2014 +0200
@@ -9,7 +9,8 @@
 
 from __future__ import unicode_literals
 
-from PyQt5.QtGui import QColor, QFont, QCoreApplication
+from PyQt5.QtCore import QCoreApplication
+from PyQt5.QtGui import QColor, QFont
 from PyQt5.Qsci import QsciLexer
 
 import Preferences