← Back to branch summary

~timo-jyrinki/ubuntu/saucy/qtcreator/add_workaround_back

« back to all changes in this revision

Viewing changes to src/plugins/projectexplorer/debugginghelper.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer
  • Date: 2011-11-18 16:18:49 UTC
  • mfrom: (1.1.16)
  • Revision ID: package-import@ubuntu.com-20111118161849-5t8jugl6egvs4iev
Tags: 2.4.0~rc-0ubuntu1
* New upstream release candidate.
* Drop 04_fix_ftbfs_arm_qreal.diff, merged upstream.
* Refresh 01_fix_installation_paths.diff.
* Compress binary packages with xz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/projectexplorer/debugginghelper.cpp
4
4
**
5
5
** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
6
6
**
7
 
** Contact: Nokia Corporation (info@qt.nokia.com)
 
7
** Contact: Nokia Corporation (qt-info@nokia.com)
8
8
**
9
9
**
10
10
** GNU Lesser General Public License Usage
26
26
** conditions contained in a signed written agreement between you and Nokia.
27
27
**
28
28
** If you have questions regarding the use of this file, please contact
29
 
** Nokia at info@qt.nokia.com.
 
29
** Nokia at qt-info@nokia.com.
30
30
**
31
31
**************************************************************************/
32
32
 
68
68
    return directories;
69
69
}
70
70
 
71
 
QStringList DebuggingHelperLibrary::locationsByInstallData(const QString &qtInstallData)
72
 
{
73
 
    QStringList result;
74
 
    QFileInfo fileInfo;
75
 
    const QStringList binFilenames = validBinaryFilenames();
76
 
    foreach(const QString &directory, debuggingHelperLibraryDirectories(qtInstallData)) {
77
 
        if (getHelperFileInfoFor(binFilenames, directory, &fileInfo))
78
 
            result << fileInfo.filePath();
79
 
    }
80
 
    return result;
81
 
}
82
 
 
83
71
static QString sourcePath()
84
72
{
85
73
    return Core::ICore::instance()->resourcePath() + QLatin1String("/dumper/");