summaryrefslogtreecommitdiffstats
path: root/tests/manual/qtbug-8933/qtbug-8933.pro
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-03-25 19:27:05 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-03-25 19:27:05 (GMT)
commit986873b239f15df43a3ebbc88a38f8ff8d6d07bf (patch)
tree946f585f390d3abb835a3280bbdc6bc90724977c /tests/manual/qtbug-8933/qtbug-8933.pro
parentb7f48eee301e973fcfae08dfd8997538b6dbe251 (diff)
parent3671dbf34940e166b747b6f8f3f5758fd486073c (diff)
downloadQt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.zip
Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.gz
Qt-986873b239f15df43a3ebbc88a38f8ff8d6d07bf.tar.bz2
Merge remote branch 'origin/4.7' into 4.7
Conflicts: tools/qdoc3/generator.cpp tools/qdoc3/node.cpp
Diffstat (limited to 'tests/manual/qtbug-8933/qtbug-8933.pro')
-rw-r--r--tests/manual/qtbug-8933/qtbug-8933.pro16
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/manual/qtbug-8933/qtbug-8933.pro b/tests/manual/qtbug-8933/qtbug-8933.pro
new file mode 100644
index 0000000..8b87c83
--- /dev/null
+++ b/tests/manual/qtbug-8933/qtbug-8933.pro
@@ -0,0 +1,16 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-03-16T14:40:16
+#
+#-------------------------------------------------
+
+TARGET = qtbug-8933
+TEMPLATE = app
+
+
+SOURCES += main.cpp\
+ widget.cpp
+
+HEADERS += widget.h
+
+FORMS += widget.ui