Permalink
Browse files

Merge branch 'master' of github.com:qterm/qterm

  • Loading branch information...
xiaoqiangwang committed Dec 20, 2018
2 parents aac6aa5 + 7f53399 commit ab8f4fe1f8be287bc230ae2f01f706cf7953b236
Showing with 41 additions and 41 deletions.
  1. +24 −28 .appveyor.yml
  2. +12 −12 .travis.yml
  3. +1 −1 CMakeLists.txt
  4. +4 −0 RELEASE_NOTES
@@ -1,28 +1,8 @@
version: '{branch}-{build}'
image: Visual Studio 2015

environment:
matrix:
- QTDIR: C:\Qt\5.3\mingw482_32
CMAKE_GENERATOR: "MinGW Makefiles"
MINGWDIR: C:\Qt\Tools\mingw482_32
- QTDIR: C:\Qt\5.3\msvc2013_opengl
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.3\msvc2013_64_opengl
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.4\mingw491_32
CMAKE_GENERATOR: "MinGW Makefiles"
MINGWDIR: C:\Qt\Tools\mingw491_32
- QTDIR: C:\Qt\5.4\msvc2013_opengl
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.4\msvc2013_64_opengl
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.5\mingw492_32
CMAKE_GENERATOR: "MinGW Makefiles"
MINGWDIR: C:\Qt\Tools\mingw492_32
- QTDIR: C:\Qt\5.5\msvc2013
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.5\msvc2013_64
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.6\mingw49_32
MINGWDIR: C:\Qt\Tools\mingw492_32
CMAKE_GENERATOR: "MinGW Makefiles"
@@ -34,16 +14,32 @@ environment:
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.6\msvc2015_64
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.7\mingw53_32
- QTDIR: C:\Qt\5.7\msvc2015
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.9\mingw53_32
MINGWDIR: C:\Qt\Tools\mingw530_32
CMAKE_GENERATOR: "MinGW Makefiles"
- QTDIR: C:\Qt\5.9\msvc2015
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.9\msvc2013_64
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.9\msvc2015_64
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.10\mingw53_32
MINGWDIR: C:\Qt\Tools\mingw530_32
- QTDIR: C:\Qt\5.7\msvc2013
CMAKE_GENERATOR: "MinGW Makefiles"
- QTDIR: C:\Qt\5.10\msvc2015
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.7\msvc2013_64
- QTDIR: C:\Qt\5.10\msvc2013_64
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.7\msvc2015
- QTDIR: C:\Qt\5.10\msvc2015_64
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.11\mingw53_32
MINGWDIR: C:\Qt\Tools\mingw530_32
CMAKE_GENERATOR: "MinGW Makefiles"
- QTDIR: C:\Qt\5.11\msvc2015
CMAKE_GENERATOR: "NMake Makefiles"
- QTDIR: C:\Qt\5.7\msvc2015_64
- QTDIR: C:\Qt\5.11\msvc2015_64
CMAKE_GENERATOR: "NMake Makefiles"

install:
@@ -79,11 +75,11 @@ deploy:
secure: wc0cFfZSLHWbW3W8FKqgVPHQfF0bV1l54wkpLcpsq4EuBliQdwfV+4JLnWuHBdr4
on:
appveyor_repo_tag: true
QTDIR: C:\Qt\5.7\msvc2015_64
QTDIR: C:\Qt\5.11\msvc2015_64
- provider: GitHub
artifact: Win32Installer
auth_token:
secure: wc0cFfZSLHWbW3W8FKqgVPHQfF0bV1l54wkpLcpsq4EuBliQdwfV+4JLnWuHBdr4
on:
appveyor_repo_tag: true
QTDIR: C:\Qt\5.7\msvc2015
QTDIR: C:\Qt\5.11\msvc2015
@@ -12,34 +12,34 @@ dist: trusty

