From 5733c0143b89af9615745cd55933c4ff6f40fb1a Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 20 Aug 2010 09:48:16 +0200
Subject: [PATCH] With PyQt 4.7.5's new from_imports option, sys.path hackage
 is not required anymore.

---
 README                 | 7 +------
 package.py             | 2 --
 qt/base/main_window.ui | 2 +-
 qt/se/start.py         | 5 -----
 run.py                 | 1 -
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/README b/README
index b4841a6b..48e48cda 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ Windows prerequisites
 ---
 
 - Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
-- PyQt 4.7 (http://www.riverbankcomputing.co.uk/news)
+- PyQt 4.7.5 (http://www.riverbankcomputing.co.uk/news)
 - cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/)
 - Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
 
@@ -66,8 +66,3 @@ Then, just build the thing and then run it with:
 If you want to create ready-to-upload package, run:
 
 	python package.py
-
-64-bit on OS X
----
-
-The "release" configuration of dupeGuru's XCode project build with archs "i386 x86_64 ppc". However there are currently problems with py2app and 64 bit. If you want to correctly build 64-bit apps, refer to http://www.hardcoded.net/articles/building-64-bit-pyobjc-applications-with-py2app.htm .
\ No newline at end of file
diff --git a/package.py b/package.py
index 096002a5..466ee35f 100644
--- a/package.py
+++ b/package.py
@@ -34,7 +34,6 @@ def package_windows(edition, dev):
         return
     add_to_pythonpath('.')
     add_to_pythonpath('qt')
-    add_to_pythonpath(op.join('qt', 'base'))
     add_to_pythonpath(op.join('qt', edition))
     os.chdir(op.join('qt', edition))
     from app import DupeGuru
@@ -74,7 +73,6 @@ def package_windows(edition, dev):
 
 def package_debian(edition):
     add_to_pythonpath('qt')
-    add_to_pythonpath(op.join('qt', 'base'))
     add_to_pythonpath(op.join('qt', edition))
     from app import DupeGuru
     
diff --git a/qt/base/main_window.ui b/qt/base/main_window.ui
index 971425d3..ccdc0f38 100644
--- a/qt/base/main_window.ui
+++ b/qt/base/main_window.ui
@@ -463,7 +463,7 @@
   <customwidget>
    <class>ResultsView</class>
    <extends>QTreeView</extends>
-   <header>results_model</header>
+   <header>.results_model</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/qt/se/start.py b/qt/se/start.py
index 77cf92ca..93bf192e 100644
--- a/qt/se/start.py
+++ b/qt/se/start.py
@@ -15,11 +15,6 @@ from PyQt4.QtGui import QApplication, QIcon, QPixmap
 
 import base.dg_rc
 
-if sys.platform == 'linux2':
-    # Under Python3, we have to add 'base' to pythonpath because UI files don't use
-    # relative imports.
-    sys.path.append(os.path.dirname(base.dg_rc.__file__))
-
 from app import DupeGuru
 
 if sys.platform == 'win32':
diff --git a/run.py b/run.py
index 58d9b73a..d250dece 100644
--- a/run.py
+++ b/run.py
@@ -32,7 +32,6 @@ def main():
     elif ui == 'qt':
         add_to_pythonpath('.')
         add_to_pythonpath('qt')
-        add_to_pythonpath(op.join('qt', 'base'))
         os.chdir(op.join('qt', edition))
         os.system('{0} start.py'.format(sys.executable))
         os.chdir('..')