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: (31 commits)
  Speed up qsTr() by caching the translation context
  Crash while printing from the portedcanvas example on Mac Cocoa.
  qdoc: Fixed .qdocconf files for assistant.
  Disable debug-only framework builds on Mac.
  Compile (with -no-pch)
  Add missing QT_NO_BEARERMANAGEMENT ifdefs.
  Introduce a qconfig feature for Bearer Management
  Fix MOBILITY-404
  Remove holes in bearer management data structures.
  Don't link bearer plugins against QtGui unnecessarily.
  Added missing newline after warning message when using -L with qml
  Doc: updating scripts
  Fixed a crash on embedded due to uninitialized pointer.
  Fix a race where QThread::exit() is "lost" when called after start()
  qdoc: Removed all <table> attributes in favor of using css.
  Autotest failure: dialogModality test fails on cocoa (macgui)
  Force the bic test to compile in 32-bit mode on Mac
  Revert "Doc: Updating design files."
  Remove statically allocated pixmaps through the post routine
  qdoc: Checked for empty title.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 341908e..45c2b85 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -245,7 +245,7 @@ int main(int argc, char ** argv)
             useNativeFileBrowser = false;
         } else if (arg == "-I" || arg == "-L") {
             if (arg == "-L")
-                fprintf(stderr, "-L option provided for compatibility only, use -I instead");
+                fprintf(stderr, "-L option provided for compatibility only, use -I instead\n");
             if (lastArg) {
                 QDeclarativeEngine tmpEngine;
                 QString paths = tmpEngine.importPathList().join(QLatin1String(":"));