Skip to content

Commit 0ea0a2a

Browse files
committed
Fixes #4 and bumps version
1 parent e3eb073 commit 0ea0a2a

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

CHANGES

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
python-qt5 Changelog
2+
====================
3+
4+
Version 1.0.9
5+
-------------
6+
7+
- Removed qt.conf dependency

MANIFEST.in

Lines changed: 0 additions & 1 deletion
This file was deleted.

PyQt5/__init__.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@
1818
import os
1919
import sys
2020

21-
# Expose sip to PYTHONPATH
21+
# Setup environment variables
2222
dirname = os.path.dirname(__file__)
2323
sys.path.insert(0, dirname)
2424

25-
# Expose binaries to PATH
26-
sep = ';' if os.name == 'nt' else ':'
27-
os.environ['PATH'] += sep + dirname
25+
os.environ['PATH'] += os.pathsep + dirname
2826

29-
# Expose platform plugins
30-
plugin_path = os.path.join(dirname, 'plugins', 'platforms')
31-
os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] = plugin_path
27+
# Addresses error: "QtQuick" is not installed
28+
os.environ['QML2_IMPORT_PATH'] = os.path.join(dirname, 'qml')
29+
30+
# Addresses error: Problem creating accessible interface
31+
os.environ['QT_PLUGIN_PATH'] = os.path.join(dirname, 'plugins')
32+
33+
# Addresses error: ..could not find or load the Qt platform plugin "windows"
34+
os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] = os.path.join(dirname,
35+
'plugins',
36+
'platforms')
3237

3338
# Expose versions
3439
version_info = (0, 1, 8) # Version of this release

qt.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

setup.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ def get_package_data():
3232
return package_data
3333

3434

35-
def get_data_files():
36-
return [('', ['qt.conf'])]
37-
38-
3935
def get_readme():
4036
with open('README.txt') as f:
4137
readme = f.read()
@@ -66,6 +62,5 @@ def get_readme():
6662
packages=find_packages(),
6763
zip_safe=False,
6864
classifiers=classifiers,
69-
package_data=get_package_data(),
70-
data_files=get_data_files()
65+
package_data=get_package_data()
7166
)

0 commit comments

Comments
 (0)