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

Merge commit 'origin/1.2'

Browse Source
This commit is contained in:
con
2009-06-19 10:19:05 +02:00
parent fba1d8d8f3 f29f2c551a
commit d7dbb27f0d
7 changed files with 119 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -72,12 +72,6 @@ CMakeProject::CMakeProject(CMakeManager *manager, const QString &fileName)
m_insideFileChanged(false)
{
m_file = new CMakeFile(this, fileName);
m_watcher = new ProjectExplorer::FileWatcher(this);
connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
m_watcher->addFile(fileName);
connect(this, SIGNAL(activeBuildConfigurationChanged()),
this, SLOT(slotActiveBuildConfiguration()));
}
CMakeProject::~CMakeProject()
@@ -567,7 +561,6 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
insertBuildStep(0, makeStep);
addBuildConfiguration("all");
setActiveBuildConfiguration("all");
makeStep->setBuildTarget("all", "all", true);
if (!copw.buildDirectory().isEmpty())
setValue("all", "buildDirectory", copw.buildDirectory());
@@ -576,6 +569,8 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
MakeStep *cleanMakeStep = new MakeStep(this);
insertCleanStep(0, cleanMakeStep);
cleanMakeStep->setValue("clean", true);
setActiveBuildConfiguration("all");
} else {
// We have a user file, but we could still be missing the cbp file
// or simply run createXml with the saved settings
@@ -600,8 +595,14 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
copw.exec();
}
}
parseCMakeLists(); // Gets the directory from the active buildconfiguration
m_watcher = new ProjectExplorer::FileWatcher(this);
connect(m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
m_watcher->addFile(m_fileName);
connect(this, SIGNAL(activeBuildConfigurationChanged()),
this, SLOT(slotActiveBuildConfiguration()));
}
CMakeTarget CMakeProject::targetForTitle(const QString &title)

1
src/plugins/debugger/cdb/cdbdumperhelper.cpp
View File

@@ -350,6 +350,7 @@ bool CdbDumperHelper::ensureInitialized(QString *errorMessage)
*errorMessage = msgLoadFailed(m_library, false, *errorMessage);
m_access->showDebuggerOutput(m_messagePrefix, *errorMessage);
m_access->showQtDumperLibraryWarning(*errorMessage);
m_state = Disabled; // No message here, no point in retrying
return false;
case CallLoadNoQtApp:
m_access->showDebuggerOutput(m_messagePrefix, QCoreApplication::translate("Debugger::Internal::CdbDumperHelper", "The debuggee does not appear to be Qt application."));

7
src/plugins/debugger/cdb/cdbexceptionutils.cpp
View File

@@ -40,7 +40,8 @@ enum { debugExc = 0 };
// Special exception codes.
enum { cppExceptionCode = 0xe06d7363, startupCompleteTrap = 0x406d1388,
rpcServerUnavailableExceptionCode = 0x6ba };
rpcServerUnavailableExceptionCode = 0x6ba,
dllNotFoundExceptionCode = 0xc0000135 };
namespace Debugger {
namespace Internal {
@@ -168,6 +169,9 @@ void formatException(const EXCEPTION_RECORD64 *e, QTextStream &str)
case startupCompleteTrap:
str << "Startup complete";
break;
case dllNotFoundExceptionCode:
str << "DLL not found";
break;
case EXCEPTION_ACCESS_VIOLATION: {
const bool writeOperation = e->ExceptionInformation[0];
str << (writeOperation ? "write" : "read")
@@ -266,6 +270,7 @@ bool isFatalException(LONG code)
case EXCEPTION_SINGLE_STEP:
case startupCompleteTrap: // Mysterious exception at start of application
case rpcServerUnavailableExceptionCode:
case dllNotFoundExceptionCode:
return false;
default:
break;