diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-04 09:58:43 +0100 |
| commit | 5d5c00c67682bce105197b659687fd1fee8f60cf (patch) | |
| tree | 686e41dc3ea121235fb73afb9157ed603f1bfeff /examples/widgets/tools/codecs/codecs.pro | |
| parent | f213e818f03d35cb82e3daf187415197fd156f8e (diff) | |
| parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/gui/painting/qdrawhelper.cpp
Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e
Diffstat (limited to 'examples/widgets/tools/codecs/codecs.pro')
| -rw-r--r-- | examples/widgets/tools/codecs/codecs.pro | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/examples/widgets/tools/codecs/codecs.pro b/examples/widgets/tools/codecs/codecs.pro index 13daa79237..6f4b0742a9 100644 --- a/examples/widgets/tools/codecs/codecs.pro +++ b/examples/widgets/tools/codecs/codecs.pro @@ -2,10 +2,15 @@ QT += widgets requires(qtConfig(filedialog)) HEADERS += mainwindow.h \ - previewform.h + previewform.h \ + encodingdialog.h + SOURCES += main.cpp \ mainwindow.cpp \ - previewform.cpp + previewform.cpp \ + encodingdialog.cpp + +RESOURCES += codecs.qrc EXAMPLE_FILES = encodedfiles |