Qt: Lots of misc fixes.
Use QtMultimedia everywhere except Ubuntu (they forgot to include it). Makes audio much better. It is supported now on Symbian. Remove unused resources. Include translations that weren't being included. Consolidate in to a single resource to fix a rebuilding issue.
@ -13,16 +13,20 @@ lessThan(QT_MAJOR_VERSION, 5) {
|
|||||||
|
|
||||||
# Extra Qt modules
|
# Extra Qt modules
|
||||||
linux: CONFIG += link_pkgconfig
|
linux: CONFIG += link_pkgconfig
|
||||||
win32|greaterThan(QT_MAJOR_VERSION,4): QT += multimedia
|
linux:lessThan(QT_MAJOR_VERSION,5):!packagesExist(QtMultimedia) {
|
||||||
else:linux:packagesExist(QtMultimedia): QT += multimedia
|
# Ubuntu et al workaround. They forgot QtMultimedia
|
||||||
else {
|
|
||||||
CONFIG += mobility
|
CONFIG += mobility
|
||||||
MOBILITY += multimedia
|
MOBILITY += multimedia
|
||||||
}
|
}
|
||||||
|
else: QT += multimedia
|
||||||
|
|
||||||
greaterThan(QT_MAJOR_VERSION,4): QT += widgets
|
greaterThan(QT_MAJOR_VERSION,4): QT += widgets
|
||||||
|
|
||||||
mobile_platform: MOBILITY += sensors
|
mobile_platform {
|
||||||
symbian: MOBILITY += systeminfo feedback
|
CONFIG += mobility
|
||||||
|
MOBILITY += sensors
|
||||||
|
symbian: MOBILITY += systeminfo feedback
|
||||||
|
}
|
||||||
|
|
||||||
# PPSSPP Libs
|
# PPSSPP Libs
|
||||||
QMAKE_LIBDIR += $$CONFIG_DIR
|
QMAKE_LIBDIR += $$CONFIG_DIR
|
||||||
@ -90,7 +94,7 @@ INCLUDEPATH += $$P $$P/Common $$P/native
|
|||||||
SOURCES += $$P/Qt/*.cpp
|
SOURCES += $$P/Qt/*.cpp
|
||||||
HEADERS += $$P/Qt/*.h
|
HEADERS += $$P/Qt/*.h
|
||||||
FORMS += $$P/Qt/*.ui
|
FORMS += $$P/Qt/*.ui
|
||||||
RESOURCES += $$P/Qt/resources.qrc
|
RESOURCES += $$P/Qt/desktop_assets.qrc
|
||||||
INCLUDEPATH += $$P/Qt
|
INCLUDEPATH += $$P/Qt
|
||||||
|
|
||||||
# Translations
|
# Translations
|
||||||
@ -105,9 +109,9 @@ INCLUDEPATH += $$P $$P/Common $$P/native
|
|||||||
PRE_TARGETDEPS += compiler_lang_make_all
|
PRE_TARGETDEPS += compiler_lang_make_all
|
||||||
} else {
|
} else {
|
||||||
# Desktop handles the Init separately
|
# Desktop handles the Init separately
|
||||||
|
RESOURCES += $$P/Qt/assets.qrc
|
||||||
SOURCES += $$P/UI/NativeApp.cpp
|
SOURCES += $$P/UI/NativeApp.cpp
|
||||||
}
|
}
|
||||||
RESOURCES += assets.qrc
|
|
||||||
|
|
||||||
# Packaging
|
# Packaging
|
||||||
symbian {
|
symbian {
|
||||||
|
@ -257,7 +257,7 @@ void CtrlDisAsmView::paintEvent(QPaintEvent *)
|
|||||||
painter.setFont(normalFont);
|
painter.setFont(normalFont);
|
||||||
|
|
||||||
|
|
||||||
QImage breakPoint(":/images/breakpoint");
|
QImage breakPoint(":/resources/breakpoint.ico");
|
||||||
int i;
|
int i;
|
||||||
curAddress&=~(align-1);
|
curAddress&=~(align-1);
|
||||||
|
|
||||||
|
24
Qt/desktop_assets.qrc
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
<RCC>
|
||||||
|
<qresource prefix="/">
|
||||||
|
<file alias="assets/ui_atlas.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>
|
||||||
|
<file alias="assets/unknown.png">../assets/unknown.png</file>
|
||||||
|
<file alias="assets/shaders">../assets/shaders</file>
|
||||||
|
<file alias="assets/flash0/font">../flash0/font</file>
|
||||||
|
<file>languages/ppsspp_de.qm</file>
|
||||||
|
<file>languages/ppsspp_en.qm</file>
|
||||||
|
<file>languages/ppsspp_fr.qm</file>
|
||||||
|
<file>languages/ppsspp_gr.qm</file>
|
||||||
|
<file>languages/ppsspp_hu.qm</file>
|
||||||
|
<file>languages/ppsspp_id.qm</file>
|
||||||
|
<file>languages/ppsspp_pl.qm</file>
|
||||||
|
<file>languages/ppsspp_pt-br.qm</file>
|
||||||
|
<file>languages/ppsspp_ru.qm</file>
|
||||||
|
<file>languages/ppsspp_zh-cn.qm</file>
|
||||||
|
<file>languages/ppsspp_zh-tw.qm</file>
|
||||||
|
<file>resources/breakpointDisable.ico</file>
|
||||||
|
<file>resources/breakpoint.ico</file>
|
||||||
|
</qresource>
|
||||||
|
</RCC>
|
@ -1,31 +0,0 @@
|
|||||||
<RCC>
|
|
||||||
<qresource prefix="/images">
|
|
||||||
<file>resources/psp.png</file>
|
|
||||||
<file>resources/psp_map.png</file>
|
|
||||||
<file>resources/psp_rightbtn_red.png</file>
|
|
||||||
<file>resources/psp_smallbtn_red.png</file>
|
|
||||||
<file>resources/psp_down_red.png</file>
|
|
||||||
<file>resources/psp_up_red.png</file>
|
|
||||||
<file>resources/psp_right_red.png</file>
|
|
||||||
<file>resources/psp_left_red.png</file>
|
|
||||||
<file>resources/psp_rt_red.png</file>
|
|
||||||
<file>resources/psp_lt_red.png</file>
|
|
||||||
<file>resources/psp_aright.png</file>
|
|
||||||
<file>resources/psp_adown.png</file>
|
|
||||||
<file>resources/psp_aleft.png</file>
|
|
||||||
<file>resources/psp_aup.png</file>
|
|
||||||
<file alias="breakpointDisable">resources/stop1.ico</file>
|
|
||||||
<file alias="breakpoint">resources/icon1.ico</file>
|
|
||||||
</qresource>
|
|
||||||
<qresource prefix="/">
|
|
||||||
<file>languages/ppsspp_zh-cn.qm</file>
|
|
||||||
<file>languages/ppsspp_en.qm</file>
|
|
||||||
<file>languages/ppsspp_fr.qm</file>
|
|
||||||
<file>languages/ppsspp_pl.qm</file>
|
|
||||||
<file>languages/ppsspp_de.qm</file>
|
|
||||||
<file>languages/ppsspp_zh-tw.qm</file>
|
|
||||||
<file>languages/ppsspp_pt-br.qm</file>
|
|
||||||
<file>languages/ppsspp_id.qm</file>
|
|
||||||
<file>languages/ppsspp_ru.qm</file>
|
|
||||||
</qresource>
|
|
||||||
</RCC>
|
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 304 B |
Before Width: | Height: | Size: 322 B |
Before Width: | Height: | Size: 321 B |
Before Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 278 B |
Before Width: | Height: | Size: 295 B |
Before Width: | Height: | Size: 349 B |
Before Width: | Height: | Size: 4.5 KiB |
Before Width: | Height: | Size: 312 B |
Before Width: | Height: | Size: 399 B |
Before Width: | Height: | Size: 350 B |
Before Width: | Height: | Size: 290 B |
Before Width: | Height: | Size: 292 B |