projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83f67b0 022b314)
Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:34:55 +0000 (10:34 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:35:29 +0000 (10:35 +0100)
Conflicts:
src/assistant/assistant/assistant.pro

Change-Id: If300627e2fef069274dec7785232ca144f3dfa28

1  2 
src/assistant/assistant/assistant.pro patch | diff1 | diff2 | blob | history

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