diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /tests/manual/widgets | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'tests/manual/widgets')
| -rw-r--r-- | tests/manual/widgets/itemviews/itemviews.pro | 2 | ||||
| -rw-r--r-- | tests/manual/widgets/qgraphicsview/qgraphicsview.pro | 2 | ||||
| -rw-r--r-- | tests/manual/widgets/widgets.pro | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/tests/manual/widgets/itemviews/itemviews.pro b/tests/manual/widgets/itemviews/itemviews.pro new file mode 100644 index 0000000000..58b02bfc0d --- /dev/null +++ b/tests/manual/widgets/itemviews/itemviews.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = delegate qheaderview qtreeview diff --git a/tests/manual/widgets/qgraphicsview/qgraphicsview.pro b/tests/manual/widgets/qgraphicsview/qgraphicsview.pro new file mode 100644 index 0000000000..243b28b040 --- /dev/null +++ b/tests/manual/widgets/qgraphicsview/qgraphicsview.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = rubberband diff --git a/tests/manual/widgets/widgets.pro b/tests/manual/widgets/widgets.pro new file mode 100644 index 0000000000..4e2e4c7cee --- /dev/null +++ b/tests/manual/widgets/widgets.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS = itemviews qgraphicsview |