Use Qt5 by default on all desktop builds

With this CL, Windows build start using Qt5 unless --qtver=4 is
explicitly specified.

BUG=#327
TEST=
REF_BUG=26887740
REF_CL=136967529
REF_TIME=2016-10-23T10:48:40-07:00
REF_TIME_RAW=1477244920 -0700

Author: yukawa

appveyor.yml

@@ -38,6 +38,6 @@ install:
 - choco install ninja -version 1.7.1
 build_script:
 - cd src
-- python build_mozc.py gyp --qtdir=C:\Qt\5.6\msvc2015 --qtver=5
+- python build_mozc.py gyp --qtdir=C:\Qt\5.6\msvc2015
 - python build_mozc.py build -c Release package
 test: off

docs/build_mozc_in_windows.md

@@ -10,8 +10,9 @@ How to build Mozc in Windows
 Building Mozc on Windows requires the following software.
 
   * [Visual Studio 2015 Community Edition](http://visualstudio.com/free), or any greater edition.
-  * (optinal) [Qt libraries](http://download.qt.io/archive/qt/)
+  * (optinal) [Qt 5](https://download.qt.io/official_releases/qt/)
     * Commercial version and LGPL version are available.
+    * You must download msvs2015 32-bit version of Qt 5 since currently `mozc_tool.exe` needs to be built as a 32-bit executable.
 
 # Get dependent prebuilt binaries
 
@@ -44,10 +45,10 @@ First, you'll need to generate Visual C++ project files using a tool called [GYP
 
 ```
 cd c:\work\mozc\src
-python build_mozc.py gyp --qtdir=c:\Qt\4.8.0
+python build_mozc.py gyp --qtdir=c:\Qt\Qt5.6.2\5.6\msvc2015
 ```
 
-The directory of Qt (`C:\Qt\4.8.0` in this example) differs based on Qt version. If you specify `--noqt` option instead of `--qtdir=<dir to Qt>`, mozc\_tool will be built as a mock version, which does nothing.
+The directory of Qt (`c:\Qt\Qt5.6.2\5.6\msvc2015` in this example) differs based on Qt version. If you specify `--noqt` option instead of `--qtdir=<dir to Qt>`, mozc\_tool will be built as a mock version, which does nothing.
 
 You can also specify `--branding=GoogleJapaneseInput` option and `--wix_dir=<dir to WiX binaries>` option here to reproduce official Google Japanese Input binaries and installers.
 
@@ -94,10 +95,12 @@ Following files must be placed under %ProgramFiles%\Mozc.
   * `C:\work\mozc\src\out\Release\mozc_server.exe`
   * `C:\work\mozc\src\out\Release\mozc_tool.exe` (if you specified `--noqt` option)
   * `C:\work\mozc\src\out\ReleaseDynamic\mozc_tool.exe` (if you didn't specify `--noqt` option)
-  * `C:\work\mozc\src\out\ReleaseDynamic\QtCore4.dll` (not required if you specified `--noqt` option)
-  * `C:\work\mozc\src\out\ReleaseDynamic\QtGui4.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Core.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Gui.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Widgets.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\platforms\qwindows.dll` (not required if you specified `--noqt` option)
 
-`QtCore4.dll` and `QtGui4.dll` are not required if you specified `--noqt` option into the gyp command.
+`Qt5Core.dll`, `Qt5Gui.dll`, `Qt5Widgets.dll`, and `qwindows.dll` are not required if you specified `--noqt` option into the gyp command.
 
 ### Register Mozc for IMM32 into 32-bit environment
 
@@ -165,10 +168,14 @@ Following files must be placed under %ProgramFiles(x86)%\Mozc.
   * `C:\work\mozc\src\out\Release\mozc_server.exe`
   * `C:\work\mozc\src\out\Release\mozc_tool.exe` (if you specified `--noqt` option)
   * `C:\work\mozc\src\out\ReleaseDynamic\mozc\_tool.exe` (if you didn't specify `--noqt` option)
-  * `C:\work\mozc\src\out\ReleaseDynamic\QtCore4.dll` (not required if you specified `--noqt` option)
-  * `C:\work\mozc\src\out\ReleaseDynamic\QtGui4.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Core.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Gui.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\Qt5Widgets.dll` (not required if you specified `--noqt` option)
+  * `C:\work\mozc\src\out\ReleaseDynamic\platforms\qwindows.dll` (not required if you specified `--noqt` option)
   * `C:\work\mozc\src\out\Release_x64\mozc_broker64.exe`
 
+`Qt5Core.dll`, `Qt5Gui.dll`, `Qt5Widgets.dll`, and `qwindows.dll` are not required if you specified `--noqt` option into the gyp command.
+
 ### Register Mozc for IMM32 into 64-bit environment
 
 Following files must be placed under `%windir%\System32`.

src/build_mozc.py

@@ -272,14 +272,7 @@ def ParseGypOptions(args):
   parser.add_option('--gypdir', dest='gypdir',
                     help='Specifies the location of GYP to be used.')
   parser.add_option('--noqt', action='store_true', dest='noqt', default=False)
-
-  default_qtver = '5'
-  # TODO(yukawa): Support Qt5 on Windows
-  if IsWindows():
-    default_qtver = '4'
-  parser.add_option('--qtver', dest='qtver', choices=('4', '5'),
-                    default=default_qtver)
-
+  parser.add_option('--qtver', dest='qtver', choices=('4', '5'), default='5')
   parser.add_option('--version_file', dest='version_file',
                     help='use the specified version template file',
                     default='data/version/mozc_version_template.bzl')

src/data/version/mozc_version_template.bzl

@@ -30,7 +30,7 @@
 
 MAJOR=2
 MINOR=19
-BUILD=2648
+BUILD=2649
 REVISION=102
 # This version represents the version of Mozc IME engine (converter, predictor,
 # etc.).  This version info is included both in the Mozc server and in the Mozc