diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-01 15:31:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-01 15:31:19 +0100 |
| commit | 04bd6e39c8991fcb89ab15728f622a5a3ae8f0b2 (patch) | |
| tree | 0517ecde8091d1680651853a4a9d209c0636cffd /src/tools | |
| parent | c92c255d1043f11478a61c1caae4069e7ef47114 (diff) | |
| parent | a1d22fd2f79afab8b2379f6d93bcb417b9c8e7d5 (diff) | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qtcdebugger/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qtcdebugger/CMakeLists.txt b/src/tools/qtcdebugger/CMakeLists.txt index af367a60b3..ff550d8910 100644 --- a/src/tools/qtcdebugger/CMakeLists.txt +++ b/src/tools/qtcdebugger/CMakeLists.txt @@ -3,7 +3,7 @@ if (NOT WIN32) endif() add_qtc_executable(qtcdebugger - DEPENDS Qt5::Widgets registryaccess psapi + DEPENDS Qt5::Widgets registryaccess psapi app_version SOURCES main.cpp PROPERTIES WIN32_EXECUTABLE ON |