Fixes: - use QT_NO_WEBKIT instead of QT_WEBKIT, USE_WEBKIT

Task:     - none
AutoTest: - compile test
Details:  - use QT_NO_WEBKIT instead of QT_WEBKIT, USE_WEBKIT

src/plugins/help/centralwidget.cpp

@@ -296,7 +296,7 @@ void CentralWidget::print()
     initPrinter();
 
     QPrintDialog *dlg = new QPrintDialog(printer, this);
-#if !defined(USE_WEBKIT)
+#if defined(QT_NO_WEBKIT)
     if (viewer->textCursor().hasSelection())
         dlg->addEnabledOption(QAbstractPrintDialog::PrintSelection);
 #endif
@@ -414,7 +414,7 @@ HelpViewer *CentralWidget::newEmptyTab()
     HelpViewer* viewer = new HelpViewer(helpEngine, this);
     viewer->installEventFilter(this);
     viewer->setFocus(Qt::OtherFocusReason);
-#if !defined(USE_WEBKIT)
+#if defined(QT_NO_WEBKIT)
     viewer->setDocumentTitle(tr("unknown"));
 #endif
     tabWidget->setCurrentIndex(tabWidget->addTab(viewer, tr("unknown")));
@@ -465,7 +465,7 @@ void CentralWidget::setTabTitle(const QUrl& url)
     int tab = lastTabPage;
     HelpViewer* viewer = currentHelpViewer();
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
     if (!viewer || viewer->source() != url) {
         QTabBar *tabBar = qFindChild<QTabBar*>(tabWidget);
         for (tab = 0; tab < tabBar->count(); ++tab) {
@@ -611,7 +611,7 @@ bool CentralWidget::find(const QString &txt, QTextDocument::FindFlags findFlags,
 {
     HelpViewer* viewer = currentHelpViewer();
 
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
     Q_UNUSED(incremental);
     if (viewer) {
         QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;

src/plugins/help/help.pro

@@ -30,7 +30,7 @@ FORMS += docsettingspage.ui \
     filtersettingspage.ui
 RESOURCES += help.qrc
 include(../../../shared/help/help.pri)
-contains(QT_CONFIG, webkit) { 
-    DEFINES += USE_WEBKIT
+
+contains(QT_CONFIG, webkit) {
     QT += webkit
 }

src/plugins/help/helpfindsupport.cpp

@@ -54,7 +54,7 @@ QString HelpFindSupport::currentFindString() const
     HelpViewer* viewer = m_centralWidget->currentHelpViewer();
     if (!viewer)
         return QString();
-#if defined(USE_WEBKIT)
+#if !defined(QT_NO_WEBKIT)
     return viewer->selectedText();
 #else
     return viewer->textCursor().selectedText();