Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2014-06-09 20:32:19 +05:30
parent e71acfc4d5
commit 5b3f45ed1b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup/build_environment.py
View File

@ -120,13 +120,12 @@ zlib_libs = ['z']
ICU = sw = '' ICU = sw = ''
QT_DLLS = ['Qt5' + x for x in ( QT_DLLS = ['Qt5' + x for x in (
'Core', 'Gui', 'Multimedia', 'MultimediaWidgets', 'OpenGL', 'Network', 'Core', 'Gui', 'OpenGL', 'Network', 'PrintSupport', 'Positioning', 'Sensors', 'Sql', 'Svg',
'PrintSupport', 'Positioning', 'Quick', 'Qml', 'Sensors', 'Sql', 'Svg', 'WebKit', 'WebKitWidgets', 'Widgets', 'Multimedia', 'MultimediaWidgets', # 'Xml', 'XmlPatterns',
'WebKit', 'WebKitWidgets', 'Widgets', # 'Xml', 'XmlPatterns'
)] )]
QT_PLUGINS = ('imageformats', 'audio', 'iconengines', 'mediaservice', 'platforms', 'playlistformats', 'printsupport', 'sqldrivers') 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') 'QtPrintSupport', 'QtSensors', 'QtSvg', 'QtWebKit', 'QtWebKitWidgets', 'QtWidgets')
if iswindows: if iswindows:

2
setup/installer/windows/notes.rst
View File

@ -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 :file:`qtwebkit/Tools/qmake/mkspecs/features/configure.prf` and remove
build_webkit2. Edit qt.pro and comment out the addModule() lines for build_webkit2. Edit qt.pro and comment out the addModule() lines for
qtxmlpatterns, qtdeclarative, qtquick1, qtwebsockets. Change the 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 * 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 the openssl libraries needed for "Get Books". This means that we have to