libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-21 08:14:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: The .desktop version isn't related to app version.

Browse Source 
App uses VERSION from Settings.pri instead.
Also, Qt version checker didn't work in Qt3 anyway so no need for this check.
Update outdated comments in PPSSPP.pro.
This commit is contained in:
Sacha 2014-06-24 00:11:31 +10:00
parent 1a830b1b60
commit e2664c7ec2
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Qt/PPSSPP.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Version=0.9.8
Version=1.0 # The version of the desktop entry specification to which this file complies
Type=Application
Terminal=false
Name=PPSSPP

15
Qt/PPSSPP.pro
View File

@ -4,10 +4,8 @@ TARGET = PPSSPPQt
QT += core gui opengl
include(Settings.pri)
lessThan(QT_MAJOR_VERSION, 5) {
lessThan(QT_MAJOR_VERSION, 4) | lessThan(QT_MINOR_VERSION, 7) {
error(PPSSPP requires Qt 4.7 or newer but Qt $$[QT_VERSION] was detected.)
}
lessThan(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 7) {
error(PPSSPP requires Qt 4.7 or newer but Qt $$[QT_VERSION] was detected.)
}
# Extra Qt modules
@ -66,7 +64,7 @@ macx|linux {
HEADERS += $$P/SDL/SDLJoystick.h
PKGCONFIG += sdl
macx {
LIBS += -liconv -F/Library/Frameworks -framework SDL
LIBS += -F/Library/Frameworks -framework SDL
INCLUDEPATH += /Library/Frameworks/SDL.framework/Versions/A/Headers
}
}
@ -107,8 +105,8 @@ arm:android: SOURCES += $$P/android/jni/ArmEmitterTest.cpp
HEADERS += $$P/UI/*.h
INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext
# Use forms UI for desktop platforms
!mobile_platform {
mobile_platform: RESOURCES += $$P/Qt/assets.qrc
else {
# TODO: Rewrite Debugger with same backend as Windows version
# Don't use .ui forms. Use Qt5 + C++11 features to minimise code
SOURCES += $$P/Qt/*.cpp $$P/Qt/Debugger/*.cpp
@ -138,9 +136,6 @@ INCLUDEPATH += $$P $$P/Common $$P/native $$P/native/ext
lang.CONFIG = no_link
QMAKE_EXTRA_COMPILERS += lang
PRE_TARGETDEPS += compiler_lang_make_all
} else {
# Desktop handles the Init separately
RESOURCES += $$P/Qt/assets.qrc
}
# Packaging