-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Deduplicated FindPyQt(4|5).py"
This reverts commit 842c17c which was responsible for test timeouts for dubious reasons.
- Loading branch information
Showing
4 changed files
with
87 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com> | ||
# All rights reserved. | ||
# | ||
# Redistribution and use in source and binary forms, with or without | ||
# modification, are permitted provided that the following conditions are met: | ||
# * Redistributions of source code must retain the above copyright | ||
# notice, this list of conditions and the following disclaimer. | ||
# * Redistributions in binary form must reproduce the above copyright | ||
# notice, this list of conditions and the following disclaimer in the | ||
# documentation and/or other materials provided with the distribution. | ||
# * Neither the name of the Simon Edwards <simon@simonzone.com> nor the | ||
# names of its contributors may be used to endorse or promote products | ||
# derived from this software without specific prior written permission. | ||
# | ||
# THIS SOFTWARE IS PROVIDED BY Simon Edwards <simon@simonzone.com> ''AS IS'' AND ANY | ||
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
# DISCLAIMED. IN NO EVENT SHALL Simon Edwards <simon@simonzone.com> BE LIABLE FOR ANY | ||
# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
# | ||
# FindPyQt.py | ||
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com> | ||
# Redistribution and use is allowed according to the terms of the BSD license. | ||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. | ||
|
||
try: | ||
import PyQt5.pyqtconfig | ||
pyqtcfg = PyQt5.pyqtconfig.Configuration() | ||
except ImportError: | ||
import PyQt5.QtCore | ||
import sipconfig # won't work for SIP v5 | ||
import os.path | ||
cfg = sipconfig.Configuration() | ||
sip_dir = cfg.default_sip_dir | ||
for p in (os.path.join(sip_dir, "PyQt5"), sip_dir): | ||
if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")): | ||
sip_dir = p | ||
break | ||
cfg = { | ||
'pyqt_version': PyQt5.QtCore.PYQT_VERSION, | ||
'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR, | ||
'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'], | ||
'pyqt_mod_dir': cfg.default_mod_dir, | ||
'pyqt_sip_dir': sip_dir, | ||
'pyqt_bin_dir': cfg.default_bin_dir, | ||
} | ||
pyqtcfg = sipconfig.Configuration([cfg]) | ||
|
||
print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version) | ||
print("pyqt_version_num:%d" % pyqtcfg.pyqt_version) | ||
print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str) | ||
|
||
pyqt_version_tag = "" | ||
in_t = False | ||
for item in pyqtcfg.pyqt_sip_flags.split(' '): | ||
if item == "-t": | ||
in_t = True | ||
elif in_t: | ||
if item.startswith("Qt_4"): | ||
pyqt_version_tag = item | ||
else: | ||
in_t = False | ||
print("pyqt_version_tag:%s" % pyqt_version_tag) | ||
|
||
print("pyqt_mod_dir:%s" % pyqtcfg.pyqt_mod_dir) | ||
print("pyqt_sip_dir:%s" % pyqtcfg.pyqt_sip_dir) | ||
print("pyqt_sip_flags:%s" % pyqtcfg.pyqt_sip_flags) | ||
print("pyqt_bin_dir:%s" % pyqtcfg.pyqt_bin_dir) |
eeef84b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wasn't it solved by 1675703 ?
eeef84b
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@3nids at least I thought so.