diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:32:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 13:32:55 +0200 |
| commit | 0496e7f73afa69cadb3742b7423b2c8ae3665c13 (patch) | |
| tree | 908065953aff1eca667b3b075de254df68420e73 /.qmake.conf | |
| parent | 2ec8a7baff14f476322ca96830c844a9d05b7b6d (diff) | |
| parent | 3b1da8a7754b37d5767aeb55a7ca46e4180a6109 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/assistant/qcollectiongenerator/main.cpp
src/qtestlib/wince/cetcpsync/main.cpp
src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
src/qtestlib/wince/cetcpsync/qtcesterconnection.h
src/qtestlib/wince/cetcpsync/remoteconnection.cpp
src/qtestlib/wince/cetcpsync/remoteconnection.h
src/qtestlib/wince/cetcpsyncserver/commands.cpp
src/qtestlib/wince/cetcpsyncserver/commands.h
src/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
src/qtestlib/wince/cetcpsyncserver/connectionmanager.h
src/qtestlib/wince/cetcpsyncserver/main.cpp
src/qtestlib/wince/cetcpsyncserver/transfer_global.h
src/qtestlib/wince/cetest/activesyncconnection.cpp
src/qtestlib/wince/cetest/activesyncconnection.h
src/qtestlib/wince/cetest/cetcpsyncconnection.cpp
src/qtestlib/wince/cetest/cetcpsyncconnection.h
src/qtestlib/wince/cetest/deployment.cpp
src/qtestlib/wince/cetest/deployment.h
src/qtestlib/wince/cetest/main.cpp
src/qtestlib/wince/cetest/remoteconnection.cpp
src/qtestlib/wince/cetest/remoteconnection.h
src/qtestlib/wince/remotelib/commands.cpp
src/qtestlib/wince/remotelib/commands.h
Change-Id: Ia1b311710f7e8009ca1697faae3ae5e37e80ecc3
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index aa9ded07b..aefa1e701 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs MODULE_VERSION = 5.8.0 |