feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
This commit is contained in:
con
2010-06-30 14:25:09 +02:00
parent 82cc4b4302 21b211fed0
commit ede2a7c975
43 changed files with 13792 additions and 2543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/debugger/breakhandler.cpp
View File

@@ -694,12 +694,12 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
Qt::ItemFlags BreakHandler::flags(const QModelIndex &index) const
{
switch (index.column()) {
//case 0:
// return Qt::ItemIsUserCheckable | Qt::ItemIsEnabled;
default:
// switch (index.column()) {
// //case 0:
// // return Qt::ItemIsUserCheckable | Qt::ItemIsEnabled;
// default:
return QAbstractTableModel::flags(index);
}
// }
}
bool BreakHandler::setData(const QModelIndex &index, const QVariant &value, int role)