diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-04 10:58:57 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-04 11:16:34 +0200 |
| commit | 53ca8a7a66d4ff811516774c010237d195cec1cb (patch) | |
| tree | 7142b66314f8cb9d2a0900e3e6b6077851630d8d /examples | |
| parent | eb0849338fc951c7efe758de5b50276b83219ac4 (diff) | |
Fix compilation after refactor merge.
Comment out Some functionality for the moment.
Change-Id: Ia7d1d3ba982e97776ae7259be06689b5477450a1
Reviewed-on: http://codereview.qt-project.org/5972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/comapp/comapp.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/comapp/main.cpp | 2 | ||||
| -rw-r--r-- | examples/activeqt/hierarchy/hierarchy.pro | 1 | ||||
| -rw-r--r-- | examples/activeqt/menus/menus.pro | 1 | ||||
| -rw-r--r-- | examples/activeqt/multiple/multiple.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | examples/activeqt/qutlook/addressview.cpp | 2 | ||||
| -rw-r--r-- | examples/activeqt/qutlook/qutlook.pro | 1 | ||||
| -rw-r--r-- | examples/activeqt/simple/simple.pro | 1 | ||||
| -rw-r--r-- | examples/activeqt/webbrowser/webbrowser.pro | 1 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapper.pro | 2 |
11 files changed, 14 insertions, 3 deletions
diff --git a/examples/activeqt/comapp/comapp.pro b/examples/activeqt/comapp/comapp.pro index 84ce072..c7feb02 100644 --- a/examples/activeqt/comapp/comapp.pro +++ b/examples/activeqt/comapp/comapp.pro @@ -1,6 +1,8 @@ TEMPLATE = app CONFIG += qaxserver +QT += widgets + # Input SOURCES += main.cpp diff --git a/examples/activeqt/comapp/main.cpp b/examples/activeqt/comapp/main.cpp index 66af248..0f5fe43 100644 --- a/examples/activeqt/comapp/main.cpp +++ b/examples/activeqt/comapp/main.cpp @@ -217,7 +217,7 @@ DocumentList *Application::documents() const void Application::setVisible(bool on) { - ui->setShown(on); + ui->setVisible(on); } bool Application::isVisible() const diff --git a/examples/activeqt/hierarchy/hierarchy.pro b/examples/activeqt/hierarchy/hierarchy.pro index 732bbde..f2c9c56 100644 --- a/examples/activeqt/hierarchy/hierarchy.pro +++ b/examples/activeqt/hierarchy/hierarchy.pro @@ -3,6 +3,7 @@ TARGET = hierarchyax CONFIG += qt warn_off qaxserver dll contains(CONFIG, static):DEFINES += QT_NODLL +QT += widgets SOURCES = objects.cpp main.cpp HEADERS = objects.h diff --git a/examples/activeqt/menus/menus.pro b/examples/activeqt/menus/menus.pro index fc61e8a..c181393 100644 --- a/examples/activeqt/menus/menus.pro +++ b/examples/activeqt/menus/menus.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = menusax CONFIG += qt warn_off qaxserver +QT += widgets SOURCES = main.cpp menus.cpp HEADERS = menus.h diff --git a/examples/activeqt/multiple/multiple.pro b/examples/activeqt/multiple/multiple.pro index 058e966..5eae66a 100644 --- a/examples/activeqt/multiple/multiple.pro +++ b/examples/activeqt/multiple/multiple.pro @@ -2,6 +2,8 @@ TEMPLATE = lib TARGET = multipleax CONFIG += qt warn_off qaxserver dll +QT += widgets + contains(CONFIG, static):DEFINES += QT_NODLL SOURCES = main.cpp diff --git a/examples/activeqt/opengl/opengl.pro b/examples/activeqt/opengl/opengl.pro index f570dbe..2762345 100644 --- a/examples/activeqt/opengl/opengl.pro +++ b/examples/activeqt/opengl/opengl.pro @@ -3,7 +3,7 @@ TARGET = openglax CONFIG += qt warn_off qaxserver -QT += opengl +QT += widgets opengl HEADERS = glbox.h \ globjwin.h diff --git a/examples/activeqt/qutlook/addressview.cpp b/examples/activeqt/qutlook/addressview.cpp index 45ce662..ec06cd3 100644 --- a/examples/activeqt/qutlook/addressview.cpp +++ b/examples/activeqt/qutlook/addressview.cpp @@ -41,7 +41,7 @@ //! [0] #include "addressview.h" #include "msoutl.h" -#include <QtGui> +#include <QtWidgets> class AddressBookModel : public QAbstractListModel { diff --git a/examples/activeqt/qutlook/qutlook.pro b/examples/activeqt/qutlook/qutlook.pro index c1154e0..4e0e027 100644 --- a/examples/activeqt/qutlook/qutlook.pro +++ b/examples/activeqt/qutlook/qutlook.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = qutlook CONFIG += qaxcontainer +QT += widgets TYPELIBS = $$system(dumpcpp -getfile {00062FFF-0000-0000-C000-000000000046}) #! [0] diff --git a/examples/activeqt/simple/simple.pro b/examples/activeqt/simple/simple.pro index 4742370..8703ecb 100644 --- a/examples/activeqt/simple/simple.pro +++ b/examples/activeqt/simple/simple.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = simpleax CONFIG += qt warn_off qaxserver +QT += widgets SOURCES = main.cpp RC_FILE = $$QT.activeqt.sources/control/qaxserver.rc diff --git a/examples/activeqt/webbrowser/webbrowser.pro b/examples/activeqt/webbrowser/webbrowser.pro index 32eac71..859f62a 100644 --- a/examples/activeqt/webbrowser/webbrowser.pro +++ b/examples/activeqt/webbrowser/webbrowser.pro @@ -1,6 +1,7 @@ TEMPLATE = app CONFIG += qaxcontainer +QT += widgets QTDIR_build:REQUIRES = shared diff --git a/examples/activeqt/wrapper/wrapper.pro b/examples/activeqt/wrapper/wrapper.pro index d5443dc..d1209a3 100644 --- a/examples/activeqt/wrapper/wrapper.pro +++ b/examples/activeqt/wrapper/wrapper.pro @@ -2,6 +2,8 @@ TEMPLATE = lib TARGET = wrapperax CONFIG += qt warn_off qaxserver dll +QT += widgets + contains(CONFIG, static):DEFINES += QT_NODLL SOURCES = main.cpp |