diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
| commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
| tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /examples/widgets/dialogs/tabdialog/tabdialog.pro | |
| parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
| parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) | |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'examples/widgets/dialogs/tabdialog/tabdialog.pro')
| -rw-r--r-- | examples/widgets/dialogs/tabdialog/tabdialog.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro index 656c661844..c282505ac1 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.pro +++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = tabdialog.h SOURCES = main.cpp \ tabdialog.cpp @@ -7,4 +9,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog INSTALLS += target wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib -QT += widgets |