Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).

2 files changed, 10 insertions, 2 deletions

diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
index b7a262580b..7a58ed35a0 100644
--- a/examples/xml/htmlinfo/htmlinfo.pro
+++ b/examples/xml/htmlinfo/htmlinfo.pro
@@ -1,6 +1,10 @@
 SOURCES += main.cpp
 QT -= gui
 
+RESOURCES   = resources.qrc
+
+win32: CONFIG += console
+
 wince*|symbian:{
    htmlfiles.files = *.html
    htmlfiles.path = .
@@ -17,3 +21,6 @@ symbian {
     TARGET.UID3 = 0xA000C609
     CONFIG += qt_example
 }
+maemo5: CONFIG += qt_example
+
+symbian: warning(This example does not work on Symbian platform)
diff --git a/examples/xml/htmlinfo/main.cpp b/examples/xml/htmlinfo/main.cpp
index cb7ac528f0..4e36b1c2cd 100644
--- a/examples/xml/htmlinfo/main.cpp
+++ b/examples/xml/htmlinfo/main.cpp
@@ -101,7 +101,8 @@ int main(int argc, char **argv)
     QStringList filter;
     filter << "*.htm";
     filter << "*.html";
-    QStringList htmlFiles = QDir::current().entryList(filter, QDir::Files);
+
+    QStringList htmlFiles = QDir(":/").entryList(filter, QDir::Files);
 
     QTextStream out(stdout);
 
@@ -112,7 +113,7 @@ int main(int argc, char **argv)
 
     // parse each html file and write the result to file/stream
     foreach(QString file, htmlFiles)
-        parseHtmlFile(out, file);
+        parseHtmlFile(out, ":/" + file);
 
     return 0;
 }