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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/dumpcpp/dumpcpp.pro | 1 | ||||
| -rw-r--r-- | tools/dumpdoc/dumpdoc.pro | 1 | ||||
| -rw-r--r-- | tools/testcon/ambientproperties.cpp | 2 | ||||
| -rw-r--r-- | tools/testcon/changeproperties.cpp | 2 | ||||
| -rw-r--r-- | tools/testcon/docuwindow.cpp | 4 | ||||
| -rw-r--r-- | tools/testcon/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | tools/testcon/testcon.pro | 2 |
7 files changed, 10 insertions, 4 deletions
diff --git a/tools/dumpcpp/dumpcpp.pro b/tools/dumpcpp/dumpcpp.pro index 09a339b..e49d99f 100644 --- a/tools/dumpcpp/dumpcpp.pro +++ b/tools/dumpcpp/dumpcpp.pro @@ -2,5 +2,6 @@ TEMPLATE = app CONFIG += console qaxcontainer DESTDIR = ../../../bin +QT += widgets SOURCES += main.cpp diff --git a/tools/dumpdoc/dumpdoc.pro b/tools/dumpdoc/dumpdoc.pro index 3c93525..5ee96e7 100644 --- a/tools/dumpdoc/dumpdoc.pro +++ b/tools/dumpdoc/dumpdoc.pro @@ -1,5 +1,6 @@ TEMPLATE = app CONFIG += console qaxcontainer +QT += widgets SOURCES += main.cpp diff --git a/tools/testcon/ambientproperties.cpp b/tools/testcon/ambientproperties.cpp index cfdc47e..645fc96 100644 --- a/tools/testcon/ambientproperties.cpp +++ b/tools/testcon/ambientproperties.cpp @@ -41,7 +41,7 @@ #include "ambientproperties.h" -#include <QtGui> +#include <QtWidgets> QT_BEGIN_NAMESPACE diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp index 67bd10d..6a33e52 100644 --- a/tools/testcon/changeproperties.cpp +++ b/tools/testcon/changeproperties.cpp @@ -41,7 +41,7 @@ #include "changeproperties.h" -#include <QtGui> +#include <QtWidgets> #include <qt_windows.h> #include <ActiveQt/ActiveQt> diff --git a/tools/testcon/docuwindow.cpp b/tools/testcon/docuwindow.cpp index cb6adfd..3a8a413 100644 --- a/tools/testcon/docuwindow.cpp +++ b/tools/testcon/docuwindow.cpp @@ -143,6 +143,9 @@ void DocuWindow::save() void DocuWindow::print() { +#ifdef QT_NO_PRINTER + Q_UNIMPLEMENTED(); +#else QPrinter printer; if (printer.printerName().isEmpty()) { statusBar()->showMessage(tr("No printer installed"), 2000); @@ -156,6 +159,7 @@ void DocuWindow::print() } browser->document()->print(&printer); +#endif } QT_END_NAMESPACE diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp index e448427..b17b0b7 100644 --- a/tools/testcon/mainwindow.cpp +++ b/tools/testcon/mainwindow.cpp @@ -46,7 +46,7 @@ #include "controlinfo.h" #include "docuwindow.h" -#include <QtGui> +#include <QtWidgets> #include <qt_windows.h> #include <ActiveQt/ActiveQt> diff --git a/tools/testcon/testcon.pro b/tools/testcon/testcon.pro index 3540afb..b2d919a 100644 --- a/tools/testcon/testcon.pro +++ b/tools/testcon/testcon.pro @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG += qaxserver qaxserver_no_postlink qaxcontainer -# QT += qt3support +QT += widgets printsupport # ui_qaxselect.h INCLUDEPATH += $$QT.activeqt.sources/../../tools/container/debug \ |