summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptextqobject/.gitignore
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-08-06 03:55:27 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-08-06 03:55:27 (GMT)
commit06d57fc65c47d12047e985202ae1e394c48f78ca (patch)
treea897a8f91ad5e919e7cc66671b60d83248c96e72 /tests/auto/qscriptextqobject/.gitignore
parent31fa1d0f6144e7e92748b33f8633eeb2f52483a1 (diff)
parent56b349951a70f3ab95e334e41e37f017e91cf481 (diff)
downloadQt-06d57fc65c47d12047e985202ae1e394c48f78ca.zip
Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.tar.gz
Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.tar.bz2
Merge commit 'origin/4.5'
Conflicts: src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_win.cpp tests/auto/qicoimageformat/tst_qicoimageformat.cpp tests/auto/qscriptqobject/qscriptqobject.pro
Diffstat (limited to 'tests/auto/qscriptextqobject/.gitignore')
-rw-r--r--tests/auto/qscriptextqobject/.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qscriptextqobject/.gitignore b/tests/auto/qscriptextqobject/.gitignore
new file mode 100644
index 0000000..bff799f
--- /dev/null
+++ b/tests/auto/qscriptextqobject/.gitignore
@@ -0,0 +1 @@
+tst_qscriptqobject