diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 10:38:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-21 11:03:18 +0200 |
| commit | c8ca300e491c186304d0864a9e870337e891e6f7 (patch) | |
| tree | f1d991c5960b5acc0bf2a709960e871d48d91acf /tests/manual/shortcuts/shortcuts.pro | |
| parent | 31c96d34d27f8cad020238df28c10a71b2c4a34f (diff) | |
| parent | 8b540f68a8404e4b9e3ac65a22c11416a91ee749 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qmake/doc/src/qmake-manual.qdoc
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/src.pro
Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
Diffstat (limited to 'tests/manual/shortcuts/shortcuts.pro')
| -rw-r--r-- | tests/manual/shortcuts/shortcuts.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/manual/shortcuts/shortcuts.pro b/tests/manual/shortcuts/shortcuts.pro new file mode 100644 index 0000000000..3df6f2192b --- /dev/null +++ b/tests/manual/shortcuts/shortcuts.pro @@ -0,0 +1,6 @@ +QT += core gui widgets + +TARGET = shortcuts +TEMPLATE = app + +SOURCES += main.cpp |