diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-04-20 14:58:48 +0200 |
| commit | ee8bf341c6f64096c6ccfeefd3b6b8a85fe91c0b (patch) | |
| tree | 4dd8b097d0d2acc17f1a13e0e99debfc92b36466 /src/plugins/updateinfo | |
| parent | 0eeee15a887a8180c1c28dc9f4929b066e096136 (diff) | |
| parent | 5dc690f234ec7bb5dcdb11a610a4ecbee6dc4d64 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/projectexplorer/session.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
Diffstat (limited to 'src/plugins/updateinfo')
| -rw-r--r-- | src/plugins/updateinfo/updateinfo.qbs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/updateinfo/updateinfo.qbs b/src/plugins/updateinfo/updateinfo.qbs index 2a875c4d7f..5253039dbc 100644 --- a/src/plugins/updateinfo/updateinfo.qbs +++ b/src/plugins/updateinfo/updateinfo.qbs @@ -3,8 +3,6 @@ import qbs 1.0 QtcPlugin { name: "UpdateInfo" - condition: false // Severely broken atm. - Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Utils" } |