diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-06-28 16:35:42 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 17:12:22 +0200 |
| commit | fcfbe02c9f5c0c695a7d49b3a886e9a7ca88e56b (patch) | |
| tree | 772b5c2ce73ae91f2b9a1b6a01105fcbfffbb0e7 /examples | |
| parent | 707a39b2eccb565d58227dc4668d52f53308cd01 (diff) | |
ActiveQt: Bring back the webbrowser example.
Build the example in shared configurations.
Change-Id: Iec7df96084ca9a1db0b3e86d1e03177869e12735
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/activeqt.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/webbrowser/webbrowser.pro | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 79d257a..9acb71b 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -4,9 +4,9 @@ SUBDIRS += comapp \ menus \ multiple \ simple \ - webbrowser \ wrapper +contains(QT_CONFIG, shared):SUBDIRS += webbrowser contains(QT_CONFIG, opengl):SUBDIRS += opengl # For now only the contain examples with mingw, for the others you need diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 859f62a..915c7ca 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -3,8 +3,6 @@ TEMPLATE = app CONFIG += qaxcontainer QT += widgets -QTDIR_build:REQUIRES = shared - HEADERS = webaxwidget.h SOURCES = main.cpp FORMS = mainwindow.ui |