diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:11:53 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:11:53 +0100 |
| commit | 7f0386970c8d1135c844c3b3816c8e065ffdf54b (patch) | |
| tree | 2d0c057b81833ae585009a7887c2c141beb7e02e | |
| parent | f6946ef741d44b2e6a959368716f20c40e307039 (diff) | |
| parent | 34220f073f3df08769a2874cd6f86562ceb1816b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I857ab743616af460f4b345259609e047a9933027
| -rw-r--r-- | doc/config/qtdoc.qdocconf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf index 95a118555..9680bb34f 100644 --- a/doc/config/qtdoc.qdocconf +++ b/doc/config/qtdoc.qdocconf @@ -50,7 +50,6 @@ depends += \ qtsvg \ qtsysteminfo \ qttestlib \ - qttools \ qtuitools \ qtversit \ qtwidgets \ |