1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
$NetBSD: patch-aa,v 1.11 2014/08/21 21:33:07 wiz Exp $
--- configure.py.orig 2014-07-03 14:00:02.000000000 +0000
+++ configure.py
@@ -346,7 +346,7 @@ class ConfigurePyQt4:
pyqt_modules.append("QtCore")
check_module("QtGui", "qwidget.h", "new QWidget()")
- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")")
+ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", extra_libs=["QtCore"])
check_module("QtMultimedia", "QAudioDeviceInfo",
"new QAudioDeviceInfo()")
check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
@@ -372,8 +372,8 @@ class ConfigurePyQt4:
check_module("QtTest", "QtTest", "QTest::qSleep(0)")
check_module("QtWebKit", "qwebpage.h", "new QWebPage()")
check_module("QtXmlPatterns", "qxmlname.h", "new QXmlName()")
- check_module("phonon", "phonon/videowidget.h",
- "new Phonon::VideoWidget()")
+# check_module("phonon", "phonon/videowidget.h",
+# "new Phonon::VideoWidget()")
check_module("QtAssistant", "qassistantclient.h",
"new QAssistantClient(\"foo\")", extra_lib_dirs=ass_lib_dirs,
extra_libs=ass_libs)
@@ -2027,11 +2027,7 @@ int main(int argc, char **argv)
out << QLibraryInfo::licensee() << '\\n';
-#if defined(QT_SHARED) || defined(QT_DLL)
out << "shared\\n";
-#else
- out << "static\\n";
-#endif
// Determine which features should be disabled.
|
