projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to resolve the wrong definition\nTODO: see if the resolution is acceptable.
[bertos.git]
/
wizard
/
BVersionPage.py
diff --git
a/wizard/BVersionPage.py
b/wizard/BVersionPage.py
index 1d078565794d51c3f93c55341ae52c3104477592..ce72ff461607c633688a54b8189a1788dfcca17f 100644
(file)
--- a/
wizard/BVersionPage.py
+++ b/
wizard/BVersionPage.py
@@
-12,15
+12,14
@@
from PyQt4.QtGui import *
from BWizardPage import *
import bertos_utils
from PyQt4.QtGui import *
from BWizardPage import *
import bertos_utils
-if PYQT_VERSION_STR > "4.4.3":
- import qvariant_converter_new as qvariant_converter
-else:
- import qvariant_converter_old as qvariant_converter
+import qvariant_converter
+
+from const import *
class BVersionPage(BWizardPage):
def __init__(self):
class BVersionPage(BWizardPage):
def __init__(self):
- BWizardPage.__init__(self,
"
bertos_versions.ui")
+ BWizardPage.__init__(self,
UI_LOCATION + "/
bertos_versions.ui")
self._connectSignals()
self._fillVersionList()
self._setupUi()
self._connectSignals()
self._fillVersionList()
self._setupUi()