preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-26 19:58:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2589 from unknownbrackets/qt-fix

Browse Source 
Blind fix to Qt build errors
This commit is contained in:
Henrik Rydgård committed 2013-07-02 11:26:39 -07:00
2 parents 517cf92d68 0f0c068e10
commit f3fdf16dda
2 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Qt/debugger_disasm.cpp
+3 -2
View File
@@ -368,9 +368,10 @@ void Debugger_Disasm::UpdateBreakpointsGUI()
ui->breakpointsList->clear();
EmuThread_LockDraw(true);
for(int i = 0; i < CBreakPoints::GetNumBreakpoints(); i++)
auto breakpoints = CBreakPoints::GetBreakPoints();
for(size_t i = 0; i < breakpoints.size(); i++)
{
u32 addr_ = CBreakPoints::GetBreakpointAddress(i);
u32 addr_ = breakpoints[i].addr;
if(!CBreakPoints::IsTempBreakPoint(addr_))
{
QTreeWidgetItem* item = new QTreeWidgetItem();
Qt/mainwindow.cpp
+5 -2
View File
@@ -138,7 +138,7 @@ void MainWindow::UpdateMenus()
ui->action_AF16x->setChecked(g_Config.iAnisotropyLevel == 16);
ui->action_OptionsBufferedRendering->setChecked(g_Config.bBufferedRendering);
ui->action_OptionsLinearFiltering->setChecked(g_Config.bLinearFiltering);
ui->action_OptionsLinearFiltering->setChecked(3 == g_Config.iTexFiltering);
ui->action_Simple_2xAA->setChecked(g_Config.SSAntiAliasing);
ui->action_OptionsScreen1x->setChecked(0 == (g_Config.iWindowZoom - 1));
@@ -500,7 +500,10 @@ void MainWindow::on_action_OptionsBufferedRendering_triggered()
void MainWindow::on_action_OptionsLinearFiltering_triggered()
{
g_Config.bLinearFiltering = !g_Config.bLinearFiltering;
if (g_Config.iTexFiltering == 0)
g_Config.iTexFiltering = 3;
else
g_Config.iTexFiltering = 0;
UpdateMenus();
}