diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /mkspecs/features/testcocoon.prf | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'mkspecs/features/testcocoon.prf')
| -rw-r--r-- | mkspecs/features/testcocoon.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/testcocoon.prf b/mkspecs/features/testcocoon.prf index e6ad733540..523497dba1 100644 --- a/mkspecs/features/testcocoon.prf +++ b/mkspecs/features/testcocoon.prf @@ -11,10 +11,10 @@ TARGET_BASENAME = $$basename(QMAKE_RESOLVED_TARGET) # --cs-output defines the name to give to the execution report (.csexe). TESTCOCOON_COVERAGE_OPTIONS = \ --cs-qt4 \ - --cs-exclude-file-regex=\'(^|[/\\\\])ui_.*\\.h\$\$\' \ --cs-exclude-file-regex=\'(^|[/\\\\])(qrc|moc)_.*\\.cpp\$\$\' \ --cs-exclude-file-regex=\'.*\\.moc\$\$\' \ --cs-exclude-file-regex=\'.*\\.g\$\$\' \ + --cs-exclude-file-regex=\'.*\\.h\$\$\' \ --cs-output=\'$$TARGET_BASENAME\' # name of the csexe file (execution report) # The .csmes file should be placed alongside the .so or binary. |