diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
| commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
| tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /examples/widgets/draganddrop/draggabletext/draggabletext.pro | |
| parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
| parent | 281121697340084f7d385eab530f41916789b94d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'examples/widgets/draganddrop/draggabletext/draggabletext.pro')
| -rw-r--r-- | examples/widgets/draganddrop/draggabletext/draggabletext.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.pro b/examples/widgets/draganddrop/draggabletext/draggabletext.pro index 2815be1613..1add2a270e 100644 --- a/examples/widgets/draganddrop/draggabletext/draggabletext.pro +++ b/examples/widgets/draganddrop/draggabletext/draggabletext.pro @@ -1,10 +1,8 @@ QT += widgets -HEADERS = draglabel.h \ - dragwidget.h +HEADERS = dragwidget.h RESOURCES = draggabletext.qrc -SOURCES = draglabel.cpp \ - dragwidget.cpp \ +SOURCES = dragwidget.cpp \ main.cpp # install |