diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-13 04:49:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-13 04:49:40 (GMT) |
| commit | 14821863b830b85ccb29df217a52f1ca52c9c421 (patch) | |
| tree | 472e41f9c7e54cc6c9ea1fe1d63218d2960876ea /src/declarative/declarative.pro | |
| parent | f2d9bdb36061b4b419e777075027f609bf9890b2 (diff) | |
| parent | f7b6358f0d8ff9cad1fd1fcb9622fad40cb0f0b0 (diff) | |
| download | Qt-14821863b830b85ccb29df217a52f1ca52c9c421.zip Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.gz Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index da8434f..62ae289 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -9,8 +9,8 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtXml -# QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors -# LIBS += -lgcov +QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors +LIBS += -lgcov INCLUDEPATH += ../../include/QtDeclarative |