summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-05-16 07:37:55 +0200
committerMontel Laurent <[email protected]>2016-05-16 07:37:55 +0200
commitf45a073f49cb4313f1b806ec273cbbeeda84a278 (patch)
tree5c50822ffedccadc590f72c91ae15ac1264048ac
parent6f88199bee3c986c6b895967a4490b88a21470d5 (diff)
Port QDebug
-rw-r--r--webengineviewer/src/print/autotests/CMakeLists.txt2
-rw-r--r--webengineviewer/src/print/printconfigurewidget.cpp5
-rw-r--r--webengineviewer/src/print/printwebengineviewjob.cpp1
-rw-r--r--webengineviewer/src/print/tests/printwebenginetest_gui.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/webengineviewer/src/print/autotests/CMakeLists.txt b/webengineviewer/src/print/autotests/CMakeLists.txt
index 67211a2..b90f127 100644
--- a/webengineviewer/src/print/autotests/CMakeLists.txt
+++ b/webengineviewer/src/print/autotests/CMakeLists.txt
@@ -31,7 +31,7 @@ ecm_add_test(printconfiguredialogtest.cpp ../printconfiguredialog.cpp ../printc
LINK_LIBRARIES Qt5::Test Qt5::Widgets Qt5::Gui KF5::I18n Qt5::PrintSupport
)
-ecm_add_test(printconfigurewidgettest.cpp ../printconfigurewidget.cpp
+ecm_add_test(printconfigurewidgettest.cpp ../printconfigurewidget.cpp ${print_autotest_SRCS}
TEST_NAME printconfigurewidgettest
NAME_PREFIX "webengineviewer-print-"
LINK_LIBRARIES Qt5::Test Qt5::Widgets Qt5::Gui KF5::I18n Qt5::PrintSupport
diff --git a/webengineviewer/src/print/printconfigurewidget.cpp b/webengineviewer/src/print/printconfigurewidget.cpp
index b3e86ee..cb55b3d 100644
--- a/webengineviewer/src/print/printconfigurewidget.cpp
+++ b/webengineviewer/src/print/printconfigurewidget.cpp
@@ -16,13 +16,13 @@
*/
#include "printconfigurewidget.h"
+#include "webengineviewer_debug.h"
#include <QHBoxLayout>
#include <KLocalizedString>
#include <QLabel>
#include <QToolButton>
#include <QPageSetupDialog>
#include <QPrinter>
-#include <QDebug>
using namespace WebEngineViewer;
@@ -62,9 +62,8 @@ void PrintConfigureWidget::slotSelectPrintLayout()
{
QPrinter printer;
- //TODO port to qCDebug
if (!printer.setPageLayout(mCurrentPageLayout)) {
- qDebug() << "Print Setup unsupported";
+ qCDebug(WEBENGINEVIEWER_LOG) << "Print Setup unsupported";
}
QPageSetupDialog dlg(&printer, this);
if (dlg.exec() != QDialog::Accepted)
diff --git a/webengineviewer/src/print/printwebengineviewjob.cpp b/webengineviewer/src/print/printwebengineviewjob.cpp
index 3ac68cd..e51bf15 100644
--- a/webengineviewer/src/print/printwebengineviewjob.cpp
+++ b/webengineviewer/src/print/printwebengineviewjob.cpp
@@ -18,7 +18,6 @@
#include "printwebengineviewjob.h"
#include "webengineviewer_debug.h"
#include <QWebEngineView>
-#include <QDebug>
using namespace WebEngineViewer;
diff --git a/webengineviewer/src/print/tests/printwebenginetest_gui.cpp b/webengineviewer/src/print/tests/printwebenginetest_gui.cpp
index e78170d..ffee216 100644
--- a/webengineviewer/src/print/tests/printwebenginetest_gui.cpp
+++ b/webengineviewer/src/print/tests/printwebenginetest_gui.cpp
@@ -21,12 +21,14 @@
#include "../printconfiguredialog.h"
#include "../printpreviewdialog.h"
+
#include <QApplication>
#include <QStandardPaths>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QPushButton>
#include <QWebEngineView>
+#include <QDebug>
PrintWebEngineTest_Gui::PrintWebEngineTest_Gui(QWidget *parent)
: QWidget(parent)