Skip to content

Commit

Permalink
Use Qt5 by default except for Windows
Browse files Browse the repository at this point in the history
Linux desktop build on Travis CI also starts using Qt5 with this CL.

BUG=#327
TEST=
REF_BUG=26887740
REF_CL=133351880
REF_TIME=2016-09-15T23:26:25-07:00
REF_TIME_RAW=1474007185 -0700
  • Loading branch information
yukawa committed Sep 16, 2016
1 parent 2315f95 commit f76c304
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ env:
before_install:
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y clang python pkg-config curl bzip2 unzip make; fi
- if [ $TARGET_PLATFORM == Linux ]; then sudo apt-get install -y libibus-1.0-dev libglib2.0-dev libqt4-dev libgtk2.0-dev libxcb-xfixes0-dev; fi
- if [ $TARGET_PLATFORM == Linux ]; then sudo apt-get install -y libibus-1.0-dev libglib2.0-dev qtbase5-dev libgtk2.0-dev libxcb-xfixes0-dev; fi
- if [ $TARGET_PLATFORM == NaCl ]; then sudo apt-get install -y libc6-i386 lib32stdc++6; fi
- if [ ${TARGET_PLATFORM:0:7} == Android ]; then sudo apt-get install --no-install-recommends openjdk-7-jdk openjdk-7-jre-headless libjsr305-java ant zip libc6-i386 lib32stdc++6 lib32ncurses5 lib32z1; fi

Expand Down
9 changes: 8 additions & 1 deletion src/build_mozc.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,14 @@ 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)
parser.add_option('--qtver', dest='qtver', choices=('4', '5'), default='4')

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('--version_file', dest='version_file',
help='use the specified version template file',
default='data/version/mozc_version_template.bzl')
Expand Down
2 changes: 1 addition & 1 deletion src/data/version/mozc_version_template.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

MAJOR=2
MINOR=18
BUILD=2612
BUILD=2613
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
Expand Down

0 comments on commit f76c304

Please sign in to comment.