diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
| commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
| tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /examples/xml | |
| parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
| parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'examples/xml')
| -rw-r--r-- | examples/xml/dombookmarks/dombookmarks.pro | 1 | ||||
| -rw-r--r-- | examples/xml/rsslisting/rsslisting.pro | 1 | ||||
| -rw-r--r-- | examples/xml/saxbookmarks/saxbookmarks.pro | 1 | ||||
| -rw-r--r-- | examples/xml/streambookmarks/streambookmarks.pro | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 07004377a0..280207eebb 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -4,6 +4,7 @@ SOURCES = main.cpp \ mainwindow.cpp \ xbeltree.cpp QT += xml widgets +requires(qtConfig(filedialog)) EXAMPLE_FILES = frank.xbel jennifer.xbel diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro index 5997f96ca9..b6a00aa0c6 100644 --- a/examples/xml/rsslisting/rsslisting.pro +++ b/examples/xml/rsslisting/rsslisting.pro @@ -1,6 +1,7 @@ HEADERS += rsslisting.h SOURCES += main.cpp rsslisting.cpp QT += network xml widgets +requires(qtConfig(treewidget)) # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index d07a6e3fb8..af2a124a13 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -6,6 +6,7 @@ SOURCES = main.cpp \ xbelgenerator.cpp \ xbelhandler.cpp QT += xml widgets +requires(qtConfig(filedialog)) EXAMPLE_FILES = frank.xbel jennifer.xbel diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro index 62aac0eef3..8c2fc3fa19 100644 --- a/examples/xml/streambookmarks/streambookmarks.pro +++ b/examples/xml/streambookmarks/streambookmarks.pro @@ -6,6 +6,7 @@ SOURCES = main.cpp \ xbelreader.cpp \ xbelwriter.cpp QT += xml widgets +requires(qtConfig(filedialog)) EXAMPLE_FILES = frank.xbel jennifer.xbel |