diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 1b5f49bc2d..b1192ce5f7 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -87,7 +87,7 @@ symbian {
contains(MEEGO_EDITION,harmattan) {
target.path = /opt/PPSSPP/bin
assets.sources = ../assets/flash
- assets.path = /opt/PPSSPP/flash
+ assets.path = /home/user/MyDocs/PPSSPP
INSTALLS += target assets
}
diff --git a/README.md b/README.md
index 7b644667cf..10abe6ebc0 100644
--- a/README.md
+++ b/README.md
@@ -48,22 +48,23 @@ PPSSPPQt.pro in [Qt Creator 2.6+][qt-creator] and press run. The
Qt frontend currently supports Windows, Linux, Blackberry 10,
Symbian and Meego.
-Building for Linux/BSD/etc
+Building for Linux/BSD/Meego Harmattan/Pandora/etc
--------------------------
-Install the libsdl1.2 (SDL 1.2) development headers. This is called
-`libsdl1.2-dev` on Debian/Ubuntu, `SDL-devel` on Fedora/RHEL,
+Qt (recommended)
+A Qt-based frontend is available in the Qt/ dir.
+Open PPSSPPQt.pro with [Qt Creator 2.6+][qt-creator].
+Install libsdl1.2 if you want to use USB Gamepad.
+If the build has an error about finding mobility or multimedia:
+- Install the package "qtmobility-dev"
+
+SDL
+Alternatively, install the libsdl1.2 (SDL 1.2) development headers. This is called `libsdl1.2-dev` on Debian/Ubuntu, `SDL-devel` on Fedora/RHEL,
`sdl12` on BSD ports.
Currently the user interface is identical to Android's, operated
with the mouse.
-Alternatively, a Qt-based frontend is available in the Qt/ dir.
-Open PPSSPPQt.pro with Qt Creator.
-Install libsdl1.2 if you want to use USB Gamepad.
-If the build has an error about finding mobility or multimedia:
-- Install the package "qtmobility-dev"
-
Building for OSX
----------------
@@ -156,7 +157,7 @@ You will need to add the GCCE 4.6.3 variant to Symbian\tools\sbs\lib\config\vari
-Then simply compile the PPSSPPQt.pro with `qmake` from the SDK or [QtCreator 2.6+][qt-creator].
+Then simply compile the PPSSPPQt.pro with `qmake` from the SDK or the included QtCreator.
[ppsspp-repo]:
diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp
index 17046d3ee1..2d10223103 100644
--- a/UI/MenuScreens.cpp
+++ b/UI/MenuScreens.cpp
@@ -206,7 +206,7 @@ void MenuScreen::render() {
VGrid vgrid_recent(-xoff + 20, 100, 480, 40, 20);
if (UIButton(GEN_ID, vlinear, w, "Load...", ALIGN_RIGHT)) {
-#if defined(USING_QT_UI)
+#if defined(USING_QT_UI) && !defined(MEEGO_EDITION_HARMATTAN)
QString fileName = QFileDialog::getOpenFileName(NULL, "Load ROM", g_Config.currentDirectory.c_str(), "PSP ROMs (*.iso *.cso *.pbp *.elf)");
if (QFile::exists(fileName)) {
QDir newPath;
diff --git a/native b/native
index bd7bee5a11..5626d01e14 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit bd7bee5a11cd01ebf9f2e8445db7fedab7e3b295
+Subproject commit 5626d01e14eecd1fbd837cd8e1c6a5b9a2efc650