diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
| commit | e2f66f921594b7be4af4a058c959557489e86879 (patch) | |
| tree | cc44931708b57bd5a761906797c7dee0360d1d6b /tools/configure/configure.pro | |
| parent | 933bf178aab88ab5df8a68cbf02611d6d8744b1b (diff) | |
| parent | 754efa57d89c62d1796e01b407e9222e67450f52 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qnamespace.qdoc
src/corelib/io/qwindowspipereader.cpp
src/corelib/io/qwindowspipereader_p.h
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/plugins/platforms/xcb/qxcbconnection.h
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/tools/qmake/tst_qmake.cpp
tests/manual/touch/main.cpp
Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
Diffstat (limited to 'tools/configure/configure.pro')
| -rw-r--r-- | tools/configure/configure.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 13ab3746ed..939c9ea5ab 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -134,5 +134,3 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ $$QT_SOURCE_TREE/src/corelib/plugin/quuid.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qcryptographichash.cpp \ $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp - -DEFINES += COMMERCIAL_VERSION |