diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-20 21:13:15 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-20 21:13:15 (GMT) |
| commit | fad6c792d4ead4ff14eaed3c9bc7564142989af7 (patch) | |
| tree | 88fb03a522e8bda1ca732c810f5cd004de49927a /tests/auto/headers/tst_headers.cpp | |
| parent | ae7a891627787e7925fecaa1e3430f1d31684688 (diff) | |
| parent | 919b723088b8617b202b92d80b8d0983e4fd9500 (diff) | |
| download | Qt-fad6c792d4ead4ff14eaed3c9bc7564142989af7.zip Qt-fad6c792d4ead4ff14eaed3c9bc7564142989af7.tar.gz Qt-fad6c792d4ead4ff14eaed3c9bc7564142989af7.tar.bz2 | |
Merge commit 'qt/master-stable' into kinetic-graphicseffect
Conflicts:
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'tests/auto/headers/tst_headers.cpp')
| -rw-r--r-- | tests/auto/headers/tst_headers.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp index f5a11f4..05cb205 100644 --- a/tests/auto/headers/tst_headers.cpp +++ b/tests/auto/headers/tst_headers.cpp @@ -139,6 +139,9 @@ void tst_Headers::allSourceFilesData() || sourceFile.contains("/config.tests/") || sourceFile.contains("/snippets/") || sourceFile.contains("linguist/lupdate/testdata") + || sourceFile.contains("testdata/bundle-spaces/main.cpp") + || sourceFile.contains("demos/embedded/fluidlauncher/pictureflow.cpp") + || sourceFile.contains("tools/porting/src/") || sourceFile.contains("/fulltextsearch/")) continue; |