diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /tests/benchmarks/corelib/tools/qregexp | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'tests/benchmarks/corelib/tools/qregexp')
-rw-r--r-- | tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index b427150041..59e7d19244 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -1,14 +1,10 @@ TEMPLATE = app TARGET = tst_bench_qregexp -DEPENDPATH += . -INCLUDEPATH += . -RESOURCES+=qregexp.qrc QT = core testlib - CONFIG += release -# Input SOURCES += main.cpp +RESOURCES += qregexp.qrc !isEmpty(QT.webkit.sources):exists($${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri) { include( $${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri ) |