diff --git a/setup/build_environment.py b/setup/build_environment.py index cc32fbdc3a..40465d0806 100644 --- a/setup/build_environment.py +++ b/setup/build_environment.py @@ -120,13 +120,12 @@ zlib_libs = ['z'] ICU = sw = '' QT_DLLS = ['Qt5' + x for x in ( -'Core', 'Gui', 'Multimedia', 'MultimediaWidgets', 'OpenGL', 'Network', -'PrintSupport', 'Positioning', 'Quick', 'Qml', 'Sensors', 'Sql', 'Svg', -'WebKit', 'WebKitWidgets', 'Widgets', # 'Xml', 'XmlPatterns' +'Core', 'Gui', 'OpenGL', 'Network', 'PrintSupport', 'Positioning', 'Sensors', 'Sql', 'Svg', +'WebKit', 'WebKitWidgets', 'Widgets', 'Multimedia', 'MultimediaWidgets', # 'Xml', 'XmlPatterns', )] QT_PLUGINS = ('imageformats', 'audio', 'iconengines', 'mediaservice', 'platforms', 'playlistformats', 'printsupport', 'sqldrivers') -PYQT_MODULES = ('Qt', 'QtCore', 'QtGui', 'QtNetwork', 'QtMultimedia', 'QtMultimediaWidgets', +PYQT_MODULES = ('Qt', 'QtCore', 'QtGui', 'QtNetwork', # 'QtMultimedia', 'QtMultimediaWidgets', 'QtPrintSupport', 'QtSensors', 'QtSvg', 'QtWebKit', 'QtWebKitWidgets', 'QtWidgets') if iswindows: diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index 997c3ed21f..d22930be2d 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -493,7 +493,7 @@ Download Qt sourcecode (.zip) from: http://download.qt-project.org/official_rele :file:`qtwebkit/Tools/qmake/mkspecs/features/configure.prf` and remove build_webkit2. Edit qt.pro and comment out the addModule() lines for qtxmlpatterns, qtdeclarative, qtquick1, qtwebsockets. Change the - addModule line for qtwebkit to depend on qtbase instead of qtdeclarative. + addModule line for qtwebkit and qtmultimedia to depend on qtbase instead of qtdeclarative. * Qt uses its own routine to locate and load "system libraries" including the openssl libraries needed for "Get Books". This means that we have to