From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Tue, 20 Nov 2012 09:34:55 +0000 (+0100)
Subject: Merge branch 'newdocs'
X-Git-Tag: accepted/tizen/20131212.181521~168
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76a198807fd8dbaabdf5d5638e9ce5a589292535;p=platform%2Fupstream%2Fqttools.git

Merge branch 'newdocs'

Conflicts:
	src/assistant/assistant/assistant.pro

Change-Id: If300627e2fef069274dec7785232ca144f3dfa28
---

76a198807fd8dbaabdf5d5638e9ce5a589292535
diff --cc src/assistant/assistant/assistant.pro
index 355227d,82681f3..72ee462
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@@ -19,6 -19,11 +19,8 @@@ DEPENDPATH += ../share
  
  include(../../shared/fontpanel/fontpanel.pri)
  
+ QMAKE_DOCS = $$PWD/doc/assistant.qdocconf
+ 
 -# ## Work around a qmake issue when statically linking to
 -# ## not-yet-installed plugins
 -QMAKE_LIBDIR += $$QT.core.plugins/sqldrivers
  HEADERS += aboutdialog.h \
      bookmarkdialog.h \
      bookmarkfiltermodel.h \