diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-02-10 11:53:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 12:35:03 +0100 |
| commit | dc05fe7a5b0ca1dda691f5ec04b91800c93adbb5 (patch) | |
| tree | 3480838271fa94d5329f9fcadcedc775e3671260 | |
| parent | bbdea065aaad89de5b2f9e32ffbacd40abf5173a (diff) | |
Fix out-of-tree compilation of widget examples
'styles' are only defined in the qt build internals, when the
examples are compiled inside a configured Qt source. That's not
the case for the examples e.g. in the Qt SDK.
(windows is a default style on all platforms, anyway. So I
think the check is superfluous in the first place.)
Task-number: QTBUG-36655
Change-Id: I7114619efd479408dad99c8514f8e33ddcab7c7c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| -rw-r--r-- | examples/widgets/widgets/styles/styles.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/widgets/widgets.pro | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/examples/widgets/widgets/styles/styles.pro b/examples/widgets/widgets/styles/styles.pro index e326991535..235642f270 100644 --- a/examples/widgets/widgets/styles/styles.pro +++ b/examples/widgets/widgets/styles/styles.pro @@ -7,8 +7,6 @@ SOURCES = main.cpp \ widgetgallery.cpp RESOURCES = styles.qrc -REQUIRES += "contains(styles, windows)" - # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/styles INSTALLS += target diff --git a/examples/widgets/widgets/widgets.pro b/examples/widgets/widgets/widgets.pro index 8d9e15a7e8..fe3e289944 100644 --- a/examples/widgets/widgets/widgets.pro +++ b/examples/widgets/widgets/widgets.pro @@ -16,6 +16,7 @@ SUBDIRS = analogclock \ shapedclock \ sliders \ spinboxes \ + styles \ stylesheet \ tablet \ tetrix \ @@ -23,5 +24,3 @@ SUBDIRS = analogclock \ validators \ wiggly \ windowflags - -contains(styles, windows): SUBDIRS += styles |