Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (29 commits)
  bye bye QMakeProjectEnv
  short-cut evaluation inside if() tests
  eliminate special splitting of INCLUDEPATH and DEPENDPATH
  do not env-expand cache file path
  s/QMAKE_FRAMEWORKDIR_FLAGS/QMAKE_FRAMEWORKPATH_FLAGS/
  s/INCPATH/INCLUDEPATH/
  s/QMAKE_RPATH/QMAKE_LFLAGS_RPATH/
  teach configure QMAKE_LFLAGS_RPATH (in addition to obsolete QMAKE_RPATH)
  warn about usage of deprecated variables
  warn about using non-lowercased replace $$function()s
  add -Wdeprecated option (on by default)
  make QMakeProject::isEmpty() consider legacy mappings
  document some functions' scope
  fix $$size() not using function-scoped variables
  doc: Fixed some qdoc errors.
  qdoc: Added breadcrumbs for namespaces.
  Autotest: check that we receive key events on toplevel widgets
  Cocoa: key events stopped working
  Update Polish translations
  qdoc: Added "All namespaces" to the API Lookup box.
  ...

1 files changed, 1 insertions, 9 deletions

diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index bc8ccb01..06a44b7 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -324,11 +324,9 @@ void QGraphicsWidget::resize(const QSizeF &size)
 */
 
 /*!
-
   \fn QGraphicsWidget::geometryChanged()
 
-  This signal gets emitted whenever the geometry of the item changes
-  \internal
+  This signal gets emitted whenever the geometry is changed in setGeometry().
 */
 
 /*!
@@ -408,12 +406,6 @@ void QGraphicsWidget::setGeometry(const QRectF &rect)
 }
 
 /*!
-  \fn QGraphicsWidget::geometryChanged()
-
-  This signal gets emitted whenever the geometry is changed in setGeometry().
-*/
-
-/*!
     \fn QRectF QGraphicsWidget::rect() const
 
     Returns the item's local rect as a QRectF. This function is equivalent