projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove duplicate toolchains
[bertos.git]
/
wizard
/
BWizardPage.py
diff --git
a/wizard/BWizardPage.py
b/wizard/BWizardPage.py
index 5e5569ab8362a5ce8e32df2ab4ae55e51ea4e9c7..f7b60c37309599b25a3afd6ae4d30e8784a968cd 100644
(file)
--- a/
wizard/BWizardPage.py
+++ b/
wizard/BWizardPage.py
@@
-13,7
+13,10
@@
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4 import uic
from PyQt4.QtGui import *
from PyQt4 import uic
-import qvariant_converter
+if PYQT_VERSION_STR > "4.4.3":
+ import qvariant_converter_new as qvariant_converter
+else:
+ import qvariant_converter_old as qvariant_converter
class BWizardPage(QWizardPage):
class BWizardPage(QWizardPage):
@@
-55,10
+58,10
@@
class BWizardPage(QWizardPage):
self._settingsStore("path_search", qvariant_converter.convertBool(path_search))
def toolchains(self):
self._settingsStore("path_search", qvariant_converter.convertBool(path_search))
def toolchains(self):
- return qvariant_converter.get
StringLis
t(self._settingsRetrieve("toolchains"))
+ return qvariant_converter.get
BoolDic
t(self._settingsRetrieve("toolchains"))
def setToolchains(self, toolchains):
def setToolchains(self, toolchains):
- self._settingsStore("toolchains", qvariant_converter.convert
StringLis
t(toolchains))
+ self._settingsStore("toolchains", qvariant_converter.convert
BoolDic
t(toolchains))
def reloadData(self):
pass
\ No newline at end of file
def reloadData(self):
pass
\ No newline at end of file