mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Stanislav 2014-09-18 10:25:33 +06:00
parent 76f2e5d5b8
commit 313bdf4e78
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -690,17 +690,6 @@ if (WIN32)
if (BUILD_MWINIIMPORTER) if (BUILD_MWINIIMPORTER)
set_target_properties(mwiniimport PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}") set_target_properties(mwiniimport PROPERTIES COMPILE_FLAGS "${WARNINGS} ${MT_BUILD}")
endif (BUILD_MWINIIMPORTER) endif (BUILD_MWINIIMPORTER)
set( OMW_CFLAGS "/DWIN32_LEAN_AND_MEAN ${MT_BUILD}" )
string( TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE )
# Debug builds need /bigobj
if ( CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO" )
set( OMW_CFLAGS "${OMW_CFLAGS} /bigobj" )
endif ( CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "RELWITHDEBINFO" )
set_property( TARGET openmw APPEND_STRING PROPERTY COMPILE_FLAGS " ${OMW_CFLAGS}" )
endif(MSVC) endif(MSVC)
# Same for MinGW # Same for MinGW

8
apps/opencs/view/world/table.cpp
View File

@ -62,7 +62,7 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
currRow = mProxyModel->mapToSource(mProxyModel->index( currRow, 0 )).row(); currRow = mProxyModel->mapToSource(mProxyModel->index( currRow, 0 )).row();
CSMWorld::ColumnBase::Display colType = CSMWorld::ColumnBase::Display colDisplay =
static_cast<CSMWorld::ColumnBase::Display>( static_cast<CSMWorld::ColumnBase::Display>(
mModel->headerData( mModel->headerData(
currCol, currCol,
@ -70,16 +70,16 @@ void CSVWorld::Table::contextMenuEvent (QContextMenuEvent *event)
CSMWorld::ColumnBase::Role_Display ).toInt()); CSMWorld::ColumnBase::Role_Display ).toInt());
QString cellData = mModel->data(mModel->index( currRow, currCol )).toString(); QString cellData = mModel->data(mModel->index( currRow, currCol )).toString();
CSMWorld::UniversalId::Type colUidType = CSMWorld::TableMimeData::convertEnums( colType ); CSMWorld::UniversalId::Type colType = CSMWorld::TableMimeData::convertEnums( colDisplay );
if ( !cellData.isEmpty() if ( !cellData.isEmpty()
&& colUidType != CSMWorld::UniversalId::Type::Type_None ) && colType != CSMWorld::UniversalId::Type::Type_None )
{ {
mEditCellAction->setText(tr("Edit '").append(cellData).append("'")); mEditCellAction->setText(tr("Edit '").append(cellData).append("'"));
menu.addAction( mEditCellAction ); menu.addAction( mEditCellAction );
mEditCellId = CSMWorld::UniversalId( colUidType, cellData.toUtf8().constData() ); mEditCellId = CSMWorld::UniversalId( colType, cellData.toUtf8().constData() );
} }
} }