From af1c3266175315779bd8f920e77d40a37ce25f40 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 20 Dec 2013 01:30:39 +1000
Subject: [PATCH] Qt: Remove renaming of 'lowmem' zim so that it can be loaded
 externally as well. Update version.

---
 Qt/QtHost.cpp         | 2 +-
 Qt/Settings.pri       | 2 +-
 Qt/assets.qrc         | 2 +-
 Qt/desktop_assets.qrc | 2 +-
 UI/NativeApp.cpp      | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp
index 74d5215490..bad45732b6 100644
--- a/Qt/QtHost.cpp
+++ b/Qt/QtHost.cpp
@@ -462,7 +462,7 @@ void NativeInitGraphics()
 	UIInit(&ui_atlas, theme);
 
 	uiTexture = new Texture();
-	if (!uiTexture->Load("ui_atlas.zim"))
+	if (!uiTexture->Load("ui_atlas_lowmem.zim"))
 	{
 		qDebug() << "Failed to load texture";
 	}
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index ed229e7738..2c168efa68 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -1,4 +1,4 @@
-VERSION = 0.9.5
+VERSION = 0.9.6
 DEFINES += USING_QT_UI USE_FFMPEG
 unix:!qnx:!symbian:!mac: CONFIG += linux
 
diff --git a/Qt/assets.qrc b/Qt/assets.qrc
index 103d6c1c0b..7d77542836 100644
--- a/Qt/assets.qrc
+++ b/Qt/assets.qrc
@@ -1,6 +1,6 @@
 <RCC>
 	<qresource prefix="/">
-		<file alias="assets/ui_atlas.zim">../assets/ui_atlas_lowmem.zim</file>
+		<file alias="assets/ui_atlas_lowmem.zim">../assets/ui_atlas_lowmem.zim</file>
 		<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
 		<file alias="assets/lang">../lang</file>
 		<file alias="assets/langregion.ini">../assets/langregion.ini</file>
diff --git a/Qt/desktop_assets.qrc b/Qt/desktop_assets.qrc
index 305c032844..6ce969c5e0 100644
--- a/Qt/desktop_assets.qrc
+++ b/Qt/desktop_assets.qrc
@@ -1,6 +1,6 @@
 <RCC>
 	<qresource prefix="/">
-		<file alias="assets/ui_atlas.zim">../assets/ui_atlas_lowmem.zim</file>
+		<file alias="assets/ui_atlas_lowmem.zim">../assets/ui_atlas_lowmem.zim</file>
 		<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
 		<file alias="assets/lang">../lang</file>
 		<file alias="assets/langregion.ini">../assets/langregion.ini</file>
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index baf43ecb93..7580bc6eef 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -470,7 +470,11 @@ void NativeInitGraphics() {
 	ui_draw2d_front.Init();
 
 	uiTexture = new Texture();
+#ifdef USING_QT_UI
+	if (!uiTexture->Load("ui_atlas_lowmem.zim")) {
+#else
 	if (!uiTexture->Load("ui_atlas.zim")) {
+#endif
 		PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
 		ELOG("Failed to load ui_atlas.zim");
 	}