diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-02-04 08:45:43 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-02-04 09:05:58 +0000 |
| commit | 2992653a4d4e3f1a4602c573cb3052f610c2a7b3 (patch) | |
| tree | 95c10bc33f3df6848ed24b6732afe551fca1b5be /src | |
| parent | b1c17b39bcd89021a1b31040b64d74b2b48e30df (diff) | |
| download | qt-creator-2992653a4d4e3f1a4602c573cb3052f610c2a7b3.tar.gz | |
CppTools: Remove workaround for quotes in defines
...since by now we get the defines in the correct format from
QMakeProject.
See the change this one depends on.
Tested with:
Qbs: cpp.defines: [ 'PATH1="/some/path"', "PATH2=\"/some/path\"" ]
QMake: DEFINES += PATH1=\\\"/some/path\\\" "PATH2=\\\"/some/path\\\""
CMake: add_definitions(-DPATH1="/some/path" "-DPATH2=\"/some/path\"")
All these lines translate to
#define PATH1 "/some/path"
#define PATH2 "/some/path"
for the code model.
Change-Id: Ifc3d3acff3abab6897ccbd0c5fafd5c415dfb53c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/cpptools/cppprojects.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppprojects.cpp b/src/plugins/cpptools/cppprojects.cpp index bf1b532a94..b58cb739b3 100644 --- a/src/plugins/cpptools/cppprojects.cpp +++ b/src/plugins/cpptools/cppprojects.cpp @@ -556,8 +556,6 @@ QStringList CompilerOptionsBuilder::createDefineOptions(const QByteArray &define QString arg = option + QLatin1String(str.left(hasValue ? spaceIdx : str.size()) + '='); if (hasValue) arg += QLatin1String(str.mid(spaceIdx + 1)); - arg = arg.replace(QLatin1String("\\\""), QLatin1String("\"")); - arg = arg.replace(QLatin1String("\""), QLatin1String("")); if (!result.contains(arg)) result.append(arg); } |