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/sql/sql.pro | |
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/sql/sql.pro')
-rw-r--r-- | examples/sql/sql.pro | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 135d05b4e2..a427e10929 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -4,16 +4,14 @@ TEMPLATE = subdirs SUBDIRS = books \ drilldown \ - cachedtable \ - relationaltablemodel \ - sqlwidgetmapper - -!wince:qtHaveModule(xml): SUBDIRS += masterdetail - -!wince: SUBDIRS += \ + cachedtable \ querymodel \ + relationaltablemodel \ + sqlwidgetmapper \ tablemodel +qtHaveModule(xml): SUBDIRS += masterdetail + !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ SUBDIRS += sqlbrowser |