env:
- QT=5 BREW=5
- QT=53 BREW=ex PPA=beineri/opt-qt532-trusty
- QT=54 BREW=ex PPA=beineri/opt-qt542-trusty
- QT=55 BREW=55 PPA=beineri/opt-qt551-trusty
- QT=56 BREW=5 PPA=beineri/opt-qt562-trusty
- QT=57 BREW=ex PPA=beineri/opt-qt571-trusty
- QT=58 BREW=ex PPA=beineri/opt-qt58-trusty
- QT=59 BREW=ex PPA=beineri/opt-qt593-trusty
- QT=510 BREW=@ex PPA=beineri/opt-qt-5.10.1-trusty

matrix:
exclude:
- { os: linux, env: QT=5 BREW=5 }
- { os: osx, env: QT=51 BREW=ex PPA=beineri/opt-qt511-trusty }
- { os: osx, env: QT=52 BREW=ex PPA=beineri/opt-qt521-trusty }
- { os: osx, env: QT=53 BREW=ex PPA=beineri/opt-qt532-trusty }
- { os: osx, env: QT=54 BREW=ex PPA=beineri/opt-qt542-trusty }
- { os: osx, env: QT=57 BREW=ex PPA=beineri/opt-qt571-trusty }
- { os: osx, compiler: gcc, env: QT=5 BREW=5 } # Qt 5.6 no longer supports gcc on OS X.
- { os: osx, compiler: gcc, env: QT=56 BREW=5 PPA=beineri/opt-qt561-trusty } # Qt 5.6 no longer supports gcc on OS X.
- { os: osx, env: QT=57 BREW=ex PPA=beineri/opt-qt571-trusty }
- { os: osx, env: QT=58 BREW=ex PPA=beineri/opt-qt58-trusty }
- { os: osx, env: QT=59 BREW=ex PPA=beineri/opt-qt593-trusty }
- { os: osx, env: QT=510 BREW=@ex PPA=beineri/opt-qt-5.10.1-trusty }

before_install:
- '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA'
- '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get -qy update'
- '[ "$TRAVIS_OS_NAME" != osx ] || brew update'

install:
- '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" != */opt-* ]] || sudo apt-get -qy install qt$QT-meta-full'
- '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || sudo apt-get -qy install qt5-qmake qtbase5-dev qttools5-dev qttools5-dev-tools qtscript5-dev qtmultimedia5-dev'
- '[ "$TRAVIS_OS_NAME" != osx ] || brew install qt$BREW'
- '[ "$TRAVIS_OS_NAME" != osx ] || brew link --force qt$BREW'
- '[ "$TRAVIS_OS_NAME" != osx ] || brew info openssl'
- '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" != */opt-* ]] || travis_wait sudo apt-get -qy install qt$QT-meta-full'
- '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || travis_wait sudo apt-get -qy install qt5-qmake qtbase5-dev qttools5-dev qttools5-dev-tools qtscript5-dev qtmultimedia5-dev'
- '[ "$TRAVIS_OS_NAME" != osx ] || travis_wait brew install qt$BREW'
- '[ "$TRAVIS_OS_NAME" != osx ] || travis_wait brew link --force qt$BREW'
- '[ "$TRAVIS_OS_NAME" != osx ] || travis_wait brew info openssl'

script:
- '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" != */opt-* ]] || . /opt/qt$QT/bin/qt$QT-env.sh'
@@ -4,7 +4,7 @@ include(FeatureSummary)
cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
set(QTERM_VERSION_MAJOR 0)
set(QTERM_VERSION_MINOR 7)
set(QTERM_VERSION_RELEASE 2)
set(QTERM_VERSION_RELEASE 3)
set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" )
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")

@@ -1,3 +1,7 @@
0.7.3
=====
1. 修正在 Qt5.11 下的编译错误

0.7.2
=====
1. 修正快速连接对话框里端口号限制

0 comments on commit ab8f4fe

Please sign in to comment.