diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /examples/widgets | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'examples/widgets')
4 files changed, 3 insertions, 13 deletions
diff --git a/examples/widgets/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro index e99fce13ac..8ba55becad 100644 --- a/examples/widgets/dialogs/configdialog/configdialog.pro +++ b/examples/widgets/dialogs/configdialog/configdialog.pro @@ -10,5 +10,3 @@ RESOURCES += configdialog.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog INSTALLS += target - -wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro index 6f19309440..82e814dcb0 100644 --- a/examples/widgets/dialogs/dialogs.pro +++ b/examples/widgets/dialogs/dialogs.pro @@ -3,17 +3,13 @@ QT_FOR_CONFIG += widgets TEMPLATE = subdirs SUBDIRS = classwizard \ configdialog \ + extension \ + findfiles \ + licensewizard \ standarddialogs \ tabdialog \ trivialwizard -!wince { - SUBDIRS += \ - licensewizard \ - extension \ - findfiles -} - !qtHaveModule(printsupport): SUBDIRS -= licensewizard !qtConfig(wizard) { SUBDIRS -= trivialwizard licensewizard classwizard diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro index 12a814cb69..d2e9e19771 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro @@ -7,5 +7,3 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs INSTALLS += target - -wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro index c282505ac1..8a686b4f5c 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.pro +++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro @@ -7,5 +7,3 @@ SOURCES = main.cpp \ # install 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 |