Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

1 files changed, 103 insertions, 0 deletions

diff --git a/src/corelib/io/qstandardpaths_blackberry.cpp b/src/corelib/io/qstandardpaths_blackberry.cpp
new file mode 100644
index 0000000000..b4c036dcc7
--- /dev/null
+++ b/src/corelib/io/qstandardpaths_blackberry.cpp
@@ -0,0 +1,103 @@
+/***************************************************************************
+**
+** Copyright (C) 2012 Research In Motion
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qstandardpaths.h"
+#include <qdir.h>
+
+#ifndef QT_NO_STANDARDPATHS
+
+QT_BEGIN_NAMESPACE
+
+QString QStandardPaths::writableLocation(StandardLocation type)
+{
+    QDir sharedDir = QDir::home();
+    sharedDir.cd(QLatin1String("../shared"));
+
+    const QString sharedRoot = sharedDir.absolutePath();
+
+    switch (type) {
+    case DataLocation:
+    case DesktopLocation:
+    case HomeLocation:
+        return QDir::homePath();
+    case RuntimeLocation:
+    case TempLocation:
+        return QDir::tempPath();
+    case CacheLocation:
+    case GenericCacheLocation:
+        return QDir::homePath() + QLatin1String("/Cache");
+    case ConfigLocation:
+        return QDir::homePath() + QLatin1String("/Settings");
+    case GenericDataLocation:
+        return sharedRoot + QLatin1String("/misc");
+    case DocumentsLocation:
+        return sharedRoot + QLatin1String("/documents");
+    case PicturesLocation:
+        return sharedRoot + QLatin1String("/photos");
+    case FontsLocation:
+        // this is not a writable location
+        return QString();
+    case MusicLocation:
+        return sharedRoot + QLatin1String("/music");
+    case MoviesLocation:
+        return sharedRoot + QLatin1String("/videos");
+    case DownloadLocation:
+        return sharedRoot + QLatin1String("/downloads");
+    case ApplicationsLocation:
+        return QString();
+    default:
+        break;
+    }
+
+    return QString();
+}
+
+QStringList QStandardPaths::standardLocations(StandardLocation type)
+{
+    if (type == FontsLocation)
+        return QStringList(QLatin1String("/base/usr/fonts"));
+
+    return QStringList(writableLocation(type));
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_STANDARDPATHS