From a6767216837e535bb5e9a9781772a160651146b3 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sat, 9 Jun 2018 10:35:40 -0700
Subject: [PATCH] Qt: Remove bundled assets reader.

It was no longer being used or linked, so it just meant the assets were missing.
With this removed, the assets (lang inis, shaders, etc.) are available again.

Fixes #9831 - likely broken since #9061, which stopped using the qrc.
---
 CMakeLists.txt               |  2 +-
 Qt/desktop_assets.qrc        | 16 ----------
 UI/NativeApp.cpp             |  4 +--
 ext/native/file/zip_read.cpp | 57 ------------------------------------
 ext/native/file/zip_read.h   | 15 ----------
 5 files changed, 2 insertions(+), 92 deletions(-)
 delete mode 100644 Qt/desktop_assets.qrc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e0db28925..138661ef83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -763,7 +763,7 @@ elseif(USING_QT_UI)
       Qt/mainwindow.h
     )
     add_definitions(-DUSING_QT_UI)
-    include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt Qt/Debugger)
+    include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt)
 	set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core)
 	set(TargetBin PPSSPPQt)
 
diff --git a/Qt/desktop_assets.qrc b/Qt/desktop_assets.qrc
deleted file mode 100644
index c65de91f71..0000000000
--- a/Qt/desktop_assets.qrc
+++ /dev/null
@@ -1,16 +0,0 @@
-<RCC>
-	<qresource prefix="/">
-		<file alias="assets/ui_atlas.zim">../assets/ui_atlas.zim</file>
-		<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
-		<file alias="assets/lang">../assets/lang</file>
-		<file alias="assets/compat.ini">../assets/compat.ini</file>
-		<file alias="assets/langregion.ini">../assets/langregion.ini</file>
-		<file alias="assets/unknown.png">../assets/unknown.png</file>
-		<file alias="assets/rargray.png">../assets/rargray.png</file>
-		<file alias="assets/zip.png">../assets/zip.png</file>
-		<file alias="assets/shaders">../assets/shaders</file>
-		<file alias="assets/flash0/font">../flash0/font</file>
-		<file>resources/breakpointDisable.ico</file>
-		<file>resources/breakpoint.ico</file>
-	</qresource>
-</RCC>
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 8ae0bedb41..73781e2b61 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -360,9 +360,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 #endif
 
 	// We want this to be FIRST.
-#ifdef USING_QT_UI
-	VFSRegister("", new AssetsAssetReader());
-#elif defined(IOS)
+#if defined(IOS)
 	// Packed assets are included in app
 	VFSRegister("", new DirectoryAssetReader(external_dir));
 #endif
diff --git a/ext/native/file/zip_read.cpp b/ext/native/file/zip_read.cpp
index fa3a7c38f6..5069cfc223 100644
--- a/ext/native/file/zip_read.cpp
+++ b/ext/native/file/zip_read.cpp
@@ -3,11 +3,6 @@
 #include <set>
 #include <stdio.h>
 
-#ifdef USING_QT_UI
-#include <QFileInfo>
-#include <QDir>
-#endif
-
 #ifdef __ANDROID__
 #include <zip.h>
 #endif
@@ -66,58 +61,6 @@ uint8_t *ReadLocalFile(const char *filename, size_t *size) {
 	return contents;
 }
 
-#ifdef USING_QT_UI
-uint8_t *AssetsAssetReader::ReadAsset(const char *path, size_t *size) {
-	QFile asset(QString(":/assets/") + path);
-	if (!asset.open(QIODevice::ReadOnly))
-		return 0;
-
-	uint8_t *contents = new uint8_t[asset.size()+1];
-	memcpy(contents, (uint8_t*)asset.readAll().data(), asset.size());
-	contents[asset.size()] = 0;
-	*size = asset.size();
-	asset.close();
-	return contents;
-}
-
-bool AssetsAssetReader::GetFileListing(const char *path, std::vector<FileInfo> *listing, const char *filter = 0)
-{
-	QDir assetDir(QString(":/assets/") + path);
-	QStringList filters = QString(filter).split(':', QString::SkipEmptyParts);
-	for (int i = 0; i < filters.count(); i++)
-		filters[i].prepend("*.");
-
-	QFileInfoList infoList = assetDir.entryInfoList(filters, QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Files, QDir::Name);
-	foreach(QFileInfo qinfo, infoList) {
-		FileInfo info;
-		info.name = qinfo.fileName().toStdString();
-		info.fullName = qinfo.absoluteFilePath().remove(":/assets/").toStdString();
-		info.exists = true;
-		info.isWritable = false;
-		info.isDirectory = qinfo.isDir();
-		listing->push_back(info);
-	}
-	return true;
-}
-
-bool AssetsAssetReader::GetFileInfo(const char *path, FileInfo *info) {
-	QFileInfo qinfo(QString(":/assets/") + path);
-	if (!qinfo.exists()) {
-		info->exists = false;
-		info->size = 0;
-		return false;
-	}
-
-	info->fullName = path;
-	info->exists = true;
-	info->isWritable = false;
-	info->isDirectory = qinfo.isDir();
-	info->size = qinfo.size();
-	return true;
-}
-
-#endif
-
 #ifdef __ANDROID__
 
 ZipAssetReader::ZipAssetReader(const char *zip_file, const char *in_zip_path) {
diff --git a/ext/native/file/zip_read.h b/ext/native/file/zip_read.h
index 7e2ecbbf45..3607ddb926 100644
--- a/ext/native/file/zip_read.h
+++ b/ext/native/file/zip_read.h
@@ -26,21 +26,6 @@ public:
 	virtual std::string toString() const = 0;
 };
 
-#ifdef USING_QT_UI
-class AssetsAssetReader : public AssetReader {
-public:
-	AssetsAssetReader() {}
-	~AssetsAssetReader() {}
-	// use delete[]
-	virtual uint8_t *ReadAsset(const char *path, size_t *size);
-	virtual bool GetFileListing(const char *path, std::vector<FileInfo> *listing, const char *filter);
-	virtual bool GetFileInfo(const char *path, FileInfo *info);
-	virtual std::string toString() const {
-		return ":assets/";
-	}
-};
-#endif
-
 #ifdef __ANDROID__
 uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size);
 class ZipAssetReader : public AssetReader {