diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-03 11:03:22 +0200 |
commit | 92c998afb66a2ec900d50cab57929c0a97ad46ac (patch) | |
tree | 1f6219dc64c236c85d7365f8e07ee1df1f27a610 /tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro | |
parent | 6c4dec7bff6f55b0c41729f4a4ab6962a037af15 (diff) | |
parent | 6f4212e5936b96a8be0eacddbfc4dd7ca5abd776 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/kernel/qapplication_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlinecontrol_p.h
src/gui/widgets/qtabwidget.h
Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736
Diffstat (limited to 'tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro')
-rw-r--r-- | tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro index ee2b77d63c..62d4908e69 100644 --- a/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/qtconcurrentfilter/qtconcurrentfilter.pro @@ -3,4 +3,4 @@ DEFINES += QT_STRICT_ITERATORS SOURCES += tst_qtconcurrentfilter.cpp QT = core CONFIG += parallel_test -CONFIG += parallel_test +linux*:CONFIG += insignificant_test |