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

Merge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1)

Browse Source 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp
This commit is contained in:
con
2010-11-25 17:36:50 +01:00
parent 1b6d99661f bd8b23d4ba
commit 61ebb308e6
16 changed files with 118 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -471,8 +471,14 @@ void QmlEngine::attemptBreakpointSynchronization()
JSAgentBreakpoints breakpoints;
foreach (BreakpointId id, handler->engineBreakpointIds(this)) {
QString processedFilename = handler->fileName(id);
#ifdef Q_OS_MACX
// Qt Quick Applications by default copy the qml directory to buildDir()/X.app/Contents/Resources
const QString applicationBundleDir
= QFileInfo(startParameters().executable).absolutePath() + "/../..";
processedFilename = mangleFilenamePaths(handler->fileName(id), startParameters().projectDir, applicationBundleDir + "/Contents/Resources");
#endif
if (isShadowBuildProject())
processedFilename = toShadowBuildFilename(handler->fileName(id));
processedFilename = toShadowBuildFilename(processedFilename);
JSAgentBreakpointData bp;
bp.fileName = processedFilename.toUtf8();
bp.lineNumber = handler->lineNumber(id);
@@ -822,7 +828,7 @@ QString QmlEngine::mangleFilenamePaths(const QString &filename,
if (oldBaseDir.exists() && newBaseDir.exists() && fileInfo.exists()) {
if (fileInfo.absoluteFilePath().startsWith(oldBaseDir.canonicalPath())) {
QString fileRelativePath = fileInfo.canonicalFilePath().mid(oldBasePath.length());
QString fileRelativePath = fileInfo.canonicalFilePath().mid(oldBaseDir.canonicalPath().length());
QFileInfo projectFile(newBaseDir.canonicalPath() + QLatin1Char('/') + fileRelativePath);
if (projectFile.exists())
@@ -837,7 +843,14 @@ QString QmlEngine::fromShadowBuildFilename(const QString &filename) const
QString newFilename = filename;
QString importPath = qmlImportPath();
newFilename = mangleFilenamePaths(filename, startParameters().projectBuildDir, startParameters().projectDir);
#ifdef Q_OS_MACX
// Qt Quick Applications by default copy the qml directory to buildDir()/X.app/Contents/Resources
const QString applicationBundleDir
= QFileInfo(startParameters().executable).absolutePath() + "/../..";
newFilename = mangleFilenamePaths(newFilename, applicationBundleDir + "/Contents/Resources", startParameters().projectDir);
#endif
newFilename = mangleFilenamePaths(newFilename, startParameters().projectBuildDir, startParameters().projectDir);
if (newFilename == filename && !importPath.isEmpty()) {
newFilename = mangleFilenamePaths(filename, startParameters().projectBuildDir, importPath);
}