From 4d890599592b3ca636b61874c7884041fea601a6 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 24 Nov 2011 12:14:19 +0100
Subject: Fix abstractitemmodel compilation error.

---
 .../declarative/modelviews/abstractitemmodel/abstractitemmodel.pro  | 1 -
 .../declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc  | 6 ------
 2 files changed, 7 deletions(-)
 delete mode 100644 examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc

diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index 3864dfc..c751b2c 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -32,7 +32,6 @@ symbian:TARGET.CAPABILITY += NetworkServices
 # The .cpp file which was generated for your project. Feel free to hack it.
 SOURCES = main.cpp model.cpp
 HEADERS = model.h
-RESOURCES += abstractitemmodel.qrc
 
 # Please do not modify the following two lines. Required for deployment.
 desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/abstractitemmodel
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc
deleted file mode 100644
index 4ae861c..0000000
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>view.qml</file>
-</qresource>
-</RCC>
-
-- 
cgit v0.12


From 5a935c8d2015f3dba5f4a9db0f7040b067dc00b3 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 24 Nov 2011 15:13:21 +0100
Subject: Fix warning about unbalanced parantheses.

Reviewed-By: Robert Loehning
---
 doc/doc.pri | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/doc.pri b/doc/doc.pri
index 2480b07..c51a621 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -30,10 +30,10 @@ $$unixstyle {
     COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
     COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
     COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
-    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\"))
-    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\"))
-    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\"))
-    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\"))
+    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\")
+    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\")
+    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\")
+    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\")
 }
 ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
 QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
-- 
cgit v0.12