summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-05-07 07:52:42 (GMT)
committerTobias Markmann <tm@ayena.de>2015-05-07 07:52:42 (GMT)
commit39342e46bdf3a2b12bff5bd267809bf4dfc277b5 (patch)
treedc12ca18b7de684b36d2f77d467e73d9b4c6ed0f /Swift/QtUI
parent285bf92672e618124cedf554f39c7f30824453bf (diff)
downloadswift-39342e46bdf3a2b12bff5bd267809bf4dfc277b5.zip
swift-39342e46bdf3a2b12bff5bd267809bf4dfc277b5.tar.bz2
Add support for Qt 5.4.1 to build and distribution process on Windows
Test-Information: Tested with Qt 5.3.2 and Qt 5.4.1 from qt.io website. Change-Id: Iada3e64e530d8a5b53b8b5c8943bcafbd9bd6c64
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 86b41d3..fb4d853 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -393,7 +393,7 @@ if env["PLATFORM"] == "win32" :
qtlibs.append("phonon")
qtlibs = [lib + '4' for lib in qtlibs]
else :
- qtlibs += ['QtQuick', 'QtQml', 'QtPositioning', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
+ qtlibs += ['QtQuick', 'QtQml', 'QtPositioning', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebChannel', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
qtlibs = [lib.replace('Qt', 'Qt5') for lib in qtlibs]
qtlibs += ['icuin51', 'icuuc51', 'icudt51', 'libGLESv2', 'libEGL']
qtplugins["platforms"] = ['windows']