summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-05-23 07:25:34 +0200
committerEike Ziller <eike.ziller@digia.com>2013-05-23 07:25:34 +0200
commitef5d3796d52b20aa2fa8e75263686bb1e29fc092 (patch)
tree5a291f7a5108a3531e28bb7c7baaab7362071ff9 /scripts
parent24ee641543b51d1497114070fd574b095ff68958 (diff)
parent35b96f2fc11bcc6d0b4bfb2b405c115fb0d6033e (diff)
downloadqt-creator-ef5d3796d52b20aa2fa8e75263686bb1e29fc092.tar.gz
Merge remote-tracking branch 'origin/2.7' into 2.8
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/deployqt.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py
index 2d5af87ab8..d19ae9504c 100755
--- a/scripts/deployqt.py
+++ b/scripts/deployqt.py
@@ -262,7 +262,7 @@ def main():
QT_INSTALL_QML = readQmakeVar(qmake_bin, 'QT_INSTALL_QML')
QT_INSTALL_TRANSLATIONS = readQmakeVar(qmake_bin, 'QT_INSTALL_TRANSLATIONS')
- plugins = ['accessible', 'codecs', 'designer', 'iconengines', 'imageformats', 'platforms', 'printsupport', 'sqldrivers']
+ plugins = ['accessible', 'codecs', 'designer', 'iconengines', 'imageformats', 'platforminputcontexts', 'platforms', 'printsupport', 'sqldrivers']
imports = ['Qt', 'QtWebKit']
if sys.platform.startswith('win'):