qt: Remove qrc files

This commit is contained in:
Florent Castelli 2016-10-16 14:47:47 +02:00
parent a9da49a653
commit cb4d0732df
3 changed files with 1 additions and 6 deletions

View file

@ -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

View file

@ -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();

View file

@ -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)