Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits)
  Fixing potential js hole in the js function for the feedback channel.
  Fix tst_Q3ProgressBar::setProgress, again
  Disable tst_Q3ComboBox::task231724_clear on Mac
  Fix tst_Q3ProgressBar::setProgress()
  Revert "Fix double painting when adding an item into a linear layout"
  Add missing license headers
  Revert "Fixed a crash in QListView"
  qdoc: Completed task QTBUG-18790
  qdoc: Completed task QTBUG-18733
  Benchmark for layout hierarchies
  Manual test for layout flickering
  Improve invalidate() testcase.
  Avoid flicker when invalidate is propagated in a widget/layout hierarchy
  Do not call setSizePolicy from ctor, it might call a virtual function
  qdoc: Last commit before merge into master.
  Fixed a crash in QListView
  Doc: Fixed reference to a name in a table.
  qdoc: Fixed license comment.
  Ensured that incomplete downloads are removed.
  qdoc: Added missing copyright notice
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h
index 21bc31f..00660e7 100644
--- a/tools/qdoc3/codemarker.h
+++ b/tools/qdoc3/codemarker.h
@@ -165,10 +165,11 @@ class CodeMarker
     static const Node *nodeForString(const QString& string);
     static QString stringForNode(const Node *node);
 
+    QString typified(const QString &string);
+
  protected:
     virtual QString sortName(const Node *node);
     QString protect(const QString &string);
-    QString typified(const QString &string);
     QString taggedNode(const Node* node);
 #ifdef QDOC_QML
     QString taggedQmlNode(const Node* node);