Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team: (536 commits)
  Adapt autotests to commit e2773a9
  Declarative: Use qDebug() for debugger status updates
  Declarative: Unify output of warning messages in debug server
  Added missing license header.
  Adjust pathes once again.
  Fixed a link
  Fixed a link
  Split behavior and wigglytext examples
  Rename files to show up in docs.
  Whitespace changes and added depends.
  Fix up examples.
  Fixed some linking issues.
  Removed unecessary files from folders.
  Fixes for the manifest and links.
  Changed some of the short descriptions for WebView examples.
  Removed unecessary duplicate files.
  Symbian-linux crosscompilation case changes
  Fix link to WebView examples.
  Fix link to ListView and WebView example pages.
  Fixed lists to be ordered lists and added curly brackets
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/qmake/generators/integrity/gbuild.h b/qmake/generators/integrity/gbuild.h
index 0927a2e..6f9a5c0 100644
--- a/qmake/generators/integrity/gbuild.h
+++ b/qmake/generators/integrity/gbuild.h
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 class GBuildMakefileGenerator : public MakefileGenerator
 {
-    virtual bool write();
+    virtual bool writeMakefile(QTextStream &text);
 
     QString projectSuffix() const { return QString(".gpj"); };
     QString writeOne(QString filename, QString pathtoremove = "");