diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-30 13:34:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-30 13:34:46 +0100 |
| commit | 0ddb6cac29628425b7c2490a20df944f062ce50c (patch) | |
| tree | 8527a12fbc6eb6d3fc7a8e4a30044f549bc2fd92 /src/tools/valgrindfake/valgrindfake.pro | |
| parent | bcd704d7bf5a1daa3d0ad9574386c11981c409a2 (diff) | |
| parent | 88c647ce6868cd7ab03ec96062d2a77813b6e906 (diff) | |
| download | qt-creator-0ddb6cac29628425b7c2490a20df944f062ce50c.tar.gz | |
Merge remote-tracking branch 'origin/3.0'
Conflicts:
src/plugins/qmakeprojectmanager/qmakeproject.cpp
Change-Id: Id6ac9051d2564788bb180e5a99243d588312ae99
Diffstat (limited to 'src/tools/valgrindfake/valgrindfake.pro')
| -rw-r--r-- | src/tools/valgrindfake/valgrindfake.pro | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/tools/valgrindfake/valgrindfake.pro b/src/tools/valgrindfake/valgrindfake.pro index bd7eae2cda..10f3e203b7 100644 --- a/src/tools/valgrindfake/valgrindfake.pro +++ b/src/tools/valgrindfake/valgrindfake.pro @@ -2,15 +2,12 @@ TEMPLATE = app TARGET = valgrind-fake QT += network xml +QT -= gui widgets macx:CONFIG -= app_bundle -isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/../../shared/qtcreator_pch.h - HEADERS += outputgenerator.h SOURCES += main.cpp \ outputgenerator.cpp -QTC_LIB_DEPENDS += \ - utils include(../../../qtcreator.pri) |