Binary file bin/hbthemeindexer_symbian.exe has changed

--- a/bin/synchb.py	Thu Jul 15 14:03:49 2010 +0100
+++ b/bin/synchb.py	Thu Jul 22 16:36:53 2010 +0100
@@ -36,7 +36,8 @@
 # Globals
 # ============================================================================
 VERBOSE = False
-EXCLUDE = ["hbplugins", "hbservers", "3rdparty", "internal", "tsrc", "debug", "release"]
+EXCLUDE = ["hbapps", "hbplugins", "hbservers", "hbtools", "3rdparty", 
+           "internal", "tsrc", "debug", "release", "bwins", "eabi"]
 COLLECTIONS = {"hbcore": "HbCore",
                "hbfeedback": "HbFeedback",
                "hbinput": "HbInput",
@@ -87,8 +88,23 @@
     except IOError, e:
         print(e)
 
-def write_header(filepath, include):
-    write_file(filepath, "#include \"%s\"\n" % include)
+def include_directive(header):
+    return "#include \"%s\"\n" % header.replace("\\", "/")
+
+def write_header(header, include, path):
+    filename = os.path.basename(header)
+    filepath = os.path.join(path, filename)
+    skip = False
+    if os.path.exists(filepath):
+        directive = include_directive(include)
+        oldsize = os.path.getsize(filepath)
+        newsize = len(directive)
+        if oldsize == newsize and directive == read_file(filepath):
+            skip = True
+    if not skip:
+        if VERBOSE:
+            print("INFO:\t ==> %s" % os.path.basename(filepath))
+        write_file(filepath, include_directive(include))
 
 # ============================================================================
 # Component
@@ -96,8 +112,9 @@
 class Component:
     def __init__(self, name):
         self.name = name
-        self.headers = list()
-        self.privates = list()
+        self.headers = []
+        self.privates = []
+        self.restricted = []
 
     def read(self, path):
         entries = os.listdir(path)
@@ -106,51 +123,52 @@
             if os.path.isdir(entrypath):
                 self.read(entrypath)
             elif os.path.isfile(entrypath):
-                if entry.endswith("_p_p.h"):
+                if re.match(entry, ".*?_[pr]_[pr]\.h"):
                     continue
                 elif entry.endswith("_p.h"):
                     self.privates.append(entrypath)
+                elif entry.endswith("_r.h"):
+                    self.restricted.append(entrypath)
                 elif entry.endswith(".h"):
                     self.headers.append(entrypath)
 
     def write(self, path):
+        written = []
         if len(self.headers) > 0:
             self._makedirs(path)
-            self._write(path, self.headers, True)
+            written += self._write(path, self.headers, True)
+
+        if len(self.restricted) > 0:
+            restpath = os.path.join(path, "restricted")
+            self._makedirs(restpath)
+            written += self._write(restpath, self.restricted, True)
 
         if len(self.privates) > 0:
             privpath = os.path.join(path, "private")
             self._makedirs(privpath)
-            self._write(privpath, self.privates, False)
+            written += self._write(privpath, self.privates, False)
+        return written
 
     def _write(self, path, headers, convenience):
-        global VERBOSE
-        if VERBOSE:
-            print("INFO: Writing headers to '%s'" % path)
+        written = []
         for header in headers:
-            filename = os.path.basename(header)
-            filepath = os.path.join(path, filename)
-            relpath = os.path.relpath(header, path)
-            if VERBOSE:
-                print("INFO:\t ==> %s" % os.path.basename(filepath))
-            write_header(filepath, relpath.replace("\\", "/"))
+            write_header(header, os.path.relpath(header, path), path)
+            written.append(os.path.join(path, os.path.basename(header)))
             if convenience:
-                classes = list()
+                classes = []
                 content = read_file(header)
-                for match in re.finditer("(?:class|namespace)\s+(?:HB_[^_]+_EXPORT\s+)?(Hb\w*)(\s*;)?", content):
+                for match in re.finditer("(?:class|namespace)\s+(?:HB_[^_]+(?:_RESTRICTED)?_EXPORT\s+)?(Hb\w*)(\s*;)?", content):
                     if not match.group(2):
                         classes.append(match.group(1))
                 for match in re.finditer("#pragma hb_header\((\w+)\)", content):
                     classes.append(match.group(1))
                 for cls in classes:
-                    filepath = os.path.join(path, cls)
-                    write_header(filepath, filename)
+                    write_header(cls, os.path.basename(header), path)
+                    written.append(os.path.join(path, cls))
+        return written
 
     def _makedirs(self, path):
-        global VERBOSE
         if not os.path.exists(path):
-            if VERBOSE:
-                print("INFO: Creating include dir '%s'" % path)
             os.makedirs(path)
 
 # ============================================================================
@@ -171,25 +189,55 @@
                 self.components.append(component)
 
     def write(self, path):
-        global COLLECTIONS
+        global COLLECTIONS, VERBOSE
+        path = os.path.join(os.path.abspath(path), self.name)
+        if VERBOSE:
+            print("INFO: Writing headers to '%s'..." % path)
+        # there's no set in python 2.3 so use a list
+        leftovers = []
+        for root, dirs, files in os.walk(path):
+            for file in files:
+                leftovers.append(os.path.abspath(os.path.join(root, file)))
+
         # include/hbcore
-        includes = list()
-        path = os.path.join(path, self.name)
+        includes = []
+        written = []
         for component in self.components:
-            component.write(path)
+            written += component.write(path)
             for header in component.headers:
                 includes.append("#include \"%s\"\n" % os.path.basename(header))
+
         if self.name in COLLECTIONS:
-            write_file(os.path.join(path, self.name + ".h"), "".join(includes))
-            write_header(os.path.join(path, COLLECTIONS[self.name]), self.name + ".h")
+            collectionheader = os.path.join(path, self.name + ".h")
+            write_file(collectionheader, "".join(includes))
+            written.append(collectionheader)
+            if collectionheader in leftovers:
+                leftovers.remove(collectionheader)
+            convenienceheader = os.path.join(path, COLLECTIONS[self.name])
+            write_file(convenienceheader, include_directive(self.name + ".h"))
+            written.append(convenienceheader)
+            if convenienceheader in leftovers:
+                leftovers.remove(convenienceheader)
+
+        for filepath in written:
+            filepath = os.path.abspath(filepath)
+            if filepath in leftovers:
+                leftovers.remove(filepath)
+
+        if VERBOSE and len(leftovers) > 0:
+            print("INFO: Removing obsolete headers from '%s'..." % path)
+        for leftover in leftovers:
+            if VERBOSE:
+                print("INFO:\t ==> %s" % leftover) # os.path.basename(leftover))
+            os.remove(leftover)
 
 # ============================================================================
 # Package
 # ============================================================================
 class Package:
     def __init__(self, name):
-        self.path = name
-        self.collections = list()
+        self.name = name
+        self.collections = []
 
     def read(self, path):
         global EXCLUDE
@@ -228,11 +276,6 @@
     if not os.path.basename(os.path.normpath(options.outputdir)) == "include":
         options.outputdir = os.path.join(options.outputdir, "include")
 
-    if os.path.exists(options.outputdir):
-        if VERBOSE:
-            print("INFO: Removing include dir '%s'" % options.outputdir)
-        shutil.rmtree(options.outputdir, ignore_errors=True)
-
     package = Package("hb")
     package.read(options.inputdir)
     package.write(options.outputdir)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/all/openvg/main.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the Config module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <QtCore/qglobal.h>
+#include <QApplication>
+#include <QPixmap>
+
+#if defined(QT_LOWER_CASE_VG_INCLUDES)
+#include <vg/openvg.h>
+#else
+#include <VG/openvg.h>
+#endif
+
+Q_DECL_IMPORT VGImage qPixmapToVGImage(const QPixmap &pixmap); // see qpixmapdata_vg.cpp in qt/src/openvg
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    VGPaint paint = vgCreatePaint();
+    Q_UNUSED(paint);
+    QPixmap pm(100, 200);
+    VGImage img = qPixmapToVGImage(pm);
+    Q_UNUSED(img);
+    return 0;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/all/openvg/openvg.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,45 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights.  These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = app
+TARGET = hbconftest_openvg
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG += openvg
+
+# Input
+SOURCES += main.cpp
+
+# OpenVG libraries, the same way hbcore uses them
+QT *= openvg
+!isEmpty(QMAKE_LIBS_OPENVG) {
+    LIBS += $$QMAKE_LIBS_OPENVG
+} else {
+    symbian: LIBS += -llibopenvg -llibopenvgu
+    else:win32-msvc*: LIBS += -llibopenvg
+    else: LIBS += -lopenvg
+}

--- a/config.tests/maemo/dui/dui.pro	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-#############################################################################
-##
-## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (developer.feedback@nokia.com)
-##
-## This file is part of the UI Extensions for Mobile.
-##
-## GNU Lesser General Public License Usage
-## This file may be used under the terms of the GNU Lesser General Public
-## License version 2.1 as published by the Free Software Foundation and
-## appearing in the file LICENSE.LGPL included in the packaging of this file.
-## Please review the following information to ensure the GNU Lesser General
-## Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights.  These rights are described in the Nokia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at developer.feedback@nokia.com.
-##
-#############################################################################
-#
-
-TEMPLATE = app
-TARGET = hbconftest_dui
-DEPENDPATH += .
-INCLUDEPATH += /usr/include/dui /usr/local/include/dui
-LIBS += -ldui
-
-SOURCES += main.cpp

--- a/config.tests/maemo/dui/main.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the Config module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <duiapplication.h>
-
-int main()
-{
-    DuiApplication *app = DuiApplication::instance();
-    app = 0;
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/meego/meegotouch/main.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,32 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the Config module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <mapplication.h>
+
+int main()
+{
+    MApplication *app = MApplication::instance();
+    app = 0;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/meego/meegotouch/meegotouch.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,34 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights.  These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = app
+TARGET = hbconftest_meegotouch
+DEPENDPATH += .
+INCLUDEPATH += /usr/include/meegotouch /usr/local/include/meegotouch
+LIBS += -lmeegotouchcore -lmeegotouchextensions -lmeegotouchsettings -lmeegotouchviews
+
+SOURCES += main.cpp

--- a/config.tests/symbian/sgimagelite/main.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ b/config.tests/symbian/sgimagelite/main.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -24,11 +24,9 @@
 ****************************************************************************/
 
 #include <ncp_feature_consts.hrh>
-#include <ncp_feature_settings.hrh>
 
 #ifndef VSW_GSW_SGIMAGELITE
 #error VSW_GSW_SGIMAGELITE not defined
 #endif
 
-int main() { return 0;}
-
+int main() { }

--- a/config.tests/symbian/sgimagelite/sgimagelite.pro	Thu Jul 15 14:03:49 2010 +0100
+++ b/config.tests/symbian/sgimagelite/sgimagelite.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -30,6 +30,8 @@
 DEPENDPATH += .
 INCLUDEPATH += .
 CONFIG -= qt
+CONFIG += no_icon
+QMAKE_LIBS = -llibc -llibm -leuser -llibdl
 #INCLUDEPATH += $${EPOCROOT}epoc32/include
 
 # Input

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/symbian/tchunkcreateinfo/main.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,31 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the Config module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <e32std.h>
+
+int main() {
+    TChunkCreateInfo info;
+    info.SetReadOnly();
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/symbian/tchunkcreateinfo/tchunkcreateinfo.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,36 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights.  These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = app
+TARGET = hbconftest_tchunkcreateinfo
+DEPENDPATH += .
+INCLUDEPATH += .
+CONFIG -= qt
+#INCLUDEPATH += $${EPOCROOT}epoc32/include
+
+# Input
+SOURCES += main.cpp

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/symbian/touchfeedback/main.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the Config module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <touchfeedback.h>
+
+int main() { 
+  return !ETouchFeedbackLongPress;
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/symbian/touchfeedback/touchfeedback.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,38 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights.  These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = app
+TARGET = hbconftest_touchfeedback
+DEPENDPATH += .
+INCLUDEPATH += $${EPOCROOT}epoc32/include/platform/mw \
+               $${EPOCROOT}epoc32/include/platform 
+CONFIG -= qt
+CONFIG += no_icon
+QMAKE_LIBS = -llibc -llibm -leuser -llibdl
+
+# Input
+SOURCES += main.cpp

--- a/config.tests/unix/sharedmemory/main.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ b/config.tests/unix/sharedmemory/main.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -33,9 +33,13 @@
 {
     QCoreApplication app(argc, argv);
     QSharedMemory sharedMemory("hbconftest_sharedmemory");
-    if (!sharedMemory.create(CACHE_SIZE, QSharedMemory::ReadWrite)) {
-        qWarning() << sharedMemory.errorString();
-        return EXIT_FAILURE;
+    if (sharedMemory.create(CACHE_SIZE)) {
+        bool attach = sharedMemory.attach();
+        Q_UNUSED(attach);
+        if (sharedMemory.isAttached()) {
+            return EXIT_SUCCESS;
+        }
     }
-    return EXIT_SUCCESS;
+    qWarning() << sharedMemory.error() << sharedMemory.errorString();
+    return EXIT_FAILURE;
 }

--- a/config.tests/unix/sharedmemory/sharedmemory.pro	Thu Jul 15 14:03:49 2010 +0100
+++ b/config.tests/unix/sharedmemory/sharedmemory.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -27,6 +27,7 @@
 
 TEMPLATE = app
 TARGET = hbconftest_sharedmemory
+isEmpty(HB_SOURCE_DIR):error(HB_SOURCE_DIR not defined!!!)
 DEPENDPATH += . $${HB_SOURCE_DIR}/src/hbcore/core
 INCLUDEPATH += . $${HB_SOURCE_DIR}/src/hbcore/core
 DEFINES += HB_BOOTSTRAPPED

--- a/configure.py	Thu Jul 15 14:03:49 2010 +0100
+++ b/configure.py	Thu Jul 22 16:36:53 2010 +0100
@@ -45,6 +45,10 @@
 HB_MAKE_PARTS = [ "tutorials" ]
 HB_NOMAKE_PARTS = [ "tests", "performance", "localization" ]
 
+QMAKE = None
+MAKE = None
+BUILDENV = None
+
 # ============================================================================
 # Utils
 # ============================================================================
@@ -61,11 +65,37 @@
         if not part in HB_NOMAKE_PARTS:
             HB_NOMAKE_PARTS.append(part)
 
+def run_system(args, cwd=None):
+    old_epocroot = None
+    env = os.environ.copy()
+    if "EPOCROOT" in env:
+        epocroot = env.get("EPOCROOT")
+        if not (epocroot.endswith("\\") or epocroot.endswith("/")):
+            os.putenv("EPOCROOT", "%s/" % epocroot)
+            old_epocroot = epocroot
+
+    if type(args) is list:
+        args = " ".join(args)
+    result = os.system(args)
+
+    if old_epocroot != None:
+        os.putenv("EPOCROOT", old_epocroot)
+
+    return result
+
 def run_process(args, cwd=None):
     code = 0
     output = ""
+
+    env = os.environ.copy()
+    if "EPOCROOT" in env:
+        epocroot = env.get("EPOCROOT")
+        if not (epocroot.endswith("\\") or epocroot.endswith("/")):
+            env["EPOCROOT"] = "%s/" % epocroot        
+
     if os.name == "nt":
         args = ["cmd.exe", "/C"] + args
+        
     try:
         if cwd != None:
             oldcwd = os.getcwd()
@@ -75,10 +105,11 @@
             code = process.wait()
             output = process.fromchild.read()
         else:
-            process = subprocess.Popen(args, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+            process = subprocess.Popen(args, env=env, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
             (stdout, stderr) = process.communicate()
             code = process.returncode
             output = stdout + stderr
+            
         if cwd != None:
             os.chdir(oldcwd)
     except:
@@ -95,6 +126,19 @@
         print(e)
     return content
 
+def write_file(filepath, content):
+    try:
+        path = os.path.split(filepath)[0]
+        if not os.path.exists(path):
+            os.makedirs(path)
+        file = open(filepath, "w")
+        file.write(content)
+        file.close()
+    except Exception, e:
+        print(e)
+        return False
+    return True
+
 def grep(path, pattern, include = [], exclude = []):
     result = {}
     expr = re.compile(pattern)
@@ -121,19 +165,19 @@
 # OptionParser
 # ============================================================================
 class OptionParser(optparse.OptionParser):
-    def __init__(self, platform, make, prefix):
+    def __init__(self):
         optparse.OptionParser.__init__(self, formatter=optparse.TitledHelpFormatter())
         self.add_option("-v", "--verbose", action="store_true", dest="verbose",
                         help="Print verbose information during the configure.")
         self.set_defaults(verbose=False)
 
-        if platform != "symbian":
+        if QMAKE.platform() != "symbian":
             group = optparse.OptionGroup(self, "Installation options")
             group.add_option("--prefix", dest="prefix", metavar="dir",
                              help="Install everything relative to <dir>. The default value is '%s'. "
                                   "NOTE: Use '--prefix .' to configure a local setup. A local "
                                   "setup will install nothing else than the qmake "
-                                  "feature file." % prefix)
+                                  "feature file." % BUILDENV.default_prefix())
             group.add_option("--bin-dir", dest="bindir", metavar="dir",
                              help="Install executables to <dir>. The default value is 'PREFIX/bin'.")
             group.add_option("--lib-dir", dest="libdir", metavar="dir",
@@ -144,19 +188,19 @@
                              help="Install headers to <dir>. The default value is 'PREFIX/include'.")
             group.add_option("--plugin-dir", dest="plugindir", metavar="dir",
                              help="Install plugins to <dir>. The default value is 'PREFIX/plugins'.")
-            group.add_option("--resource-dir", dest="resourcedir", metavar="dir",
+            group.add_option("--features-dir", dest="featuresdir", metavar="dir",
+                             help="Install qmake feature files to <dir>. The default value is 'QTDIR/mkspecs/features'.")
+            group.add_option("--resources-dir", dest="resourcesdir", metavar="dir",
                              help="Install resources to <dir>. The default value is 'PREFIX/resources'.")
-            group.add_option("--feature-dir", dest="featuredir", metavar="dir",
-                             help="Install qmake feature files to <dir>. The default value is 'QTDIR/mkspecs/features'.")
             self.add_option_group(group)
         self.set_defaults(prefix=None)
         self.set_defaults(bindir=None)
         self.set_defaults(libdir=None)
         self.set_defaults(docdir=None)
         self.set_defaults(includedir=None)
-        self.set_defaults(plugindir=None)
-        self.set_defaults(resourcedir=None)
-        self.set_defaults(featuredir=None)
+        self.set_defaults(pluginsdir=None)
+        self.set_defaults(featuresdir=None)
+        self.set_defaults(resourcesdir=None)
 
         group = optparse.OptionGroup(self, "Configure options")
         group.add_option("--platform", dest="platform", metavar="platform",
@@ -166,7 +210,7 @@
         group.add_option("--make-bin", dest="makebin", metavar="path",
                          help="Specify the make tool (make, nmake, mingw32-make, gmake...). "
                               "The one detected in PATH is used by default if not specified.")
-        if platform == "win32" and make == "nmake":
+        if QMAKE.platform() == "win32" and MAKE.bin() == "nmake":
             group.add_option("--msvc", action="store_true", dest="msvc",
                              help="Generate a MSVC solution.")
         group.add_option("--release", action="store_const", dest="config", const="release",
@@ -179,7 +223,7 @@
                          help="Do not suppress debug and warning output (suppressed by default in release mode).")
         group.add_option("--no-debug-output", action="store_true", dest="no_debug_output",
                          help="Suppress debug and warning output (not supporessed by default in debug mode).")
-        if platform != "symbian":
+        if QMAKE.platform() != "symbian":
             group.add_option("--silent", action="store_true", dest="silent",
                              help="Suppress verbose compiler output.")
             group.add_option("--fast", action="store_true", dest="fast",
@@ -192,6 +236,12 @@
         group.add_option("--defines", dest="defines", metavar="defines",
                          help="Define compiler macros for selecting features "
                               "and debugging purposes eg. --defines HB_FOO_DEBUG,HB_BAR_ENABLED")
+        if QMAKE.platform() == "unix":
+            group.add_option("--rpath", action="store_true", dest="rpath",
+                             help="Link Hb libraries and executables using the library install "
+                                  "path as a runtime library path.")
+            group.add_option("--no-rpath", action="store_false", dest="rpath",
+                             help="Do not use the library install path as a runtime library path.")
         self.add_option_group(group)
         self.set_defaults(platform=None)
         self.set_defaults(makebin=None)
@@ -200,12 +250,14 @@
         self.set_defaults(silent=False)
         self.set_defaults(fast=False)
         self.set_defaults(defines=None)
+        self.set_defaults(rpath=None)
 
         group = optparse.OptionGroup(self, "Host options")
         group.add_option("--host-qmake-bin", dest="hostqmakebin", metavar="path",
                          help="Specify the host qmake tool.")
         group.add_option("--host-make-bin", dest="hostmakebin", metavar="path",
                          help="Specify the host make tool (make, nmake, mingw32-make, gmake...).")
+        self.add_option_group(group)
         self.set_defaults(hostqmakebin=None)
         self.set_defaults(hostmakebin=None)
 
@@ -219,8 +271,6 @@
                          help="Additional qmake options "
                               "eg. --qmake-options \"CONFIG+=foo DEFINES+=BAR\".")
         self.add_option_group(group)
-        self.set_defaults(qmakebin=None)
-        self.set_defaults(qmakespec=None)
         self.set_defaults(qmakeopt=None)
 
         group = optparse.OptionGroup(self, "Feature options")
@@ -234,198 +284,301 @@
                          help="Do not build gestures.")
         group.add_option("--no-text-measurement", action="store_false", dest="textMeasurement",
                          help="Do not build text measurement support (needed for localization).")
-        group.add_option("--no-inputs", action="store_false", dest="inputs",
-                         help="DEPRECATED: Use --nomake hbinput.")
-        group.add_option("--no-feedback", action="store_false", dest="feedback",
-                         help="DEPRECATED: Use --nomake hbfeedback.")
-        group.add_option("--no-tutorials", action="store_false", dest="tutorials",
-                         help="DEPRECATED: Use --nomake tutorials.")
         self.add_option_group(group)
         self.set_defaults(make=None)
         self.set_defaults(nomake=None)
         self.set_defaults(effects=True)
         self.set_defaults(gestures=True)
         self.set_defaults(textMeasurement=True)
-        self.set_defaults(inputs=None)
-        self.set_defaults(feedback=None)
-        self.set_defaults(tutorials=None)
 
         group = optparse.OptionGroup(self, "Qt options")
         group.add_option("--qt-mobility", action="store_true", dest="qtmobility",
                          help="Assumes that Qt Mobility is available without performing a compilation test.")
         group.add_option("--no-qt-mobility", action="store_false", dest="qtmobility",
                          help="Assumes that Qt Mobility is not available without performing a compilation test.")
-        group.add_option("--qt-animation", action="store_true", dest="qtanimation",
-                         help="DEPRECATED: Qt 4.6 includes the animation framework.")
-        group.add_option("--no-qt-animation", action="store_false", dest="qtanimation",
-                         help="DEPRECATED: Qt 4.6 includes the animation framework.")
-        group.add_option("--qt-gestures", action="store_true", dest="qtgestures",
-                         help="DEPRECATED: Qt 4.6 includes the gestures framework.")
-        group.add_option("--no-qt-gestures", action="store_false", dest="qtgestures",
-                         help="DEPRECATED: Qt 4.6 includes the gestures framework.")
-        if platform == "symbian" or platform == None:
-            group.add_option("--qt-symbian-eventfilter", action="store_false", dest="s60eventfilter",
-                             help="DEPRECATED: Qt 4.6 includes QApplication::symbianEventFilter().")
-            group.add_option("--qt-s60-eventfilter", action="store_true", dest="s60eventfilter",
-                             help="DEPRECATED: Qt 4.6 includes QApplication::symbianEventFilter().")
-        group.add_option("--dui", action="store_true", dest="dui",
-                         help="Assumes that Maemo Direct UI is available without performing a compilation test.")
-        group.add_option("--no-dui", action="store_false", dest="dui",
-                         help="Assumes that Maemo Direct UI is not available without performing a compilation test.")
+        group.add_option("--meegotouch", action="store_true", dest="meegotouch",
+                         help="Assumes that MeeGoTouch UI is available without performing a compilation test.")
+        group.add_option("--no-meegotouch", action="store_false", dest="meegotouch",
+                         help="Assumes that MeeGoTouch UI is not available without performing a compilation test.")
+        group.add_option("--qt-openvg", action="store_true", dest="qtopenvg",
+                         help="Assumes that OpenVG is available without performing a compilation test.")
+        group.add_option("--no-qt-openvg", action="store_false", dest="qtopenvg",
+                         help="Assumes that OpenVG is not available without performing a compilation test.")
         self.add_option_group(group)
         self.set_defaults(qtmobility=None)
-        self.set_defaults(qtanimation=None)
-        self.set_defaults(qtgestures=None)
-        self.set_defaults(qts60eventfilter=None)
+        self.set_defaults(qtopenvg=None)
 
         group = optparse.OptionGroup(self, "Developer options")
         group.add_option("--developer", action="store_true", dest="developer",
-                         help="Enables the developer mode ie. builds tests and exports necessary symbols. "
-                              "NOTE: The developer mode implies a local setup by default.")
-        if platform != "symbian":
+                         help="Enables the developer mode. The developer mode implies "
+                         "a local setup, enables tests and exports extra symbols for "
+                         "testing purposes. NOTE: this is equal to: --prefix . --make tests "
+                         "--developer-export")
+        group.add_option("--developer-export", action="store_true", dest="developerexport",
+                         help="Enables developer exports ie. extra symbols for testing purposes.")
+        if QMAKE.platform() != "symbian":
             group.add_option("--coverage", action="store_true", dest="coverage",
                              help="Builds with test coverage measurement support. "
                                   "This implies the developer mode.")
-        group.add_option("--tests", action="store_true", dest="tests",
-                         help="DEPRECATED: Use --make tests.")
-        group.add_option("--performance", action="store_true", dest="performance",
-                         help="DEPRECATED: Use --make performance.")
-        group.add_option("--localization", action="store_true", dest="localization",
-                         help="DEPRECATED: Use --make localization.")
         self.add_option_group(group)
         self.set_defaults(developer=False)
+        self.set_defaults(developerexport=None)
         self.set_defaults(coverage=False)
-        self.set_defaults(tests=None)
-        self.set_defaults(performance=None)
-        self.set_defaults(localization=None)
 
 # ============================================================================
-# Platform
+# Make
 # ============================================================================
-class Platform:
-    def __init__(self, qmake):
+class Make:
+    def __init__(self):
+        self._bin = None
+
+    def init(self, cmdline):
+        match = re.search("--make-bin[=\s](\S+)", cmdline)
+        if match:
+            self._bin = match.group(1)
+        else:
+            self._bin = self._detect_make()
+
+    def command(self, target=None):
+        _args = [self._bin]
+        if target:
+            _args += [target]
+        return _args
+
+    def bin(self):
+        return self._bin
+
+    def _detect_make(self):
+        if QMAKE.platform() == "win32" and self._test_make("nmake", "/?"):
+            return "nmake"
+        if self._test_make("make", "-v"):
+            return "make"
+        if self._test_make("gmake", "-v"):
+            return "gmake"
+        if QMAKE.platform() == "win32" and self._test_make("mingw32-make", "-v"):
+            return "mingw32-make"
+        return "make"
+
+    def _test_make(self, command, param):
+        try:
+            return run_process([command, param])[0] == 0
+        except:
+            return False
+
+# ============================================================================
+# QMake
+# ============================================================================
+class QMake:
+    def __init__(self):
+        self._bin = "qmake"
         self._platform = None
-        self._make = None
         self._error = None
-        self._qmake = qmake
         self._spec = None
-        self._version = None
         self._features = None
         self._qtdir = None
+        self._qtversion = None
+        self._args = []
 
-    def name(self):
-        if not self._platform:
-            self._detect_qt()
+    def init(self, cmdline):
+        match = re.search("--qmake-bin[=\s](\S+)", cmdline)
+        if match:
+            self._bin = match.group(1)
+        match = re.search("--platform[=\s](\S+)", cmdline)
+        if match:
+            self._platform = match.group(1)
+        match = re.search("--qmake-spec[=\s](\S+)", cmdline)
+        if match:
+            self._spec = match.group(1)
+        return self._run_qmake()
+
+    def command(self, profile=None):
+        _args = [self._bin]
+        if self._spec:
+            _args += ["-spec", self._spec]
+        if len(self._args):
+            _args += self._args
+        if profile:
+            _args += [profile]
+        return _args
+
+    def add_args(self, args):
+        self._args += args
+
+    def platform(self):
         return self._platform
 
-    def make(self):
-        if not self._make:
-            self._make = self._detect_make()
-        return self._make
-
-    def qmake(self):
-        if not self._qmake:
-            self._detect_qt()
-        return self._qmake
+    def bin(self):
+        return self._bin
 
     def error(self):
         return self._error
 
     def spec(self):
-        if not self._spec:
-            self._detect_qt()
         return self._spec
 
-    def version(self):
-        if not self._version:
-            self._detect_qt()
-        return self._version
-
     def features(self):
-        if not self._features:
-            self._detect_qt()
         return self._features
 
     def qtdir(self):
-        if not self._qtdir:
-            self._detect_qt()
         return self._qtdir
 
-    def _detect_qt(self):
-        lines = list()
-        lines.append("symbian:message(platform:symbian)\n")
-        lines.append("else:macx:message(platform:macx)\n")
-        lines.append("else:unix:message(platform:unix)\n")
-        lines.append("else:win32:message(platform:win32)\n")
-
-        lines.append("message(version:$$[QT_VERSION])\n")
-        lines.append("message(libraries:$$[QT_INSTALL_LIBS])\n")
-        lines.append("message(features:$$[QMAKE_MKSPECS]/features)\n")
+    def qtversion(self):
+        return self._qtversion
 
-        try:
-            if not os.path.exists("tmp"):
-                os.makedirs("tmp")
-            fd, filepath = tempfile.mkstemp(dir="tmp", text=True, suffix=".pro")
-            file = os.fdopen(fd, "w+")
-            file.writelines(lines)
-            file.close()
-        except Exception, e:
-            print(e)
-            self._error = "Unable to write a temporary file. Make sure to configure in a writable directory."
-            return
+    def _run_qmake(self):
+        # write .pro
+        content = """
+                  symbian:message(platform:symbian)
+                  symbian:message(platform:symbian)
+                  else:macx:message(platform:macx)
+                  else:unix:message(platform:unix)
+                  else:win32:message(platform:win32)
+                  message(features:$$[QMAKE_MKSPECS]/features)
+                  message(qtversion:$$[QT_VERSION])
+                  message(qtdir:$$[QT_INSTALL_LIBS])
+                  """
+        if not write_file("tmp/qmake.pro", content):
+            self._error = "Unable to write 'tmp/qmake.pro'. Make sure to configure in a writable directory."
+            return False
 
-        # do not use .qmake.cache when detecting the platform
-        args = [self._qmake, "-nocache", os.path.split(filepath)[1]]
+        # run qmake
+        args = [self._bin, "-nocache", "qmake.pro"]
         if self._spec:
             args += ["-spec", self._spec]
         (code, output) = run_process(args, "tmp")
+
+        # cleanup & check return
         shutil.rmtree("tmp", ignore_errors=True)
         if code != 0:
-            self._error = "Unable to execute %s" % self._qmake
-            if self._qmake == "qmake":
+            self._error = "Unable to execute %s" % self._bin
+            if self._bin == "qmake":
                 self._error += ". Add qmake to PATH or pass --qmake-bin <path/to/qmake>."
+            return False
 
+        # parse output
         try:
-            self._platform = re.search("Project MESSAGE: platform:(\S+)", output).group(1)
-            self._version = re.search("Project MESSAGE: version:(\S+)", output).group(1)
-            self._qtdir = re.search("Project MESSAGE: libraries:(\S+)", output).group(1)
+            if not self._platform:
+                self._platform = re.search("Project MESSAGE: platform:(\S+)", output).group(1)
             self._features = re.search("Project MESSAGE: features:(\S+)", output).group(1)
+            self._qtversion = re.search("Project MESSAGE: qtversion:(\S+)", output).group(1)
+            self._qtdir = re.search("Project MESSAGE: qtdir:(\S+)", output).group(1)
         except:
             self._error = "Unable to parse qmake output (%s)" % output.strip()
             if output.find("QMAKESPEC") != -1:
                 self._error += ". Set QMAKESPEC environment variable or pass --qmake-spec <spec>."
-        return None
+            return False
+        return True
+
+# ============================================================================
+# BuildEnvironment
+# ============================================================================
+class BuildEnvironment:
+    def __init__(self):
+        self._blddir = os.path.abspath(os.getcwd())
+        self._srcdir = os.path.abspath(sys.path[0])
+        self._prefix = None
+        self._bindir = None
+        self._libdir = None
+        self._docdir = None
+        self._includedir = None
+        self._pluginsdir = None
+        self._featuresdir = None
+        self._resourcesdir = None
+
+    def init(self, options):
+        # prefix
+        if options.prefix:
+            # explicit
+            self._prefix = options.prefix
+        elif options.developer:
+            # developer mode implies a "local" build
+            self._prefix = self._blddir
+        else:
+            # fall back to default
+            self._prefix = self.default_prefix()
+        if QMAKE.platform() != "symbian":
+            self._prefix = os.path.abspath(self._prefix)
+
+        self._bindir = self._dir_option(options.bindir, self._prefix + "/bin")
+        self._libdir = self._dir_option(options.libdir, self._prefix + "/lib")
+        self._docdir = self._dir_option(options.docdir, self._prefix + "/doc")
+        self._includedir = self._dir_option(options.includedir, self._prefix + "/include")
+        self._pluginsdir = self._dir_option(options.pluginsdir, self._prefix + "/plugins")
+        self._featuresdir = self._dir_option(options.featuresdir, QMAKE.features())
+        self._resourcesdir = self._dir_option(options.resourcesdir, self._prefix + "/resources")
+
+        # symbian specific adjustments
+        if QMAKE.platform() == "symbian":
+            # TODO: fix to "$${EPOCROOT}resource/hb/plugins"
+            self._pluginsdir = "$${EPOCROOT}resource/qt/plugins/hb"
+
+            if not options.developer:
+                if os.path.isdir("/s60"):
+                    self._includedir = self._prefix + "/include/hb"
+                else:
+                    self._includedir = self._prefix + "/include/mw/hb"
 
-    def _detect_make(self):
-        if self.name() == "win32" and Platform._test_make("nmake", "/?"):
-            return "nmake"
-        if Platform._test_make("make", "-v"):
-            return "make"
-        if Platform._test_make("gmake", "-v"):
-            return "gmake"
-        if self.name() == "win32" and Platform._test_make("mingw32-make", "-v"):
-            return "mingw32-make"
-        return "(n)make"
+    def builddir(self):
+        return self._blddir
+
+    def sourcedir(self):
+        return self._srcdir
+
+    def prefix(self):
+        return self._prefix
+
+    def bindir(self):
+        return self._bindir
+
+    def libdir(self):
+        return self._libdir
+
+    def docdir(self):
+        return self._docdir
+
+    def includedir(self):
+        return self._includedir
+
+    def pluginsdir(self):
+        return self._pluginsdir
+
+    def featuresdir(self):
+        return self._featuresdir
 
-    def _test_make(command, param):
-        try:
-            return run_process([command, param])[0] == 0
-        except:
-            return False
+    def resourcesdir(self):
+        return self._resourcesdir
+
+    def exportdir(self, category=None):
+        if os.path.isdir("/s60"):
+            if category:
+                return "hb/%1/" + category + "/%2"
+            return "hb/%1/%2"
+        else:
+            if category:
+                return "$${EPOCROOT}epoc32/include/mw/hb/%1/" + category + "/%2"
+            return "$${EPOCROOT}epoc32/include/mw/hb/%1/%2"
 
-    _test_make = staticmethod(_test_make)
+    def default_prefix(self):
+        prefixes = { "symbian" : "$${EPOCROOT}epoc32",
+                     "unix"    : "/usr/local/hb",
+                     "macx"    : "/usr/local/hb",
+                     "win32"   : "C:/hb" }
+        return prefixes.get(QMAKE.platform(), self._blddir)
+
+    def local(self):
+        prefix = self.prefix()
+        return os.path.isdir(prefix) and (prefix == self._blddir)
+
+    def _dir_option(self, explicit, default):
+        if explicit:
+            return explicit
+        return default
 
 # ============================================================================
 # ConfigTest
 # ============================================================================
 class ConfigTest:
-    def __init__(self, platform):
-        self._make = platform.make()
-        self._qmake = platform.qmake()
-        self._platform = platform.name()
-        self._spec = platform.spec()
-
-    def setup(self, sourcedir, builddir):
+    def __init__(self, sourcedir=os.getcwd(), builddir=os.getcwd()):
         self._sourcedir = sourcedir
         self._builddir = builddir
 
@@ -444,14 +597,11 @@
             os.chdir(builddir)
 
             # run qmake & make
-            args = [self._qmake, filepath]
-            if self._spec:
-                args += ["-spec", self._spec]
-            run_process(args)
-            (code, output) = run_process([self._make])
+            run_process(QMAKE.command(filepath))
+            (code, output) = run_process(MAKE.command())
 
             # make return value is not reliable
-            if self._platform == "symbian":
+            if QMAKE.platform() == "symbian":
                 # on symbian, check that no error patterns such as '***' can be found from build output
                 patterns = ["\\*\\*\\*", "Errors caused tool to abort"]
                 for pattern in patterns:
@@ -459,14 +609,19 @@
                         code = -1
             else:
                 # on other platforms, check that the resulting executable exists
-                executable = os.path.join(builddir, "hbconftest_" + basename)
                 if os.name == "nt":
-                    executable.append(".exe")
-                if not os.path.exists(executable) or not os.access(executable, os.X_OK):
-                    code = -1
+                    executable = os.path.join(os.path.join(builddir, "debug"), "hbconftest_" + basename + ".exe")
+                    if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+                        executable = os.path.join(os.path.join(builddir, "release"), "hbconftest_" + basename + ".exe")
+                        if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+                            code = -1
+                else:
+                    executable = os.path.join(builddir, "hbconftest_" + basename)
+                    if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+                        code = -1
 
             # clean
-            run_process([self._make, "clean"])
+            run_process(MAKE.command("clean"))
 
         except:
             code = -1
@@ -511,210 +666,96 @@
 # main()
 # ============================================================================
 def main():
-    global HB_MAKE_PARTS, HB_NOMAKE_PARTS
-
-    qmake = "qmake"
-    cmdline = " ".join(sys.argv[1:])
-    match = re.search("--qmake-bin[=\s](\S+)", cmdline)
-    if match:
-        qmake = match.group(1)
-
-    # detect platform
-    platform = Platform(qmake)
-    match = re.search("--platform[=\s](\S+)", cmdline)
-    if match:
-        platform._platform = match.group(1)
-
-    match = re.search("--qmake-spec[=\s](\S+)", cmdline)
-    if match:
-        platform._spec = match.group(1)
+    global QMAKE, MAKE, BUILDENV, HB_MAKE_PARTS, HB_NOMAKE_PARTS
 
     help = False
+    cmdline = " ".join(sys.argv[1:])
     match = re.search("--help\s*", cmdline)
     if match or re.search("-h\s*", cmdline):
         help = True
 
-    if not help and not platform.name():
-        print("ERROR: %s" % platform.error())
-        return
+    QMAKE = QMake()
+    QMAKE.init(cmdline)
 
-    # detect make
-    match = re.search("--make-bin[=\s](\S+)", cmdline)
-    if match:
-        platform._make = match.group(1)
-    if not platform.make():
-        print("ERROR: %s" % platform.error())
+    if not help and not QMAKE.platform():
+        print("ERROR: %s" % QMAKE.error())
         return
 
-    currentdir = os.path.abspath(os.getcwd())
-    sourcedir = os.path.abspath(sys.path[0])
+    MAKE = Make()
+    MAKE.init(cmdline)
 
-    # default prefixes
-    prefixes = { "symbian" : "$${EPOCROOT}epoc32",
-                 "unix"    : "/usr/local/hb",
-                 "macx"    : "/usr/local/hb",
-                 "win32"   : "C:/hb" }
+    BUILDENV = BuildEnvironment()
 
     # parse command line options
-    parser = OptionParser(platform.name(), platform.make(), prefixes.get(platform.name(), currentdir))
+    parser = OptionParser()
     (options, args) = parser.parse_args()
 
+    BUILDENV.init(options)
+
     # coverage implies developer mode
     if options.coverage:
         options.developer = True
 
-    print("Configuring Hb...")
-    print("INFO: Platform: %s" % platform.name())
-    print("INFO: Make: %s" % platform.make())
-    print("INFO: Qt: %s in %s" % (platform.version(), platform.qtdir()))
-
-    # warn about deprecated options
-    if options.qtanimation != None:
-        print("WARNING: --qt-animation and --qt-no-animation are DEPRECATED. Qt 4.6 includes the animation framework.")
-    if options.qtgestures != None:
-        print("WARNING: --qt-gestures and --qt-no-gestures are DEPRECATED. Qt 4.6 includes the gestures framework.")
-    if options.qts60eventfilter != None:
-        print("WARNING: --qt-symbian-eventfilter and --qt-s60-eventfilter are DEPRECATED. Qt 4.6 includes QApplication::symbianEventFilter().")
-    if options.inputs != None:
-        print("WARNING: --no-inputs is DEPRECATED. Use --nomake hbinput.")
-        add_remove_part("hbinput", options.inputs)
-    if options.feedback != None:
-        print("WARNING: --no-feedback is DEPRECATED. Use --nomake hbfeedback.")
-        add_remove_part("hbfeedback", options.feedback)
-    if options.tutorials != None:
-        print("WARNING: --no-tutorials is DEPRECATED. Use --nomake tutorials.")
-        add_remove_part("tutorials", options.tutorials)
-    if options.tests != None:
-        print("WARNING: --tests is DEPRECATED. Use --make tests.")
-        add_remove_part("tests", options.tests)
-    if options.performance != None:
-        print("WARNING: --performance is DEPRECATED. Use --make performance.")
-        add_remove_part("performance", options.performance)
-    if options.localization != None:
-        print("WARNING: --localization is DEPRECATED. Use --make localization.")
-        add_remove_part("localization", options.localization)
+    # developer mode implies tests, including perf & loc
+    if options.developer:
+        add_remove_part("tests", True)
+        add_remove_part("performance", True)
+        add_remove_part("localization", True)
 
-    # sort out directories
-    if not options.prefix:
-        # developer mode implies local setup
-        if options.developer:
-            options.prefix = currentdir
-        else:
-            options.prefix = prefixes.get(platform.name(), currentdir)
-    basedir = options.prefix
-    if platform.name() != "symbian":
-        basedir = os.path.abspath(basedir)
-
-    local = os.path.isdir(basedir) and (basedir == currentdir)
+    # developer mode implies developer exports
+    if options.developer:
+        options.developerexport = True
 
-    # generate local build wrapper headers
-    synchb = "bin/synchb.py"
-    if options.verbose:
-        synchb = "%s -v" % synchb
-        print("INFO: Running %s" % synchb)
-    os.system("python %s/%s -i %s -o %s" % (sourcedir, synchb, sourcedir, currentdir))
-
-    # generate a qrc for resources
-    args = [os.path.join(sourcedir, "bin/resourcifier.py")]
-    args += ["-i", "%s" % os.path.join(sys.path[0], "src/hbcore/resources")]
-    # TODO: make it currentdir
-    args += ["-o", "%s" % os.path.join(sourcedir, "src/hbcore/resources/resources.qrc")]
-    args += ["--exclude", "\"*distribution.policy.s60\""]
-    args += ["--exclude", "\"*readme.txt\""]
-    args += ["--exclude", "\"*.pr?\""]
-    args += ["--exclude", "\"*.qrc\""]
-    args += ["--exclude", "\"*~\""]
-    args += ["--exclude", "variant/*"]
-    if options.verbose:
-        print("INFO: Running %s" % " ".join(args))
-    os.system("python %s" % " ".join(args))
+    print("Configuring Hb...")
+    print("INFO: Platform: %s" % QMAKE.platform())
+    print("INFO: Make: %s" % MAKE.bin())
+    print("INFO: Qt: %s in %s" % (QMAKE.qtversion(), QMAKE.qtdir()))
 
     # compilation tests to detect available features
     config = ConfigFile()
-    test = ConfigTest(platform)
-    test.setup(sourcedir, currentdir)
+    test = ConfigTest(BUILDENV.sourcedir(), BUILDENV.builddir())
     print("\nDetecting available features...")
     if options.qtmobility == None:
         options.qtmobility = test.compile("config.tests/all/mobility")
     if options.qtmobility:
         config.add_value("DEFINES", "HB_HAVE_QT_MOBILITY")
     print("INFO: Qt Mobility:\t\t\t%s" % options.qtmobility)
-    if platform.name() == "symbian":
+    if options.qtopenvg == None:
+        options.qtopenvg = test.compile("config.tests/all/openvg")
+    if options.qtopenvg:
+        config.add_value("DEFINES", "HB_EFFECTS_OPENVG")
+        config.add_value("DEFINES", "HB_FILTER_EFFECTS")
+    print("INFO: OpenVG:\t\t\t\t%s" % options.qtopenvg)
+    if QMAKE.platform() == "symbian":
         sgimagelite_result = test.compile("config.tests/symbian/sgimagelite")
         if sgimagelite_result:
             config.add_value("CONFIG", "sgimage")
         print("INFO: SgImage-Lite:\t\t\t%s" % sgimagelite_result)
-    if options.dui == None:
-        options.dui = test.compile("config.tests/maemo/dui")
-    if options.dui:
-        config.add_value("CONFIG", "hb_maemo_dui")
-        config.add_value("DEFINES", "HB_MAEMO_DUI")
-    print("INFO: Direct UI:\t\t\t%s" % options.dui)
+        tchunkcreateinfo_result = test.compile("config.tests/symbian/tchunkcreateinfo")
+        if tchunkcreateinfo_result:
+            config.add_value("DEFINES", "HB_HAVE_PROTECTED_CHUNK")
+        touchfeedback_result = test.compile("config.tests/symbian/touchfeedback")
+        if touchfeedback_result:
+            config.add_value("DEFINES", "HB_TOUCHFEEDBACK_TYPE_IS_LONGPRESS")
+        print("INFO: ETouchFeedbackLongPress:\t\t%s" % touchfeedback_result)
+    if options.meegotouch == None:
+        options.meegotouch = test.compile("config.tests/meego/meegotouch")
+    if options.meegotouch:
+        config.add_value("CONFIG", "hb_meegotouch")
+        config.add_value("DEFINES", "HB_MEEGOTOUCH")
+    print("INFO: MeeGo Touch:\t\t\t%s" % options.meegotouch)
 
-    # directories
-    if options.bindir == None:
-        # TODO: symbian
-        options.bindir = basedir + "/bin"
-    if options.libdir == None:
-        # TODO: symbian
-        options.libdir = basedir + "/lib"
-    if options.docdir == None:
-        # TODO: symbian
-        options.docdir = basedir + "/doc"
-    if options.includedir == None:
-        if platform.name() == "symbian" and not options.developer:
-            if os.path.isdir("/s60"):
-                options.includedir = basedir + "/include/hb"
-            else:
-                options.includedir = basedir + "/include/mw/hb"
-        else:
-            options.includedir = basedir + "/include"
-    if options.plugindir == None:
-        if platform.name() == "symbian":
-            # TODO: fix to "$${EPOCROOT}resource/hb/plugins"
-            options.plugindir = "$${EPOCROOT}resource/qt/plugins/hb"
-        else:
-            options.plugindir = basedir + "/plugins"
-    if options.featuredir == None:
-        options.featuredir = platform.features()
-    if options.resourcedir == None:
-        # TODO: fix this, some components want to write resources...
-        #       thus, cannot point to the source tree!
-        if not local:
-            options.resourcedir = basedir + "/resources"
-        else:
-            options.resourcedir = sourcedir + "/src/hbcore/resources"
-
-    config.set_value("HB_INSTALL_DIR", ConfigFile.format_dir(basedir))
-    config.set_value("HB_BIN_DIR", ConfigFile.format_dir(options.bindir))
-    config.set_value("HB_LIB_DIR", ConfigFile.format_dir(options.libdir))
-    config.set_value("HB_DOC_DIR", ConfigFile.format_dir(options.docdir))
-    config.set_value("HB_INCLUDE_DIR", ConfigFile.format_dir(options.includedir))
-    config.set_value("HB_PLUGINS_DIR", ConfigFile.format_dir(options.plugindir))
-    config.set_value("HB_RESOURCES_DIR", ConfigFile.format_dir(options.resourcedir))
-    config.set_value("HB_FEATURES_DIR", ConfigFile.format_dir(options.featuredir))
-
-
-    if os.name == "posix" or os.name == "mac":
-        sharedmem = test.compile("config.tests/unix/sharedmemory")
-        if sharedmem:
-            (code, output) = run_process(["./hbconftest_sharedmemory"], "config.tests/unix/sharedmemory")
-            sharedmem = (code == 0)
-            if not sharedmem:
-                print("DEBUG:%s" % output)
-        print("INFO: Shared Memory:\t\t\t%s" % sharedmem)
-        if not sharedmem:
-            print("WARNING:The amount of available shared memory is too low!")
-            print "\tTry adjusting the shared memory configuration",
-            if os.path.exists("/proc/sys/kernel/shmmax"):
-                print "(/proc/sys/kernel/shmmax)"
-            elif os.path.exists("/etc/sysctl.conf"):
-                print "(/etc/sysctl.conf)"
-
-
+    config.set_value("HB_INSTALL_DIR", ConfigFile.format_dir(BUILDENV.prefix()))
+    config.set_value("HB_BIN_DIR", ConfigFile.format_dir(BUILDENV.bindir()))
+    config.set_value("HB_LIB_DIR", ConfigFile.format_dir(BUILDENV.libdir()))
+    config.set_value("HB_DOC_DIR", ConfigFile.format_dir(BUILDENV.docdir()))
+    config.set_value("HB_INCLUDE_DIR", ConfigFile.format_dir(BUILDENV.includedir()))
+    config.set_value("HB_PLUGINS_DIR", ConfigFile.format_dir(BUILDENV.pluginsdir()))
+    config.set_value("HB_FEATURES_DIR", ConfigFile.format_dir(BUILDENV.featuresdir()))
+    config.set_value("HB_RESOURCES_DIR", ConfigFile.format_dir(BUILDENV.resourcesdir()))
 
     # TODO: get rid of this!
-    if platform.name() == "symbian":
+    if QMAKE.platform() == "symbian":
         config.set_value("HB_PLUGINS_EXPORT_DIR", ConfigFile.format_dir("$${EPOCROOT}epoc32/winscw/c/resource/qt/plugins/hb"))
 
     if options.gestures:
@@ -723,12 +764,14 @@
         config.add_value("DEFINES", "HB_EFFECTS")
     if options.textMeasurement:
         config.add_value("DEFINES", "HB_TEXT_MEASUREMENT_UTILITY")
-	if platform.name() != "symbian" and options.developer:
-		config.add_value("DEFINES", "HB_CSS_INSPECTOR")
+    if QMAKE.platform() != "symbian" and options.developer:
+        config.add_value("DEFINES", "HB_CSS_INSPECTOR")
     if options.defines:
         config.add_value("DEFINES", " ".join(options.defines.split(",")))
-    if options.developer:
+    if options.developerexport:
         config.add_value("DEFINES", "HB_DEVELOPER")
+    if options.rpath == None or options.rpath == True:
+        config.add_value("QMAKE_RPATHDIR", "$${HB_LIB_DIR}")
 
     if options.verbose:
         print("INFO: Writing hb_install.prf")
@@ -736,22 +779,11 @@
         print("ERROR: Unable to write hb_install_prf.")
         return
 
-    config.set_value("HB_BUILD_DIR", ConfigFile.format_dir(currentdir))
-    config.set_value("HB_SOURCE_DIR", ConfigFile.format_dir(sourcedir))
-    config.set_value("HB_MKSPECS_DIR", ConfigFile.format_dir(basedir + "/mkspecs"))
-
-    if platform.name() == "symbian":
-        if os.path.isdir("/s60"):
-            config.set_value("HB_EXPORT_DIR", "hb/%1/%2")
-            config.set_value("HB_PRIVATE_EXPORT_DIR", "hb/%1/private/%2")
-        else:
-            config.set_value("HB_EXPORT_DIR", "$${EPOCROOT}epoc32/include/mw/hb/%1/%2")
-            config.set_value("HB_PRIVATE_EXPORT_DIR", "$${EPOCROOT}epoc32/include/mw/hb/%1/private/%2")
-
-    if options.developer:
-        add_remove_part("tests", True)
-        add_remove_part("performance", True)
-        add_remove_part("localization", True)
+    config.set_value("HB_BUILD_DIR", ConfigFile.format_dir(BUILDENV.builddir()))
+    config.set_value("HB_SOURCE_DIR", ConfigFile.format_dir(BUILDENV.sourcedir()))
+    if QMAKE.platform() == "symbian":
+        config.set_value("HB_EXPORT_DIR", ConfigFile.format_dir(BUILDENV.exportdir()))
+        config.set_value("HB_RESTRICTED_EXPORT_DIR", ConfigFile.format_dir(BUILDENV.exportdir("restricted")))
 
     if options.make:
         for part in options.make:
@@ -770,7 +802,7 @@
         for qmakeopt in options.qmakeopt.split():
             config._lines.append(qmakeopt + "\n")
 
-    if local:
+    if BUILDENV.local():
         config.add_value("CONFIG", "local")
     if options.silent:
         config.add_value("CONFIG", "silent")
@@ -798,7 +830,7 @@
     #       - can be disabled by passing --no_debug_output option
     config._lines.append("CONFIG(release, debug|release) {\n")
     config._lines.append("    debug_output|developer {\n")
-    config._lines.append("        # debug/warning output enabled {\n")
+    config._lines.append("        # debug/warning output enabled\n")
     config._lines.append("    } else {\n")
     config._lines.append("        DEFINES += QT_NO_DEBUG_OUTPUT\n")
     config._lines.append("        DEFINES += QT_NO_WARNING_OUTPUT\n")
@@ -810,8 +842,11 @@
     config._lines.append("    }\n")
     config._lines.append("}\n")
 
+    # ensure that no QString(0) -like constructs slip in
+    config.add_value("DEFINES", "QT_QCHAR_CONSTRUCTOR")
+
     # TODO: is there any better way to expose functions to the whole source tree?
-    config._lines.append("include(%s)\n" % (os.path.splitdrive(sourcedir)[1] + "/mkspecs/hb_functions.prf"))
+    config._lines.append("include(%s)\n" % (os.path.splitdrive(BUILDENV.sourcedir())[1] + "/mkspecs/hb_functions.prf"))
 
     if options.verbose:
         print("INFO: Writing .qmake.cache")
@@ -819,43 +854,89 @@
         print("ERROR: Unable to write .qmake.cache.")
         return
 
+    if os.name == "posix" or os.name == "mac":
+        sharedmem = test.compile("config.tests/unix/sharedmemory")
+        if sharedmem:
+            (code, output) = run_process(["./hbconftest_sharedmemory"], "config.tests/unix/sharedmemory")
+            sharedmem = (code == 0)
+            if not sharedmem:
+                print("DEBUG:%s" % output)
+        print("INFO: Shared Memory:\t\t\t%s" % sharedmem)
+        if not sharedmem:
+            print("WARNING:The amount of available shared memory is too low!")
+            print "\tTry adjusting the shared memory configuration",
+            if os.path.exists("/proc/sys/kernel/shmmax"):
+                print "(/proc/sys/kernel/shmmax)"
+            elif os.path.exists("/etc/sysctl.conf"):
+                print "(/etc/sysctl.conf)"
+
+    # generate local build wrapper headers
+    print("\nGenerating files...")
+    print("INFO: Wrapper headers")
+    synchb = "bin/synchb.py"
+    if options.verbose:
+        print("INFO: Running %s" % synchb)
+        synchb = "%s -v" % synchb
+    os.system("python %s/%s -i %s -o %s" % (BUILDENV.sourcedir(), synchb, BUILDENV.sourcedir(), BUILDENV.builddir()))
+
+    # generate a qrc for resources
+    print("INFO: Qt resource collection")
+    args = [os.path.join(BUILDENV.sourcedir(), "bin/resourcifier.py")]
+    args += ["-i", "%s" % os.path.join(sys.path[0], "src/hbcore/resources")]
+    # TODO: make it BUILDENV.builddir()
+    args += ["-o", "%s" % os.path.join(BUILDENV.sourcedir(), "src/hbcore/resources/resources.qrc")]
+    args += ["--exclude", "\"*distribution.policy.s60\""]
+    args += ["--exclude", "\"*readme.txt\""]
+    args += ["--exclude", "\"*.pr?\""]
+    args += ["--exclude", "\"*.qrc\""]
+    args += ["--exclude", "\"*~\""]
+    args += ["--exclude", "variant/*"]
+    args += ["--exclude", "\"*hbdefault.cssbin\""]
+
+    if QMAKE.platform() != "symbian":
+        args += ["--exclude", "\"*symbian*\""]
+    if QMAKE.platform() != "macx":
+        args += ["--exclude", "\"*macx*\""]
+    if QMAKE.platform() != "unix":
+        args += ["--exclude", "\"*unix*\""]
+    if QMAKE.platform() != "win32":
+        args += ["--exclude", "\"*win32*\""]
+
+    if options.verbose:
+        print("INFO: Running %s" % " ".join(args))
+    os.system("python %s" % " ".join(args))
+
     # build host tools
-    if platform.name() == "symbian" or options.hostqmakebin != None or options.hostmakebin != None:
+    if QMAKE.platform() == "symbian" or options.hostqmakebin != None or options.hostmakebin != None:
         print("\nBuilding host tools...")
         if options.hostqmakebin != None and options.hostmakebin != None:
-            profile = "%s/src/hbtools/hbtools.pro" % sourcedir
+            profile = "%s/src/hbtools/hbtools.pro" % BUILDENV.sourcedir()
             if os.path.exists(profile):
-                toolsdir = os.path.join(currentdir, "src/hbtools")
+                toolsdir = os.path.join(BUILDENV.builddir(), "src/hbtools")
                 if not os.path.exists(toolsdir):
                     os.makedirs(toolsdir)
                 os.chdir(toolsdir)
                 os.system("\"%s\" -config silent %s" % (options.hostqmakebin, profile))
                 os.system("\"%s\"" % (options.hostmakebin))
-                os.chdir(currentdir)
+                os.chdir(BUILDENV.builddir())
         else:
             print("WARNING: Cannot build host tools, because no --host-qmake-bin and/or")
             print("         --host-make-bin was provided. Hb will attempt to run host")
             print("         tools from PATH.")
 
     # run qmake
-    if options.qmakebin:
-        qmake = options.qmakebin
-    profile = os.path.join(sourcedir, "hb.pro")
-    cachefile = os.path.join(currentdir, ".qmake.cache")
+    profile = os.path.join(BUILDENV.sourcedir(), "hb.pro")
+    QMAKE.add_args(["-cache", os.path.join(BUILDENV.builddir(), ".qmake.cache")])
     if options.msvc:
-        qmake = "%s -tp vc" % qmake
+        QMAKE.add_args(["-tp", "vc"])
     if not options.fast:
-        qmake = "%s -r" % qmake
-    if options.qmakespec:
-        qmake = "%s -spec %s" % (qmake, options.qmakespec)
-    if options.qmakeopt:
-        qmake = "%s \\\"%s\\\"" % (qmake, options.qmakeopt)
+        QMAKE.add_args(["-r"])
     if options.verbose:
-        print("\nRunning %s -cache %s %s" % (qmake, cachefile, profile))
+        print("\nRunning %s" % QMAKE.command(profile))
     else:
         print("\nRunning qmake...")
     try:
-        ret = os.system("%s -cache %s %s" % (qmake, cachefile, profile))
+        ret = run_system(QMAKE.command(profile))
     except KeyboardInterrupt:
         ret = -1
     if ret != 0:
@@ -866,28 +947,28 @@
 
     if "tests" not in HB_NOMAKE_PARTS:
         # run qmake for tests
-        profile = "%s/tsrc/tsrc.pro" % sourcedir
+        profile = "%s/tsrc/tsrc.pro" % BUILDENV.sourcedir()
         if os.path.exists(profile):
-            tsrcdir = os.path.join(currentdir, "tsrc")
+            tsrcdir = os.path.join(BUILDENV.builddir(), "tsrc")
             if not os.path.exists(tsrcdir):
                 os.makedirs(tsrcdir)
             os.chdir(tsrcdir)
             if options.verbose:
-                print("\nRunning %s %s" % (qmake, profile))
+                print("\nRunning %s" % QMAKE.command(profile))
             else:
                 print("\nRunning qmake in tsrc...")
-            os.system("%s %s" % (qmake, profile))
-            os.chdir(currentdir)
+            run_system(QMAKE.command(profile))
+            os.chdir(BUILDENV.builddir())
 
             # create output dirs
-            outputdir = os.path.join(currentdir, "autotest")
+            outputdir = os.path.join(BUILDENV.builddir(), "autotest")
             if not os.path.exists(outputdir):
                 os.makedirs(outputdir)
-            outputdir = os.path.join(currentdir, "coverage")
+            outputdir = os.path.join(BUILDENV.builddir(), "coverage")
             if not os.path.exists(outputdir):
                 os.makedirs(outputdir)
         # nag about tests that are commented out
-        result = grep(sourcedir + "/tsrc", "#\s*SUBDIRS\s*\+=\s*(\S+)", ["*.pr?"])
+        result = grep(BUILDENV.sourcedir() + "/tsrc", "#\s*SUBDIRS\s*\+=\s*(\S+)", ["*.pr?"])
         maxlen = 0
         for profile in result:
             maxlen = max(maxlen, len(profile))
@@ -914,40 +995,37 @@
 
     # print summary
     print("")
-    if platform.make() == "nmake" and options.msvc:
+    if MAKE.bin() == "nmake" and options.msvc:
         conf = "MSVC"
         act = "open 'hb.sln'"
     elif options.coverage:
         conf = "test coverage measurement"
-        act = "run '%s coverage'" % platform.make()
+        act = "run '%s coverage'" % MAKE.bin()
     elif options.developer:
         conf = "development"
-        act = "run '%s'" % platform.make()
+        act = "run '%s'" % MAKE.bin()
     else:
         conf = "building"
-        act = "run '%s'" % platform.make()
+        act = "run '%s'" % MAKE.bin()
     print("Hb is now configured for %s. Just %s." % (conf, act))
 
     if not options.coverage:
-        if platform.name() == "symbian" or local:
-            print("You must run '%s install' to copy the .prf file in place." % platform.make())
+        if QMAKE.platform() == "symbian" or BUILDENV.local():
+            print("You must run '%s install' to copy Hb files in place." % MAKE.bin())
         else:
-            print("Once everything is built, you must run '%s install'." % platform.make())
-        if platform != "symbian":
-            if local:
-                print("Hb will be used from '%s'." % sourcedir)
+            print("Once everything is built, you must run '%s install'." % MAKE.bin())
+        if QMAKE.platform() != "symbian":
+            if BUILDENV.local():
+                print("Hb will be used from '%s'." % BUILDENV.prefix())
             else:
-                print("Hb will be installed to '%s'." % basedir)
-    if platform.name() == "win32":
-        path = os.path.join(basedir, "bin")
-        if local:
-            path = os.path.join(currentdir, "bin")
-        print("NOTE: Make sure that '%s' is in PATH." % path)
+                print("Hb will be installed to '%s'." % BUILDENV.prefix())
+    if QMAKE.platform() == "win32":
+        print("NOTE: Make sure that '%s' is in PATH." % BUILDENV.bindir())
         if options.coverage:
             print("Test code coverage measurement will FAIL if wrong Hb DLLs are found in PATH before '%s'." % path)
 
     print("")
-    print("To reconfigure, run '%s clean' and '%s'." % (platform.make(), sys.argv[0]))
+    print("To reconfigure, run '%s clean' and '%s'." % (MAKE.bin(), sys.argv[0]))
     print("")
 
 if __name__ == "__main__":

--- a/hb.prf	Thu Jul 15 14:03:49 2010 +0100
+++ b/hb.prf	Thu Jul 22 16:36:53 2010 +0100
@@ -30,7 +30,7 @@
 symbian:CONFIG += symbian_i18n skin_icon
 
 include(hb_install.prf)
-#include(docml2bin.prf)
+include(docml2bin.prf)
 
 CONFIG(debug, debug|release) {
     win32:SUFFIX = d
@@ -74,5 +74,4 @@
 
 !isEmpty(LINKAGE) {
     LIBS += -L$${HB_LIB_DIR} $${LINKAGE}
-    QMAKE_RPATHDIR *= $${HB_LIB_DIR}
 }

--- a/hb.pro	Thu Jul 15 14:03:49 2010 +0100
+++ b/hb.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -25,6 +25,7 @@
 #############################################################################
 #
 
+
 TEMPLATE = subdirs
 CONFIG += root
 
@@ -34,64 +35,64 @@
     SUBDIRS += tutorials
 }
 
-feature.files += $$HB_SOURCE_DIR/hb.prf
-feature.files += $$HB_BUILD_DIR/hb_install.prf
-feature.files += $$HB_MKSPECS_DIR/hb_functions.prf
-#feature.files += $$HB_MKSPECS_DIR/docml2bin.prf
-feature.path = $$HB_FEATURES_DIR
-INSTALLS += feature
+!symbian {
+    feature.files += $$HB_SOURCE_DIR/hb.prf
+    feature.files += $$HB_BUILD_DIR/hb_install.prf
+    feature.files += $$HB_SOURCE_DIR/mkspecs/hb_functions.prf
+    feature.files += $$HB_SOURCE_DIR/mkspecs/docml2bin.prf
+    feature.path = $$HB_FEATURES_DIR
+    INSTALLS += feature
+}
+else {
+    tmp = $$split(HB_FEATURES_DIR, :)
+    HB_SYMBIAN_PRF_EXPORT_DIR = $$last(tmp)
+    BLD_INF_RULES.prj_exports += "hb.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb.prf"
+    BLD_INF_RULES.prj_exports += "hb_install.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb_install.prf"
+    BLD_INF_RULES.prj_exports += "mkspecs/hb_functions.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/hb_functions.prf"
+    BLD_INF_RULES.prj_exports += "mkspecs/docml2bin.prf $$HB_SYMBIAN_PRF_EXPORT_DIR/docml2bin.prf"
+}
 
 QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/.qmake.cache)
 QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/hb_install.prf)
 
-hbvar.path = .
-hbvar.commands += $(QMAKE) -set HB \"hbcore hbwidgets hbutils\"
-QMAKE_EXTRA_TARGETS += hbvar
-INSTALLS += hbvar
 
 symbian {
     exists(rom):include(rom/rom.pri)
-    install.depends += index hbvar
-#    install.depends += cssbinary
-    install.commands += $$QMAKE_COPY $$hbNativePath($$HB_SOURCE_DIR/hb.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
-    install.commands += && $$QMAKE_COPY $$hbNativePath($$HB_BUILD_DIR/hb_install.prf) $$hbNativePath($$[QMAKE_MKSPECS]/features)
+    install.depends += cssbinary
     QMAKE_EXTRA_TARGETS += install
 }
 
-# theme indexing
+# css binary generation
+cssbinmaker.input = $$HB_SOURCE_DIR/src/hbcore/resources/themes/style/hbdefault
+cssbinmaker.output = $$HB_BUILD_DIR/src/hbcore/resources/themes/hbdefault.cssbin
+cssbinmaker.commands = $$hbToolCommand(hbbincssmaker) -i $$cssbinmaker.input -o $$cssbinmaker.output
+QMAKE_DISTCLEAN += $$cssbinmaker.output
+QMAKE_EXTRA_TARGETS += cssbinmaker
 
-symbian:HB_THEMES_DIR = $${EPOCROOT}epoc32/data/z/resource/hb/themes
-else:HB_THEMES_DIR = $(HB_THEMES_DIR)/themes
-isEmpty(HB_THEMES_DIR):index.commands += echo HB_THEMES_DIR environment variable not set
-else {
-    index.path = .
-    index.name = hbdefault
-    index.source = $$PWD/src/hbcore/resources/themes/icons/hbdefault
-    index.targets = $$HB_THEMES_DIR
-    symbian {
-        index.targets += $${EPOCROOT}epoc32/release/winscw/urel/z/resource/hb/themes
-        index.targets += $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/hb/themes
-    }
-    for(index.target, index.targets) {
-        !isEmpty(index.commands):index.commands += &&
-        index.commands += $$hbToolCommand(hbthemeindexer) -n $$index.name -s $$index.source -t $$index.target
-    }
-    QMAKE_EXTRA_TARGETS += index
-    INSTALLS += index
+cssbinary.depends = cssbinmaker
+cssbinary.path = $$HB_RESOURCES_DIR/themes
+cssbinary.files = $$cssbinmaker.output
+cssbinary.CONFIG += no_check_exist
+INSTALLS += cssbinary
+
+symbian {
+    cssbinary.commands += $$hbCopyCommand($$cssbinary.files, $${EPOCROOT}epoc32/data/z/resource/hb/themes/)
+    cssbinary.commands += && $$hbCopyCommand($$cssbinary.files, $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/hb/themes/)
+    QMAKE_DISTCLEAN += $${EPOCROOT}epoc32/data/z/resource/hb/themes/$$cssbinary.files
+    QMAKE_DISTCLEAN += $${EPOCROOT}epoc32/release/winscw/udeb/z/resource/hb/themes/$$cssbinary.files
+    QMAKE_EXTRA_TARGETS += cssbinary
 }
 
-# css binary generation
-
-
 !contains(HB_NOMAKE_PARTS, tests):exists(tsrc) {
     test.depends = sub-src
     test.commands += cd tsrc && $(MAKE) test
     autotest.depends = sub-src
     autotest.commands += cd tsrc && $(MAKE) autotest
-    loctest.depends = sub-src
-    loctest.commands += cd tsrc/loc && $(MAKE) loctest
-    QMAKE_EXTRA_TARGETS += test autotest loctest
+    unittest.depends = sub-src
+    unittest.commands += cd tsrc/unit && $(MAKE) test
+    QMAKE_EXTRA_TARGETS += test autotest unittest
 }
 
 exists(doc):include(doc/doc.pri)
 include(src/hbcommon.pri)
+#include(src/symbian_installs/symbian_deployment.pri)

--- a/layers.sysdef.xml	Thu Jul 15 14:03:49 2010 +0100
+++ b/layers.sysdef.xml	Thu Jul 22 16:36:53 2010 +0100
@@ -5,10 +5,18 @@
 
 <SystemDefinition name="hb" schema="1.5.1">
     <systemModel>
+        <layer name="tools_layer">
+            <module name="hbconf">
+                <unit unitID="qtdo.hb.hbconf" mrp="" bldFile="&layer_real_source_path;/src/platforms/symbian/configurations" name="hbconf" />
+            </module>
+        </layer>
         <layer name="mw_layer">
             <module name="qtdo.hb">
                 <unit name="qtdo.hb" unitID="qtdo.hb" bldFile="&layer_real_source_path;" mrp=""/>
             </module>
+             <module name="qtdo.hb.install">
+                <unit unitID="qtdo.hb.install" mrp="" bldFile="&layer_real_source_path;/src/platforms/symbian/installs" name="hbinstall"/>
+            </module>
         </layer>
         <layer name="app_layer">
             <module name="qtdo.hb.test_resources">

--- a/mkspecs/docml2bin.prf	Thu Jul 15 14:03:49 2010 +0100
+++ b/mkspecs/docml2bin.prf	Thu Jul 22 16:36:53 2010 +0100
@@ -1,7 +1,8 @@
-include(hb_install.prf)
+exists(hb_install.prf):include(hb_install.prf)
+else:include($${HB_BUILD_DIR}/hb_install.prf)
 include(hb_functions.prf)
 
-QMAKE_DOCML2BIN = $$hbNativePath($${HB_BIN_DIR}/docml2bin)
+QMAKE_DOCML2BIN = $$hbToolCommand(docml2bin) 
  
 docml2bin.input = DOCML
 docml2bin.output = ${QMAKE_FILE_IN}.bin
@@ -9,11 +10,17 @@
 docml2bin.name = DOCML2BIN ${QMAKE_FILE_IN}
 docml2bin.CONFIG = no_link
 
-rcc.depends += compiler_docml2bin_make_all
+for(DOCMLFILE, $$list($$unique(DOCML))) {
+    DOCMLFILE_PWD = $${_PRO_FILE_PWD_}/$${DOCMLFILE}
+    rcc.depends += $${DOCMLFILE_PWD}.bin
 
-## how to add ".bin" for each variable?
-#rcc.depends += for(DOCMLFILE, $$list(DOCML)) { DOCMLFILE }
-#rcc.depends += $${first(DOCML)}.bin
-#rcc.depends += $${last(DOCML)}.bin
+    DOCML2BINEXTENSION = \
+        "START EXTENSION qt/qmake_extra_pre_targetdep.export" \
+        "OPTION PREDEP_TARGET $${DOCMLFILE_PWD}.bin" \
+        "OPTION DEPS $${DOCMLFILE_PWD}" \
+        "OPTION COMMAND $${QMAKE_DOCML2BIN} -s $${DOCMLFILE_PWD} -t $${DOCMLFILE_PWD}.bin" \
+        "END"    
+    BLD_INF_RULES.prj_extensions += DOCML2BINEXTENSION
+}
 
 QMAKE_EXTRA_COMPILERS += docml2bin

--- a/mkspecs/hb_functions.prf	Thu Jul 15 14:03:49 2010 +0100
+++ b/mkspecs/hb_functions.prf	Thu Jul 22 16:36:53 2010 +0100
@@ -48,25 +48,25 @@
     LIBRARY = $$last(PARTS)
 
     INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+    INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/restricted
     INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
     DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+    DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/restricted
     DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
 
     LIBS *= -L$${HB_BUILD_DIR}/lib
     LIBS *= -l$$hbLibraryTarget($$LIBRARY)
-    QMAKE_RPATHDIR *= $${HB_BUILD_DIR}/lib
     unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\"
 
     export(LIBS)
     export(INCLUDEPATH)
     export(DEPENDPATH)
-    export(QMAKE_RPATHDIR)
     export(HB_COVERAGE_EXCLUDE)
     return(true)
 }
 
 # params: <collection>
-# NOTE: PUBLIC_HEADERS, INTERNAL_HEADERS, CONVENIENCE_HEADERS
+# NOTE: exports PUBLIC_HEADERS, RESTRICTED_HEADERS and CONVENIENCE_HEADERS
 # eg. hbExportHeaders(hbcore)
 defineTest(hbExportHeaders) {
     for(PUBLIC_HEADER, PUBLIC_HEADERS) {
@@ -74,12 +74,11 @@
         EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(PUBLIC_HEADER))
         BLD_INF_RULES.prj_exports *= "$$PUBLIC_HEADER $$EXPORT_PATH"
     }
-    # DO NOT EXPORT PRIVATE HEADERS!
-    #for(INTERNAL_HEADER, INTERNAL_HEADERS) {
-    #    INTERNAL_HEADER = $$section(INTERNAL_HEADER, ":", 1)
-    #    EXPORT_PATH = $$sprintf($$HB_PRIVATE_EXPORT_DIR, $$1, $$basename(INTERNAL_HEADER))
-    #    BLD_INF_RULES.prj_exports *= "$$INTERNAL_HEADER $$EXPORT_PATH"
-    #}
+    for(RESTRICTED_HEADER, RESTRICTED_HEADERS) {
+        RESTRICTED_HEADER = $$section(RESTRICTED_HEADER, ":", 1)
+        EXPORT_PATH = $$sprintf($$HB_RESTRICTED_EXPORT_DIR, $$1, $$basename(RESTRICTED_HEADER))
+        BLD_INF_RULES.prj_exports *= "$$RESTRICTED_HEADER $$EXPORT_PATH"
+    }
     for(CONVENIENCE_HEADER, CONVENIENCE_HEADERS) {
         CONVENIENCE_HEADER = $$section(CONVENIENCE_HEADER, ":", 1)
         EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(CONVENIENCE_HEADER))
@@ -92,9 +91,7 @@
 # params: -
 # eg. $$hbUnixStyle():CMD=/path/to/cmd else:CMD=\path\to\cmd
 defineTest(hbUnixStyle) {
-    symbian|win32:!win32-g++ {
-        unixstyle = false
-    } else:win32-g++:isEmpty(QMAKE_SH) {
+    contains(QMAKE_HOST.os, Windows):isEmpty(QMAKE_SH) {
         unixstyle = false
     } else {
         unixstyle = true
@@ -105,29 +102,67 @@
 # params: <path>
 # eg. features.path = $$hbNativePath($$[QMAKE_MKSPECS]/features)
 defineReplace(hbNativePath) {
-    hbUnixStyle() {
-        return($$quote(\"$$replace(1, "\\", "/")\"))
+    contains(QMAKE_HOST.os, Windows) {
+        isEmpty(QMAKE_SH) {
+            1 = $$replace(1, \\\\, $$QMAKE_DIR_SEP)
+            1 = $$replace(1, /, $$QMAKE_DIR_SEP)
+        } else {
+            1 = $$replace(1, \\\\, /)
+            1 = $$replace(1, /, /)
+        }
     } else {
-        return($$quote(\"$$replace(1, "/", "\\")\"))
+        1 = $$replace(1, \\\\, $$QMAKE_DIR_SEP)
+        1 = $$replace(1, /, $$QMAKE_DIR_SEP)
     }
+    
+    return($$quote(\"$$1\"))
 }
 
 # params: <tool name>
 # eg. hbfoo.command = $$hbToolCommand(hbfoo)
 defineReplace(hbToolCommand) {
-    # tool in PATH?
-    hbUnixStyle():DEVNULL = /dev/null
-    else:DEVNULL = nul
-    system($$1 > $$DEVNULL 2>&1):return($$1)
+    symbian {
+        # tool in PATH?
+        exists(/dev/null) {
+            DEVNULL = /dev/null
+        } else {
+            DEVNULL = nul
+        }
+        system($$1 > $$DEVNULL 2>&1):return($$1)
 
-    # host build is runnable?
-    hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1)
-    system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+        # host build is runnable?
+        hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1)
+        system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
 
-    # pre-built tool is runnable?
-    hbtoolcmd = $$hbNativePath($$sprintf("%1%2", $$HB_SOURCE_DIR/bin/$$1, "_symbian.exe"))
-    system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+        # tool in HB_BIN_DIR?
+        hbtoolcmd = $$hbNativePath($$HB_BIN_DIR/$$1)
+        system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
 
+        # pre-built tool is runnable?
+        hbtoolcmd = $$hbNativePath($$sprintf("%1%2", $$HB_SOURCE_DIR/bin/$$1, "_symbian.exe"))
+        system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+    }
     # fall back to <builddir>/bin
     return($$hbNativePath($$HB_BUILD_DIR/bin/$$1))
 }
+
+# params: <file> <dir>
+defineReplace(hbCopyCommand) {
+    file = $$hbNativePath($$1)
+    dir = $$hbNativePath($$2)
+
+    contains(QMAKE_HOST.os, Windows):isEmpty(QMAKE_SH) {
+        chk_dir_exists = if not exist $$dir
+        mkdir = mkdir $$dir
+        copy = copy /y $$file $$dir
+    } else {
+        chk_dir_exists = test -d $$dir
+        mkdir = mkdir -p $$dir
+        copy = cp $$file $$dir
+    }
+
+    hbUnixStyle(): chk_dir_exists_mkdir = $$chk_dir_exists || $$mkdir
+    else:chk_dir_exists_mkdir = $$chk_dir_exists $$mkdir
+
+    return(($$chk_dir_exists_mkdir) && $$copy)
+}

--- a/src/astyle.pri	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#############################################################################
-##
-## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (developer.feedback@nokia.com)
-##
-## This file is part of the UI Extensions for Mobile.
-##
-## GNU Lesser General Public License Usage
-## This file may be used under the terms of the GNU Lesser General Public
-## License version 2.1 as published by the Free Software Foundation and
-## appearing in the file LICENSE.LGPL included in the packaging of this file.
-## Please review the following information to ensure the GNU Lesser General
-## Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights.  These rights are described in the Nokia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at developer.feedback@nokia.com.
-##
-#############################################################################
-#
-
-root {
-
-    style.CONFIG = recursive
-    style.recurse = src
-    style.recurse_target = astyle
-    QMAKE_EXTRA_TARGETS += style
-
-} else:contains(TEMPLATE, .*subdirs$) {
-
-    astyle.CONFIG += recursive
-    QMAKE_EXTRA_TARGETS += astyle
-
-} else {
-
-    astyle.params += --pad=oper
-    astyle.params += --unpad=paren
-    astyle.params += --convert-tabs
-    astyle.params += --brackets=linux
-    astyle.params += --break-blocks=all
-    astyle.params += --indent-namespaces
-    astyle.commands = astyle $$astyle.params $$HEADERS $$SOURCES
-    QMAKE_EXTRA_TARGETS += astyle
-
-}

--- a/src/coverage.pri	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/coverage.pri	Thu Jul 22 16:36:53 2010 +0100
@@ -58,7 +58,7 @@
         }
 
         measure_coverage.depends = pre_coverage
-        unix:measure_coverage.depends = test
+        unix:measure_coverage.depends = unittest
         post_coverage.depends = measure_coverage
         coverage.depends = post_coverage
         QMAKE_EXTRA_TARGETS *= coverage pre_coverage measure_coverage post_coverage

--- a/src/flint.pri	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-#############################################################################
-##
-## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (developer.feedback@nokia.com)
-##
-## This file is part of the UI Extensions for Mobile.
-##
-## GNU Lesser General Public License Usage
-## This file may be used under the terms of the GNU Lesser General Public
-## License version 2.1 as published by the Free Software Foundation and
-## appearing in the file LICENSE.LGPL included in the packaging of this file.
-## Please review the following information to ensure the GNU Lesser General
-## Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights.  These rights are described in the Nokia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at developer.feedback@nokia.com.
-##
-#############################################################################
-#
-
-root {
-
-    flint.CONFIG = recursive
-    flint.recurse = src
-
-} else:contains(TEMPLATE, .*subdirs$) {
-
-    flint.CONFIG += recursive
-
-} else {
-
-    unix:flint.commands += $(FLINT_BIN) `echo $(DEFINES) | sed s/-D/-d/g` `echo $(INCPATH) | sed s/-I/-i/g` \
-                           $(FLINT_INDIRECTS) $$SOURCES 2>&1 > $${HB_BUILD_DIR}/\$(QMAKE_TARGET).txt
-
-}
-
-QMAKE_EXTRA_TARGETS += flint

--- a/src/hbapps/hbapps.pro	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbapps/hbapps.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -28,10 +28,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += hbthemechanger
-
-symbian {
-    SUBDIRS += hbiconpreloader
-}
+#SUBDIRS += hbfeatureconfigapp
 
 include($${HB_SOURCE_DIR}/src/hbcommon.pri)
 

--- a/src/hbapps/hbiconpreloader/hbiconpreloader.pro	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-SOURCES += main.cpp
-
-symbian {
-    TARGET.CAPABILITY = CAP_APPLICATION
-    TARGET.EPOCALLOWDLLDATA = 1
-    
-    LIBS += -lcone
-    LIBS += -lavkon
-    LIBS += -leikcore
-
-    myrssrules = \
-     "hidden = KAppIsHidden;" \
-     "launch = KAppLaunchInBackground;"
-    
-    RSS_RULES += myrssrules
-}
-
-hbAddLibrary(hbcore/HbCore)
-hbAddLibrary(hbwidgets/HbWidgets)
-hbAddLibrary(hbutils/HbUtils)

--- a/src/hbapps/hbiconpreloader/main.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbApps module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <hbapplication.h>
-#include <hbmainwindow.h>
-#include <QMainWindow>
-#include <QDebug>
-
-#ifdef Q_OS_SYMBIAN
-#include <coemain.h>
-#endif
-
-/*
-* This application exists temporarily to preload some time-consuming graphics
-* when theme server is started in order to simulate the real scenario where
-* such graphics get loaded in the boot when first app is shown.
-* It creates more realistic results for the performance tests.
-*/
-int main(int argc, char *argv[])
-{
-    HbApplication app(argc, argv, Hb::NoSplash);
-    // Create a mainwindow so its graphics get cached and next app startup is faster
-    HbMainWindow window;
-    window.show();
-    
-    qDebug() << "HB: HbIconPreloader started";
-    
-    // Render the window in a pixmap painter, it does not get drawn and icons do not get loaded
-    // otherwise because the application runs in background.
-    QImage image(1, 1, QImage::Format_ARGB32);
-    QPainter painter(&image);
-
-    window.render(&painter);
-
-#ifdef Q_OS_SYMBIAN
-    // To avoid crash in app exit
-    CCoeEnv::Static()->DisableExitChecks(true);
-#endif
-
-    QApplication::processEvents(); // to prevent mysterious deadlocks when destroying the mainwindow
-
-    // Exit the application
-    return 0;
-}

--- a/src/hbapps/hbthemechanger/hbthemechanger.pro	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbapps/hbthemechanger/hbthemechanger.pro	Thu Jul 22 16:36:53 2010 +0100
@@ -30,26 +30,33 @@
 QT += network
 DEFINES += HB_RESOURCES_DIR=\"\\\"$${HB_RESOURCES_DIR}\\\"\"
 
+CONFIG += hb
+
 # directories
 DESTDIR = $${HB_BUILD_DIR}/bin
 
 # dependencies
 hbAddLibrary(hbcore/HbCore)
 hbAddLibrary(hbwidgets/HbWidgets)
+hbAddLibrary(hbutils/HbUtils)
 
 # Input
 HEADERS += themechangerdefs.h
 HEADERS += themeselectionlist.h
+HEADERS += settingsview.h
+HEADERS += resourceview.h
 SOURCES += themeselectionlist.cpp
 SOURCES += themechangermain.cpp
+SOURCES += settingsview.cpp
+SOURCES += resourceview.cpp
 
 symbian {
     TARGET.CAPABILITY += WriteDeviceData
-    HEADERS += themeclientsymbian.h
-    SOURCES += themeclientsymbian.cpp
-} else {
-    HEADERS += themeclientqt.h
-    SOURCES += themeclientqt.cpp
+    SKINICON = qtg_large_personalization
+    
+    myrssrules = \
+    "hidden = KAppIsHidden;"
+    RSS_RULES += myrssrules
 }
 
 # installation

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/resourceview.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,304 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <hbtoolbar.h>
+#include <hbdataform.h>
+#include <hbdataformmodel.h>
+#include <hbdataformmodelitem.h>
+#include <QGraphicsLinearLayout>
+#include <hbthemeutils_p.h>
+#include <hbcombobox.h>
+#include <hbmessagebox.h>
+#include <hbiconitem.h>
+#include <hbthemeutils_p.h>
+#include <QDir>
+#include "resourceview.h"
+#include <hbsearchpanel.h>
+#include <hbtumbleview.h>
+#include <hblabel.h>
+#include <hbcolorscheme.h>
+#include <hbiconanimator.h>
+#include <hbiconanimationmanager.h>
+
+/**
+ * Constructor
+ */
+ResourceView::ResourceView(HbMainWindow *mainWindow, HbView* parent): HbView(parent)
+{
+    mMainWindow = mainWindow;
+    mParentView = parent;
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+
+    this->setTitle(tr("Resource lookup"));
+
+    HbAction *act = new HbAction(Hb::BackNaviAction);
+    connect(act, SIGNAL(triggered()), this, SLOT(close()));
+
+    this->setNavigationAction(act);
+
+    act = new HbAction(tr("Icons"));
+        connect(act, SIGNAL(triggered()), this, SLOT(iconModeSelected()));
+        this->toolBar()->addAction(act);
+
+    act = new HbAction(tr("Colors"));
+        connect(act, SIGNAL(triggered()), this, SLOT(colorModeSelected()));
+        this->toolBar()->addAction(act);
+
+    act = new HbAction(tr("Effects"));
+        connect(act, SIGNAL(triggered()), this, SLOT(effectModeSelected()));
+        this->toolBar()->addAction(act);
+
+    act = new HbAction(tr("Animations"));
+        connect(act, SIGNAL(triggered()), this, SLOT(animationModeSelected()));
+        this->toolBar()->addAction(act);
+
+
+    loadThemedIcons();
+    loadThemedColors();
+    loadThemedEffects();
+    loadThemedAnimations();
+    mAnimator = new HbIconAnimator();
+    mResourceItem = new HbLabel(this);
+    mResourceItem->setIcon(HbIcon(mThemedIcons.size()?mThemedIcons[0]:""));
+    mResourceItem->setAlignment(Qt::AlignCenter);
+    mResourceItem->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
+    mResourcesList = new HbTumbleView(mThemedIcons, this);
+
+    layout->addItem(mResourceItem);
+    layout->addItem(mResourcesList);
+
+    mSearchPanel = new HbSearchPanel(this);
+    mSearchPanel->setCancelEnabled(false);
+    mSearchPanel->setPlaceholderText(tr("Search"));
+    layout->addItem(mSearchPanel);
+    this->setLayout(layout);
+
+    connect(mSearchPanel, SIGNAL(criteriaChanged(const QString &)), this, SLOT(criteriaChanged(const QString &)));
+    connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(iconItemSelected(int)));
+    mMode = iconMode;
+
+    mMainWindow->addView(this);
+}
+
+/**
+ * Destructor
+ */
+ResourceView::~ResourceView()
+{
+    delete mAnimator;
+}
+
+void ResourceView::close()
+{
+    mMainWindow->setCurrentView(mParentView);
+}
+
+void ResourceView::toggleMode(ListMode mode)
+{
+    if (mode == mMode) {
+        return;
+    }
+
+    switch (mMode) {
+    case colorMode:
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(colorItemSelected(int)));
+        break;
+    case iconMode:
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(iconItemSelected(int)));
+        break;
+    case effectMode:
+        mResourcesList->setSelected(0);
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(effectItemSelected(int)));
+        break;
+    case animationMode:
+        mResourcesList->setSelected(0);
+        disconnect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(animationItemSelected(int)));
+        break;
+    default:
+        break;
+    }
+
+    mMode = mode;
+    switch (mode) {
+    case colorMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(colorItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    case iconMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(iconItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    case effectMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(effectItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    case animationMode:
+        connect(mResourcesList, SIGNAL(itemSelected(int)), this, SLOT(animationItemSelected(int)));
+        mSearchPanel->setCriteria("");
+        mResourcesList->setSelected(0);
+        break;
+    default:
+        break;
+    }
+}
+
+void ResourceView::loadThemedIcons()
+{
+    mThemedIcons.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    QDir scalableIconsDir(basetheme + "/scalable");
+    QDir pixmapIconsDir(basetheme + "/pixmap");
+    QFileInfoList files = scalableIconsDir.entryInfoList(QDir::Files);
+    files += pixmapIconsDir.entryInfoList(QDir::Files);
+    // Strip the file extensions
+    for (int i=0;i<files.count();i++) {
+       mThemedIcons += files[i].baseName();
+    }
+}
+
+void ResourceView::loadThemedEffects()
+{
+    mThemedEffects.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    basetheme = basetheme.replace("/icons/", "/effects/");
+    QDir effectsDir(basetheme);
+    QFileInfoList files = effectsDir.entryInfoList(QDir::Files);
+    // Strip the file extensions
+    for (int i=0;i<files.count();i++) {
+       mThemedEffects += files[i].baseName();
+    }
+}
+
+void ResourceView::loadThemedAnimations()
+{
+    mThemedAnimations.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    basetheme = basetheme.replace("/icons/", "/animations/");
+    QDir animationsDir(basetheme);
+    QFileInfoList files = animationsDir.entryInfoList(QDir::Files);
+    // Add animation definitions and strip the file extensions
+    for (int i=0;i<files.count();i++) {
+       HbIconAnimationManager::global()->addDefinitionFile(files[i].fileName());
+       mThemedAnimations += files[i].baseName();
+    }
+}
+
+void ResourceView::loadThemedColors()
+{
+    mThemedColors.clear();
+    QString basetheme = HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting);
+    basetheme = basetheme.replace("/icons/", "/style/");
+    QFile file(basetheme + "/variables/color/hbcolorgroup.css");
+
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QTextStream in(&file);
+
+        while(!in.atEnd()) {
+            QString line = in.readLine().trimmed();
+            if (line.startsWith("qtc_")) {
+                // Extract logical name
+                mThemedColors += line.mid(0, line.indexOf(':')).trimmed();
+            }
+        }
+        file.close();
+    }
+}
+
+void ResourceView::iconModeSelected()
+{
+    toggleMode(iconMode);
+}
+
+void ResourceView::colorModeSelected()
+{
+    toggleMode(colorMode);
+}
+
+void ResourceView::effectModeSelected()
+{
+    toggleMode(effectMode);
+}
+
+void ResourceView::animationModeSelected()
+{
+    toggleMode(animationMode);
+}
+
+
+void ResourceView::iconItemSelected(int index)
+{
+    mResourceItem->setIcon(HbIcon(mResourcesList->items()[index]));
+}
+
+void ResourceView::animationItemSelected(int index)
+{
+    mResourceItem->setIcon(HbIcon(mResourcesList->items()[index]));
+    mAnimator->setIcon(mResourceItem->icon());
+    mAnimator->startAnimation();
+}
+
+
+void ResourceView::colorItemSelected(int index)
+{
+    QString rgbValue("#");
+    rgbValue += QString::number(HbColorScheme::color(mResourcesList->items()[index]).red(), 16);
+    rgbValue += QString::number(HbColorScheme::color(mResourcesList->items()[index]).green(), 16);
+    rgbValue += QString::number(HbColorScheme::color(mResourcesList->items()[index]).blue(), 16);
+    mResourceItem->setPlainText(rgbValue.toUpper());
+}
+
+void ResourceView::effectItemSelected(int index)
+{
+    HbEffect::add(mResourceItem,mResourcesList->items()[index],"selected");
+    HbEffect::start(mResourceItem,"selected");
+}
+
+
+void ResourceView::criteriaChanged(const QString &criteria)
+{
+    QStringList filteredItems;
+    switch (mMode) {
+    case iconMode:
+        filteredItems = mThemedIcons.filter(criteria.toLower());
+        break;
+    case colorMode:
+        filteredItems = mThemedColors.filter(criteria.toLower());
+        break;
+    case effectMode:
+        filteredItems = mThemedEffects.filter(criteria.toLower());
+        break;
+    case animationMode:
+        filteredItems = mThemedAnimations.filter(criteria.toLower());
+        break;
+    default:
+        break;
+    }
+    mResourcesList->setItems(filteredItems);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/resourceview.h	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+#ifndef RESOURCEVIEW_H
+#define RESOURCEVIEW_H
+
+#include <hbview.h>
+
+class HbMainWindow;
+class HbDataForm;
+class HbDataFormModelItem;
+class HbIconItem;
+class HbTumbleView;
+class HbSearchPanel;
+class HbLabel;
+class HbIconAnimator;
+
+class ResourceView : public HbView
+{
+Q_OBJECT
+public:
+    ResourceView(HbMainWindow *mainWindow, HbView* parent=0);
+    ~ResourceView();
+
+    enum ListMode {
+        iconMode,
+        colorMode,
+        effectMode,
+        animationMode
+    };
+
+public slots:
+    void close();
+    void iconModeSelected();
+    void colorModeSelected();
+    void effectModeSelected();
+    void animationModeSelected();
+    void iconItemSelected(int index);
+    void colorItemSelected(int index);
+    void effectItemSelected(int index);
+    void animationItemSelected(int index);
+    void criteriaChanged(const QString &criteria);
+private:
+    HbMainWindow *mMainWindow;
+    HbView *mParentView;
+
+    QStringList mThemedIcons;
+    QStringList mThemedColors;
+    QStringList mThemedEffects;
+    QStringList mThemedAnimations;
+    HbLabel *mResourceItem;
+    HbTumbleView *mResourcesList;
+    HbSearchPanel *mSearchPanel;
+    HbIconAnimator *mAnimator;
+
+    ListMode mMode;
+    void loadThemedIcons();
+    void loadThemedColors();    
+    void loadThemedEffects();
+    void loadThemedAnimations();
+    void toggleMode(ListMode mode);
+};
+
+
+#endif // RESOURCEVIEW_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/settingsview.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <hbtoolbar.h>
+#include <hbdataform.h>
+#include <hbdataformmodel.h>
+#include <hbdataformmodelitem.h>
+#include <QGraphicsLinearLayout>
+#include <hbthemeutils_p.h>
+#include <hbcombobox.h>
+#include <hbmessagebox.h>
+#include "settingsview.h"
+
+/**
+ * Constructor
+ */
+SettingsView::SettingsView(const QStringList &themes, HbMainWindow *mainWindow, HbView* parent): HbView(parent),
+                                                                                                 mThemes(themes)
+{
+    mMainWindow = mainWindow;
+    mParentView = parent;
+
+    for(int i=0;i<mThemes.count();i++) {
+        mThemeUiNames += QDir(mThemes[i]).dirName();
+    }
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+
+    this->setTitle(tr("Settings"));
+
+    mDataForm = new HbDataForm(this);
+    HbDataFormModel *model = new HbDataFormModel(this);
+
+    mBaseThemeSetting = model->appendDataFormItem(HbDataFormModelItem::RadioButtonListItem, tr("Base Theme"));
+    mDefaultThemeSetting = model->appendDataFormItem(HbDataFormModelItem::RadioButtonListItem, tr("Default Theme"));
+    mPriorityThemeSetting = model->appendDataFormItem(HbDataFormModelItem::TextItem, tr("Priority Theme"));
+    mDataForm->setModel(model);
+
+    loadSettings();
+
+    layout->addItem(mDataForm);
+
+    HbAction *act = new HbAction(tr("Save"));
+    connect(act, SIGNAL(triggered()), this, SLOT(saveSettings()));
+    this->toolBar()->addAction(act);
+    act = new HbAction(tr("Cancel"));
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    this->toolBar()->addAction(act);
+    act = new HbAction(Hb::BackNaviAction);
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    this->setNavigationAction(act);
+
+    this->setLayout(layout);
+
+    mMainWindow->addView(this);
+}
+
+/**
+ * Destructor
+ */
+SettingsView::~SettingsView()
+{
+    delete mDataForm;
+}
+
+void SettingsView::loadSettings()
+{
+    mBaseThemeSetting->setContentWidgetData("items",mThemeUiNames);
+    mBaseThemeSetting->setContentWidgetData("selected", mThemes.indexOf(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting)));
+    mDefaultThemeSetting->setContentWidgetData("items",mThemeUiNames);
+    mDefaultThemeSetting->setContentWidgetData("selected", mThemes.indexOf(HbThemeUtils::getThemeSetting(HbThemeUtils::DefaultThemeSetting)));
+    mPriorityThemeSetting->setContentWidgetData("text",HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting));
+}
+
+void SettingsView::saveSettings()
+{
+    HbThemeUtils::setThemeSetting(HbThemeUtils::BaseThemeSetting, mThemes[mBaseThemeSetting->contentWidgetData("selected").toInt()]);
+    HbThemeUtils::setThemeSetting(HbThemeUtils::DefaultThemeSetting, mThemes[mDefaultThemeSetting->contentWidgetData("selected").toInt()]);
+    HbThemeUtils::setThemeSetting(HbThemeUtils::OperatorNameSetting, mPriorityThemeSetting->contentWidgetData("text").toString());
+    loadSettings();
+#ifdef Q_OS_SYMBIAN
+    HbMessageBox::information(tr("Please reboot the device to apply the changes."));
+#else
+    HbMessageBox::information(tr("Please restart the Hb application to apply the changes."));
+#endif
+    mMainWindow->setCurrentView(mParentView);
+}
+
+void SettingsView::cancel()
+{
+    loadSettings();
+    mMainWindow->setCurrentView(mParentView);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/settingsview.h	Thu Jul 22 16:36:53 2010 +0100
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbApps module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+#ifndef SETTINGSVIEW_H
+#define SETTINGSVIEW_H
+
+#include <hbview.h>
+
+class HbMainWindow;
+class HbDataForm;
+class HbDataFormModelItem;
+
+class SettingsView : public HbView
+{
+Q_OBJECT
+public:
+    SettingsView(const QStringList &themes, HbMainWindow *mainWindow, HbView* parent=0);
+    ~SettingsView();
+
+public slots:
+    void saveSettings();
+    void cancel();
+private:
+    const QStringList &mThemes;
+    QStringList mThemeUiNames;
+    HbMainWindow *mMainWindow;
+    HbView *mParentView;
+    HbDataForm *mDataForm;
+    HbDataFormModelItem *mBaseThemeSetting;
+    HbDataFormModelItem *mDefaultThemeSetting;
+    HbDataFormModelItem *mPriorityThemeSetting;
+
+    void loadSettings();
+};
+
+
+#endif // SETTINGSVIEW_H

--- a/src/hbapps/hbthemechanger/themechangermain.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbapps/hbthemechanger/themechangermain.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -28,11 +28,6 @@
 #include "themechangerdefs.h"
 #include "themeselectionlist.h"
 #include <QTextStream>
-#ifdef Q_OS_SYMBIAN
-#include "themeclientsymbian.h"
-#else
-#include "themeclientqt.h"
-#endif
 
 #ifdef THEME_CHANGER_TIMER_LOG
 void debugOutput(QtMsgType type, const char *msg)
@@ -70,15 +65,8 @@
     // Includes decorators such as signal strength and battery life indicator.
     HbMainWindow mainWindow;
     
-#ifdef Q_OS_SYMBIAN
-    ThemeClientSymbian* client = new ThemeClientSymbian();
-#else
-    // Create the theme server that does the notifiation to all the QT apps
-    ThemeClientQt* client = new ThemeClientQt();
-#endif
-
     // Show the list of themes available
-    ThemeSelectionList *themelist=new ThemeSelectionList(client);
+    ThemeSelectionList *themelist=new ThemeSelectionList(&mainWindow);
     themelist->displayThemes();
     
     mainWindow.addView( themelist );

--- a/src/hbapps/hbthemechanger/themeclientqt.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbApps module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#include <QLocalSocket>
-#include <QDebug>
-#include <hbinstance.h>
-
-#include "themeclientqt.h"
-#include "themechangerdefs.h"
-#include "hbthemecommon_p.h"
-
-/**
- * Constructor
- */
-ThemeClientQt::ThemeClientQt()
-{
-#ifdef THEME_CHANGER_TRACES
-    qDebug() << Q_FUNC_INFO;
-#endif
-    localSocket = new QLocalSocket();
-    connected = false;
-}
-
-bool ThemeClientQt::connectToServer()
-{
-    localSocket->connectToServer(THEME_SERVER_NAME);
-    bool success = localSocket->waitForConnected(3000);
-#ifdef THEME_CHANGER_TRACES
-    qDebug() << "ThemeClientQt:: Socket Connect status: " <<success;
-#endif
-    connected = success;
-    return success;
-}
-
-/**
- * Destructor
- */
-ThemeClientQt::~ThemeClientQt()
-{
-    if (connected) {
-        localSocket->disconnectFromServer();
-    }
-    delete localSocket;
-}
-
-/**
- * changeTheme
- */
-void ThemeClientQt::changeTheme(const QString &newtheme)
-{
-#ifdef THEME_CHANGER_TRACES
-    qDebug() <<"ThemeClientQt::changeTheme("<<newtheme<<") called";
-#endif
-    if( (themeName==newtheme) || (newtheme =="") ) {
-#ifdef THEME_CHANGER_TRACES
-        qDebug() <<"ThemeClientQt:: return Sametheme applied";
-#endif
-        return;
-    }
-    QByteArray outputByteArray;
-    QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
-    HbThemeServerRequest requestType = EThemeSelection;
-    outputDataStream << (int)requestType;
-    outputDataStream << newtheme;
-    themeName = newtheme;
-    localSocket->write(outputByteArray);
-#ifdef THEME_CHANGER_TRACES
-    qDebug()<<"ThemeClientQt::ThemeName written to server";
-#endif
-    localSocket->flush();
-}
-
-
-/**
- * isConnected
- */
-bool ThemeClientQt::isConnected()
-{
-    return connected;
-}

--- a/src/hbapps/hbthemechanger/themeclientqt.h	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbApps module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#ifndef THEMECLIENTQT_H
-#define THEMECLIENTQT_H
-
-#include <QObject>
-#include <QString>
-
-class QLocalSocket;
-
-class ThemeClientQt : public QObject
-{
-
-    Q_OBJECT
-
-public:
-    ThemeClientQt();
-    bool connectToServer();
-    bool isConnected();
-    ~ThemeClientQt();
-
-public slots:
-    void changeTheme(const QString &newtheme);
-
-private:
-    QLocalSocket* localSocket;
-    QString themeName;
-    bool connected;
-};
-
-
-#endif // THEMECLIENTQT_H

--- a/src/hbapps/hbthemechanger/themeclientsymbian.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbApps module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "themeclientsymbian.h"
-#include <e32property.h>
-#include <QDebug>
-
-
-const TUint kDefaultMessageSlots=4;
-
-
-/**
- * Constructor
- */
-ThemeClientSymbian::ThemeClientSymbian(): connected(false)
-{
-}
-
-
-/**
- * Connects to the  server using 4 message slots.
- */
-bool ThemeClientSymbian::connectToServer()
-{
-    qDebug() << "HbSymbianThemeClient::Connect ++";
-
-    TInt error = CreateSession(KThemeServerName,Version(),kDefaultMessageSlots);
-
-    if (KErrNone != error) {
-        qDebug() << "ThemeClientSymbian:: could not create session" << error;
-    }
-    connected = (KErrNone == error);
-    return (KErrNone == error); 
-}
-
-
-/**
- * Returns the earliest version number of the server that we can tal to.
- */  
-TVersion ThemeClientSymbian::Version(void) const
-{
-    return(TVersion(KThemeServerMajorVersionNumber,KThemeServerMinorVersionNumber,KThemeServerBuildVersionNumber));
-}
-
-
-/**
- * Closing the server and tidying up.
- */
-void ThemeClientSymbian::Close()
-{
-    RSessionBase::Close();
-}
-
-/**
- * changeTheme
- */
-TInt ThemeClientSymbian::changeTheme(const QString& aString )
-{
-    TInt err = KErrGeneral;
-    RProperty themeRequestProp;
-    
-    User::LeaveIfError( themeRequestProp.Attach( KServerUid3, KNewThemeForThemeChanger ) );
-    
-    TBuf<256> newThemenameChangeRequest;
-    _LIT(KThemeRequestFormatter, "%d:%S");
-    TBuf<256> newThemename(aString.utf16());
-    newThemenameChangeRequest.Format( KThemeRequestFormatter, EThemeSelection, &newThemename);
-    err = themeRequestProp.Set(newThemenameChangeRequest);
-    themeRequestProp.Close();
-    return err;
-}
-
-bool ThemeClientSymbian::isConnected()
-{
-    return connected;
-}

--- a/src/hbapps/hbthemechanger/themeclientsymbian.h	Thu Jul 15 14:03:49 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbApps module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef THEMECLIENTSYMBIAN_H
-#define THEMECLIENTSYMBIAN_H
-
-#include <QString>
-#include <e32base.h>
-#include "hbthemecommon_symbian_p.h"
-#include "hbthemecommon_p.h"
-
-class ThemeClientSymbian : public RSessionBase
-{
-public:
-    ThemeClientSymbian();
-    bool connectToServer();
-    TVersion Version() const;
-    TInt changeTheme(const QString& aString);
-    void Close();
-	bool isConnected();
-	bool connected;
-};
-
-#endif /* THEMECLIENTSYMBIAN_H */

--- a/src/hbapps/hbthemechanger/themeselectionlist.cpp	Thu Jul 15 14:03:49 2010 +0100
+++ b/src/hbapps/hbthemechanger/themeselectionlist.cpp	Thu Jul 22 16:36:53 2010 +0100
@@ -31,30 +31,110 @@
 #include <hbaction.h>
 #include <hbicon.h>
 #include <hblistwidgetitem.h>
+#include <restricted/hbthemeservices_r.h>
+#include <hblabel.h>
+#include <hbiconitem.h>
+#include <hbtoolbar.h>
 #include <QDebug>
 #include <QTime>
 #include <QThread>
+#include <QGesture>
+#include <QGraphicsLinearLayout>
 
 #include "themeselectionlist.h"
 #include "themechangerdefs.h"
+#include "settingsview.h"
+#include "resourceview.h"
+
+class PreviewView : public HbView
+{
+public:
+
+    PreviewView(const QString &name, const QString &theme, QGraphicsItem* parent=0):
+       HbView(parent), preview(0), themePath(theme)
+    {
+        QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
+        HbLabel *label = new HbLabel(tr("Apply theme %1?").arg(name));
+        label->setFontSpec(HbFontSpec(HbFontSpec::Primary));
+        label->setElideMode(Qt::ElideNone);
+        layout->addItem(label);
+        QString previewPath("");
+        if (HbDeviceProfile::profile(this).orientation() == Qt::Horizontal) {
+            previewPath = themePath + "/scalable/qtg_graf_theme_preview_lsc.";
+        } else {
+            previewPath = themePath + "/scalable/qtg_graf_theme_preview_prt.";
+        }
+        QString nvgPreview(previewPath + "nvg");
+        QString svgPreview(previewPath + "svg");
+        
+        if (QFile::exists(nvgPreview)) {
+            previewPath = nvgPreview;
+        } else if (QFile::exists(svgPreview)) {
+            previewPath = svgPreview;
+        } else {
+            previewPath = "qtg_large_corrupted";
+        }
+        preview = new HbIconItem(previewPath);
+        preview->setAspectRatioMode(Qt::KeepAspectRatio);
+        QSize s = HbDeviceProfile::profile(this).logicalSize();
+        preview->setPreferredSize(s);
+        layout->addItem(preview);
+        this->setLayout(layout);
+    }
+
+    ~PreviewView()
+    {
+        delete preview;
+    }
+
+    void resizeEvent(QGraphicsSceneResizeEvent *event)
+    {
+        Q_UNUSED(event);
+        if (preview) {
+            QString previewPath("");
+            if (HbDeviceProfile::profile(this).orientation() == Qt::Horizontal) {
+                previewPath = themePath + "/scalable/qtg_graf_theme_preview_lsc.";
+            } else {
+                previewPath = themePath + "/scalable/qtg_graf_theme_preview_prt.";
+            }
+            QString nvgPreview(previewPath + "nvg");
+            QString svgPreview(previewPath + "svg");
+            
+            if (QFile::exists(nvgPreview)) {
+                previewPath = nvgPreview;
+            } else if (QFile::exists(svgPreview)) {
+                previewPath = svgPreview;
+            } else {
+                previewPath = "qtg_large_corrupted";
+            }
+
+            preview->setIconName(previewPath);
+            preview->setAspectRatioMode(Qt::KeepAspectRatio);
+            QSize s = HbDeviceProfile::profile(this).logicalSize();
+            preview->setPreferredSize(s);
+        }
+    }
+private:
+    HbIconItem *preview;
+    QString themePath;
+};
 
 /**
  * Constructor
  */
-ThemeSelectionList::ThemeSelectionList(
-#ifdef Q_OS_SYMBIAN
-    ThemeClientSymbian* client
-#else
-    ThemeClientQt* client
-#endif
-                        ): 
-                        oldItemIndex(-1),
+ThemeSelectionList::ThemeSelectionList(HbMainWindow *mainWindow):
                         themelist(new HbListWidget(this)),
                         rightMark(new HbIcon(QString("qtg_small_tick"))),
                         noMark(new HbIcon(QString(""))),
-                        client(client)
+                        previewView(0),
+                        settingsView(0),
+                        resourceView(0)
 {
+    mMainWindow = mainWindow;
     connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
+    connect(themelist, SIGNAL(longPressed(HbListWidgetItem*, QPointF)),
+            this, SLOT(onLongPressed(HbListWidgetItem*, QPointF)));
+
     setWidget(themelist);
 
     // Automatic updation of the themelist when some theme is installed or uninstalled
@@ -66,11 +146,20 @@
         }
     }
     connect(watcher,SIGNAL(directoryChanged(const QString &)),this,SLOT(updateThemeList(const QString &)));
-    QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));    
+    QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));
+    grabGesture(Qt::TapAndHoldGesture);
+
+    HbAction *a = this->toolBar()->addAction(HbIcon("qtg_mono_settings"),tr("Settings"));
+    connect(a, SIGNAL(triggered()), this, SLOT(showSettingsView()));
+
+    a = this->toolBar()->addAction(HbIcon("qtg_mono_search"),tr("Resources"));
+    connect(a, SIGNAL(triggered()), this, SLOT(showResourceView()));
+
+    connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
+
 #ifdef THEME_CHANGER_TIMER_LOG
     idleTimer = new QTimer(this);
     connect(idleTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle()));
-    connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
     idleTimer->start(0); // to make a connection to server
 #endif
 }
@@ -81,9 +170,7 @@
 ThemeSelectionList::~ThemeSelectionList()
 {
     // Set the theme to the applied theme before exiting.
-    setChosen(themelist->item(oldItemIndex));
     delete noMark;
-
     noMark=NULL;
     delete rightMark;
     rightMark=NULL;
@@ -92,6 +179,10 @@
     themelist->reset();
     delete themelist;
     themelist=NULL;
+    
+    // Delete preview thubnails
+    qDeleteAll(thumbnails);
+    thumbnails.clear();
 }
 
 
@@ -100,6 +191,7 @@
  */
 void ThemeSelectionList::displayThemes()
 {
+    rootThemes.clear();
     bool entryAdded = false;
     bool themePresent = false;
     foreach(const QString &KThemeRootPath, rootPaths()){
@@ -112,15 +204,23 @@
             QStringList iconthemeslist=dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
             foreach(QString themefolder, iconthemeslist) {
                 QDir iconThemePath(root.path()+"/themes/icons/"+themefolder);
-                if(iconThemePath.exists("index.theme")) {
+                QFile themeIndexFile(root.path()+"/themes/"+themefolder+".themeindex");
+                if(themeIndexFile.exists() && iconThemePath.exists("index.theme")) {
                     QSettings iniSetting(iconThemePath.path()+"/index.theme",QSettings::IniFormat);
                     iniSetting.beginGroup("Icon Theme");
                     QString hidden = iniSetting.value("Hidden").toString();
-                    QString name = iniSetting.value("Name").toString();
                     iniSetting.endGroup();
-                    if((hidden == "true") ||( hidden == "")||(name!=themefolder) ) {
+                    if((hidden == "true") ||( hidden == "")) {
                         iconthemeslist.removeOne(themefolder);
                     }
+#ifdef Q_OS_SYMBIAN
+                    if (KThemeRootPath[0] == 'z') {
+#endif
+                    rootThemes.append(iconThemePath.absolutePath());
+#ifdef Q_OS_SYMBIAN
+                }
+#endif
+
                 }
                 else {
                      iconthemeslist.removeOne(themefolder);
@@ -128,42 +228,89 @@
             
             }
             if(!entryAdded){
-                iconthemeslist.insert(0,"hbdefault"); //adding one default entry
+                rootThemes.append(":/themes/icons/hbdefault");
+                //adding one default entry
+                HbListWidgetItem *item = new HbListWidgetItem();
+                item->setText("hbdefault");
+                item->setSecondaryText(":/themes/icons/hbdefault");
+                QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");                    
+                if (!QFile::exists(thumbPath)) {
+                    thumbPath = "qtg_large_corrupted";
+                }
+                HbIcon *icon = new HbIcon(thumbPath);
+                thumbnails.append(icon);
+                item->setIcon(*icon);                                
+                if (HbInstance::instance()->theme()->name() == "hbdefault") {
+                    item->setSecondaryIcon(*rightMark);
+                    themelist->addItem(item);                
+                    themelist->setCurrentRow(themelist->count()-1);
+                } else {
+                    item->setSecondaryIcon(*noMark);
+                    themelist->addItem(item);                
+                }
                 entryAdded = true;
             }
             list=iconthemeslist;
             for (int i=0; i <list.count();i++) {
                 // populate theme list with existing themes
-                if((HbInstance::instance()->theme()->name())==(list.at(i))) { 
-                    themelist->addItem(*rightMark,list.at(i));
-                    oldItemIndex=themelist->count()-1;
-                    themelist->setCurrentRow(oldItemIndex);
+                HbListWidgetItem *item = new HbListWidgetItem();
+
+                QSettings iniSetting(root.path()+"/themes/icons/"+list.at(i)+"/index.theme",QSettings::IniFormat);
+                iniSetting.beginGroup("Icon Theme");
+                QString name = iniSetting.value("Name").toString();
+                iniSetting.endGroup();
+                item->setText(name);
+
+                item->setSecondaryText(root.path()+"/themes/icons/"+list.at(i));
+                QString thumbPath(root.path()+"/themes/icons/"+list.at(i)+"/scalable/qtg_graf_theme_preview_thumbnail.");
+                QString nvgPath(thumbPath + "nvg");
+                QString svgPath(thumbPath + "svg");
+                if (QFile::exists(nvgPath)) {
+                    thumbPath = nvgPath;
+                } else if (QFile::exists(svgPath)) {
+                    thumbPath = svgPath;
                 }
                 else {
-                    themelist->addItem(*noMark,list.at(i));
+                    thumbPath = "qtg_large_corrupted";
+                }
+                HbIcon *icon = new HbIcon(thumbPath);
+                thumbnails.append(icon);
+                item->setIcon(*icon);
+                
+                
+                if (QFileInfo(HbThemeServices::themePath()) == QFileInfo(item->secondaryText())) {
+                    item->setSecondaryIcon(*rightMark);
+                    themelist->addItem(item);
+                    themelist->setCurrentRow(themelist->count()-1);
+                }
+                else {
+                    item->setSecondaryIcon(*noMark);
+                    themelist->addItem(item);
                 }
             }
         }
     }
     //    else{//add a case for no theme ,make hbdefault entry
     if(!themePresent) {
-            QStringList defaultList;
-            defaultList.insert(0,"hbdefault"); //adding one default entry
-            themelist->addItem(*rightMark,defaultList.at(0));
+            rootThemes.append(":/themes/icons/hbdefault");
+            //adding one default entry
+            HbListWidgetItem *item = new HbListWidgetItem();
+            item->setText("hbdefault");
+            item->setSecondaryText(":/themes/icons/hbdefault");
+            QString thumbPath(":/themes/icons/hbdefault/scalable/qtg_graf_theme_preview_thumbnail.svg");                    
+            if (!QFile::exists(thumbPath)) {
+                thumbPath = "qtg_large_corrupted";
+            }
+            HbIcon *icon = new HbIcon(thumbPath);
+            thumbnails.append(icon);
+            item->setIcon(*icon);            
+            item->setSecondaryIcon(*rightMark);
+            themelist->addItem(item);
             QString themeName=HbInstance::instance()->theme()->name();
             if (themeName != "hbdefault")
             {
-                if (!client->isConnected()) {
-                    bool success = client->connectToServer();
-                    if (success) {
-                        emit newThemeSelected("hbdefault");
-                    }
-                }
-                else {
-                    emit newThemeSelected("hbdefault");
-                }
+                emit newThemeSelected(":/themes/icons/hbdefault");
             }
-
         }
 }
 
@@ -172,66 +319,20 @@
  */
 void ThemeSelectionList::setChosen(HbListWidgetItem *item)
 {
-    QString str=item->text();
-
 #ifdef THEME_CHANGER_TRACES
-    qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
+    qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<item->secondaryText();
 #endif
-    if(iCurrentTheme != str ) {
+    if(iCurrentTheme != item->secondaryText()) {
 #ifdef THEME_CHANGER_TIMER_LOG
         timer.start();
-        qDebug() << "Selected theme: " << str;
+        qDebug() << "Selected theme: " << item->secondaryText();
 #endif
-        iCurrentTheme = str;
-        if (!client->isConnected()) {
-            bool success = client->connectToServer();
-            if (success) {
-                QThread::currentThread()->setPriority(QThread::HighPriority);
-                emit newThemeSelected(str);
-            }
-        }
-        else {
-            QThread::currentThread()->setPriority(QThread::HighPriority);
-            emit newThemeSelected(str); 
-        }
-    }
-    else
-    {
-        applySelection(); //double tap //put a tick
+        iCurrentTheme = item->secondaryText();
+        QThread::currentThread()->setPriority(QThread::HighPriority);
+        emit newThemeSelected(item->secondaryText());
     }
 }
 
-
-/**
- * applySelection
- */
-void ThemeSelectionList::applySelection()
-{
-    if(oldItemIndex!=themelist->currentRow()) {
-        themelist->setIcon(themelist->currentRow(),*rightMark);
-        if(oldItemIndex >= 0) {
-            themelist->setIcon(oldItemIndex,*noMark);
-        }
-        oldItemIndex = themelist->currentRow();
-    }
-}
-
-
-/**
- * event
- */
-bool ThemeSelectionList::event(QEvent *e)
-{
-    if((e->type()==QEvent::ShortcutOverride)||(e->type()==QEvent::WindowDeactivate)) {        
-        // save old applied theme
-        themelist->setCurrentRow(oldItemIndex);
-        themelist->setFocus();
-        setChosen(themelist->item(oldItemIndex));
-        return true;
-    }
-    return (HbView::event(e));
-}
-
 /**
  * updateThemeList
  */
@@ -248,7 +349,7 @@
  */
 void ThemeSelectionList::sendThemeName(const QString& name)
 {
-    client->changeTheme(name);
+    HbThemeServices::setTheme(name);
 }
 
 /**
@@ -258,8 +359,8 @@
 {
     QStringList rootDirs;
 #if defined(Q_OS_SYMBIAN)
-    rootDirs << "c:/resource/hb"
-             << "z:/resource/hb"
+    rootDirs << "z:/resource/hb"
+             << "c:/resource/hb"
              << "e:/resource/hb"
              << "f:/resource/hb";
 #else
@@ -275,19 +376,85 @@
     return rootDirs;
 }
 
+void ThemeSelectionList::onLongPressed(HbListWidgetItem* listViewItem, const QPointF& coords)
+{
+    Q_UNUSED(coords);
+    if (previewView) {
+        delete previewView;
+        previewView = 0;
+    }
+    previewItem = listViewItem;
+    QString theme = listViewItem->secondaryText();
+    previewView = new PreviewView(listViewItem->text(), theme, this);
+    mMainWindow->addView(previewView);
+
+    HbAction *act = new HbAction(tr("Ok"));
+    connect(act, SIGNAL(triggered()), this, SLOT(applyTheme()));
+    previewView->toolBar()->addAction(act);
+    act = new HbAction(tr("Cancel"));
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    previewView->toolBar()->addAction(act);
+    act = new HbAction(Hb::BackNaviAction);
+    connect(act, SIGNAL(triggered()), this, SLOT(cancel()));
+    previewView->setNavigationAction(act);
+
+    mMainWindow->setCurrentView(previewView);
+}
+
+void ThemeSelectionList::cancel()
+{
+    mMainWindow->setCurrentView(this);
+    mMainWindow->removeView(previewView);
+}
+
+void ThemeSelectionList::applyTheme()
+{
+    if (previewItem) {
+        setChosen(previewItem);
+    }
+    mMainWindow->setCurrentView(this);
+    mMainWindow->removeView(previewView);
+}
+
+void ThemeSelectionList::showSettingsView()
+{
+    if (!settingsView) {
+        settingsView = new SettingsView(rootThemes, mMainWindow, this);
+    }
+    mMainWindow->setCurrentView(settingsView);
+}
+
+void ThemeSelectionList::showResourceView()
+{
+    if (!resourceView) {
+        resourceView = new ResourceView(mMainWindow, this);
+    }
+    mMainWindow->setCurrentView(resourceView);
+}
+
+
+void ThemeSelectionList::themeChanged()
+{
+    QString currentTheme = HbThemeServices::themePath();
+    for (int i=0;i<themelist->count();i++) {
+        HbListWidgetItem *item = themelist->item(i);
+        if (item->secondaryText() == currentTheme) {
+            item->setSecondaryIcon(*rightMark);
+        } else {
+            item->setSecondaryIcon(*noMark);
+        }
+    }
+
+#ifdef THEME_CHANGER_TIMER_LOG
+    idleTimer->start(0);
+#endif //THEME_CHANGER_TIMER_LOG
+}
+
 #ifdef THEME_CHANGER_TIMER_LOG
 void ThemeSelectionList::processWhenIdle()
 {    
     qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
     idleTimer->stop();
     QThread::currentThread()->setPriority(QThread::NormalPriority);    
-    if (!client->isConnected()) {
-        client->connectToServer();
-    }
-}
-
-void ThemeSelectionList::themeChanged()
-{
-    idleTimer->start(0);
 }
 #endif //THEME_CHANGER_TIMER_LOG