summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2013-08-08 14:09:41 (GMT)
committerSwift Review <review@swift.im>2013-08-08 14:12:09 (GMT)
commitc651cda1d427fe441f6acbd94952705efd218dd1 (patch)
tree4537fb3235cfe40025a03e34920f0a23d44f9a04 /Swift/QtUI
parent5d21021b92a3d7d5755e80a5be10cfbdf984b9db (diff)
downloadswift-c651cda1d427fe441f6acbd94952705efd218dd1.zip
swift-c651cda1d427fe441f6acbd94952705efd218dd1.tar.bz2
Package necessary plugins for qt5 on Windows
Change-Id: Icfcf31668a3bcba687885aab0e548a8b42c30773
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/SConscript5
1 files changed, 4 insertions, 1 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index ae674f3..42de762 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -73,7 +73,7 @@ myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version)
myenv.Append(CPPPATH = ["."])
if env["PLATFORM"] == "win32" :
- #myenv["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"]
+ #myenv.Append(LINKFLAGS = ["/SUBSYSTEM:CONSOLE"])
myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
myenv.Append(LIBS = "qtmain")
if myenv.get("HAVE_SCHANNEL", 0) :
@@ -369,6 +369,7 @@ if env["PLATFORM"] == "win32" :
commonResources[""] = commonResources.get("", []) + ["#/Swiften/${SWIFTEN_LIBRARY_FILE}"]
qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"]
qtlibs = ["QtCore", "QtGui", "QtNetwork", "QtWebKit", "QtXMLPatterns"]
+ qtplatforms = []
if qt_version == '4' :
qtlibs.append("phonon")
qtlibs = [lib + '4' for lib in qtlibs]
@@ -376,10 +377,12 @@ if env["PLATFORM"] == "win32" :
qtlibs += ['QtQuick', 'QtQml', 'QtV8', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
qtlibs = [lib.replace('Qt', 'Qt5') for lib in qtlibs]
qtlibs += ['icuin51', 'icuuc51', 'icudt51', 'libGLESv2', 'libEGL']
+ qtplatforms = ['windows']
windowsBundleFiles = myenv.WindowsBundle("Swift",
resources = commonResources,
qtimageformats = qtimageformats,
qtlibs = qtlibs,
+ qtplatforms = qtplatforms,
qtversion = qt_version)
if env["DIST"] :