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/auto/gui/text/qtextscriptengine/generate/generate.pro | |
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/auto/gui/text/qtextscriptengine/generate/generate.pro')
-rw-r--r-- | tests/auto/gui/text/qtextscriptengine/generate/generate.pro | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro index 354e0e5cdf..101b7451de 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro +++ b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro @@ -1,14 +1,5 @@ -###################################################################### -# Automatically generated by qmake (1.07a) Fri Sep 30 15:20:45 2005 -###################################################################### - -TEMPLATE = app CONFIG -= moc INCLUDEPATH += . /usr/include/freetype2 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src -# Input SOURCES += main.cpp -CONFIG += qt warn_on debug thread create_prl link_prl - - |