From cb4d0732dfad0127094b58618d42231522f62f59 Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Sun, 16 Oct 2016 14:47:47 +0200 Subject: [PATCH] qt: Remove qrc files --- CMakeLists.txt | 2 -- Qt/mainwindow.cpp | 2 -- UI/NativeApp.cpp | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e07eda970a..c8a8be25fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -728,7 +728,6 @@ elseif(IOS) set(TargetBin PPSSPP) elseif(USING_QT_UI) set(CMAKE_AUTOMOC ON) - set(CMAKE_AUTORCC ON) find_package(Qt5 COMPONENTS Multimedia OpenGL Gui Core) set(Qt_UI @@ -745,7 +744,6 @@ elseif(USING_QT_UI) ext/native/base/QtMain.h Qt/mainwindow.cpp Qt/mainwindow.h - Qt/desktop_assets.qrc Qt/Debugger/ctrldisasmview.cpp Qt/Debugger/ctrldisasmview.h Qt/Debugger/ctrlmemview.cpp diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp index 9fe278ec80..85a92ee4c5 100644 --- a/Qt/mainwindow.cpp +++ b/Qt/mainwindow.cpp @@ -25,8 +25,6 @@ MainWindow::MainWindow(QWidget *parent, bool fullscreen) : memoryTexWindow(0), displaylistWindow(0) { - Q_INIT_RESOURCE(desktop_assets); - QDesktopWidget *desktop = QApplication::desktop(); int screenNum = QProcessEnvironment::systemEnvironment().value("SDL_VIDEO_FULLSCREEN_HEAD", "0").toInt(); diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 72e8bd620e..543153bb5c 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -320,9 +320,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory() + "assets/").c_str())); VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory()).c_str())); VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/")); -#else - VFSRegister("", new DirectoryAssetReader("assets/")); #endif + VFSRegister("", new DirectoryAssetReader("assets/")); VFSRegister("", new DirectoryAssetReader(savegame_dir)); #if defined(MOBILE_DEVICE) || !defined(USING_QT_UI)