Merge pull request #674 from xsacha/master

Qt update

Qt/PPSSPP.pro

@@ -12,7 +12,7 @@ blackberry: LIBS += -L. -lCore -lCommon -lNative -lscreen -lsocket -lstdc++
 win32: LIBS += -L. -lCore -lCommon -lNative -lwinmm -lws2_32 -lkernel32 -luser32 -lgdi32 -lshell32 -lcomctl32 -ldsound -lxinput
 linux: LIBS += -L. -lCore -lCommon -lNative
 
-desktop_ui {
+!mobile_platform {
 	PRE_TARGETDEPS += ./libCommon.a ./libCore.a ./libNative.a
 	CONFIG += link_pkgconfig
 	packagesExist(sdl) {
@@ -40,7 +40,9 @@ SOURCES += ../android/jni/EmuScreen.cpp \
 INCLUDEPATH += .. ../Common ../native
 
 # Temporarily only use new UI for Linux desktop
-desktop_ui {
+mobile_platform {
+	SOURCES += ../android/jni/NativeApp.cpp
+} else {
 	MOC_DIR = moc
 	UI_DIR = ui
 	RCC_DIR = rcc
@@ -48,8 +50,6 @@ desktop_ui {
 	HEADERS += *.h
 	FORMS += *.ui
 	RESOURCES += resources.qrc
-} else {
-	SOURCES += ../android/jni/NativeApp.cpp
 }
 
 # Packaging

Qt/Settings.pri

@@ -1,7 +1,6 @@
 DEFINES += USING_QT_UI
 blackberry|symbian|contains(MEEGO_EDITION,harmattan): CONFIG += mobile_platform
 unix:!blackberry:!symbian:!macx: CONFIG += linux
-linux:!mobile_platform: CONFIG += desktop_ui
 
 # Global specific
 QMAKE_CXXFLAGS += -Wno-unused-function -Wno-unused-variable -Wno-multichar -Wno-uninitialized -Wno-ignored-qualifiers -Wno-missing-field-initializers -Wno-unused-parameter

Qt/mainwindow.cpp

@@ -167,6 +167,12 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
 		LogManager::GetInstance()->ChangeFileLog(fileToLog);
 
 	LogManager::GetInstance()->SetLogLevel(LogTypes::G3D, LogTypes::LERROR);
+
+#if defined(USING_GLES2)
+	// Start Desktop UI
+	MainWindow* mainWindow = new MainWindow();
+	mainWindow->show();
+#endif
 }
 
 void MainWindow::SetNextState(CoreState state)