Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master

Conflicts:
	src/corelib/thread/qthread_unix.cpp

2 files changed, 7 insertions, 5 deletions

diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp
index 64737c3..5385259 100644
--- a/demos/qtdemo/examplecontent.cpp
+++ b/demos/qtdemo/examplecontent.cpp
@@ -83,8 +83,10 @@ QString ExampleContent::loadDescription()
     int errorLine, errorColumn;
 
     QDomDocument exampleDoc;
-    if (!exampleDoc.setContent(ba, false, &errorMsg, &errorLine, &errorColumn)) {
-        qDebug() << errorMsg << errorLine << errorColumn;
+    if (ba.isEmpty()) {
+        qDebug() << "No documentation found for" << name << "Is the documentation built?";
+    } else if (!exampleDoc.setContent(ba, false, &errorMsg, &errorLine, &errorColumn)) {
+        qDebug() << "Error loading documentation for " << name << ": " << errorMsg << errorLine << errorColumn;
     }
 
     QDomNodeList paragraphs = exampleDoc.elementsByTagName("p");
diff --git a/demos/spectrum/spectrum.pri b/demos/spectrum/spectrum.pri
index 5773900..75c0113 100644
--- a/demos/spectrum/spectrum.pri
+++ b/demos/spectrum/spectrum.pri
@@ -41,9 +41,9 @@ win32 {
     #     ..$${spectrum_build_dir}
     # without the result having a trailing slash where spectrum_build_dir
     # is undefined.
-    spectrum_build_dir = /release
-    if (!debug_and_release|build_pass): CONFIG(debug, debug|release) {
-        spectrum_build_dir = /debug
+    build_pass {
+        CONFIG(release, release|debug): spectrum_build_dir = /release
+        CONFIG(debug, release|debug): spectrum_build_dir = /debug
     }
 }