X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainSearch.py;h=0290c0eaecc53849b5e24db5f46226820e0c8550;hb=e80b8410edc8e74e94662722194d1cfddbb19ec5;hp=48f8c764b48d60153e9e0c0f63a4b986d13f4c08;hpb=ee276ea346d90090f039720664dbb18d50e6bf7b;p=bertos.git

diff --git a/wizard/BToolchainSearch.py b/wizard/BToolchainSearch.py
index 48f8c764..0290c0ea 100644
--- a/wizard/BToolchainSearch.py
+++ b/wizard/BToolchainSearch.py
@@ -13,10 +13,9 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 import PyQt4.uic as uic
 
-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 BToolchainSearch(QDialog):
     
@@ -27,7 +26,7 @@ class BToolchainSearch(QDialog):
         self.setWindowTitle(self.tr("Toolchain search page"))
     
     def _setupUi(self):
-        self.content = uic.loadUi("toolchain_search.ui", None)
+        self.content = uic.loadUi(UI_LOCATION + "/toolchain_search.ui", None)
         layout = QVBoxLayout()
         layout.addWidget(self.content)
         self.setLayout(layout)
@@ -68,7 +67,7 @@ class BToolchainSearch(QDialog):
             self.content.customDirList.addItem(item)
             search_dir_list = qvariant_converter.getStringList(QApplication.instance().settings.value("search_dir_list"))
             search_dir_list = set(search_dir_list + [directory])
-            QApplication.instance().settings.setValue(QString("search_dir_list"), convertStringList(list(search_dir_list)))
+            QApplication.instance().settings.setValue(QString("search_dir_list"), qvariant_converter.convertStringList(list(search_dir_list)))
             self._setSearchButton()
     
     def _removeDir(self):