diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-22 06:40:50 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-22 06:40:50 +0200 |
commit | 784ffa92c91a82d278b8281b4054a1bfb7532191 (patch) | |
tree | 20929a395664706e45d83cd989e460f22d67f46c /examples | |
parent | 44afe9e76cc450b57770df54cd4e8ef62805da8c (diff) | |
parent | cf265b032f29f9d27c3417ed99e4746dde0e4dd0 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I3ec18abe3fb453eab23eb007290744eefb6fba6c
Diffstat (limited to 'examples')
-rw-r--r-- | examples/opcua/opcua.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/opcua/opcua.pro b/examples/opcua/opcua.pro index 75f5761..eb396c5 100644 --- a/examples/opcua/opcua.pro +++ b/examples/opcua/opcua.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += \ +qtHaveModule(widgets): SUBDIRS += \ opcuaviewer \ QT_FOR_CONFIG += opcua-private |