More WITH_QTWEBKIT fixes

Conflicts:
	src/app/CMakeLists.txt

src/app/CMakeLists.txt

@@ -2,7 +2,6 @@ SET(QGIS_APP_SRCS
   qgisapp.cpp
   qgisappinterface.cpp
   qgisappstylesheet.cpp
-  qgsabout.cpp
   qgsapplayertreeviewmenuprovider.cpp
   qgssponsors.cpp
   qgsaddattrdialog.cpp
@@ -31,7 +30,6 @@ SET(QGIS_APP_SRCS
   qgsdecorationgriddialog.cpp
   qgsdxfexportdialog.cpp
   qgsformannotationdialog.cpp
-  qgshtmlannotationdialog.cpp
   qgsdelattrdialog.cpp
   qgsdiagramproperties.cpp
   qgsdisplayangle.cpp
@@ -62,7 +60,6 @@ SET(QGIS_APP_SRCS
   qgsmaptooledit.cpp
   qgsmaptoolfeatureaction.cpp
   qgsmaptoolformannotation.cpp
-  qgsmaptoolhtmlannotation.cpp
   qgsmaptoolpinlabels.cpp
   qgsmaptoolshowhidelabels.cpp
   qgsmaptoolidentifyaction.cpp
@@ -119,7 +116,6 @@ SET(QGIS_APP_SRCS
   composer/qgscomposer.cpp
   composer/qgscomposerarrowwidget.cpp
   composer/qgscomposerattributetablewidget.cpp
-  composer/qgscomposerhtmlwidget.cpp
   composer/qgscomposeritemwidget.cpp
   composer/qgscomposerlabelwidget.cpp
   composer/qgscomposerpicturewidget.cpp
@@ -157,11 +153,19 @@ SET(QGIS_APP_SRCS
   qgsnewspatialitelayerdialog.cpp
 )
 
+IF (WITH_QTWEBKIT)
+  SET(QGIS_APP_SRCS ${QGIS_APP_SRCS}
+    qgsabout.cpp
+    qgshtmlannotationdialog.cpp
+    qgsmaptoolhtmlannotation.cpp
+    composer/qgscomposerhtmlwidget.cpp
+  )
+ENDIF (WITH_QTWEBKIT)
+
 SET (QGIS_APP_MOC_HDRS
   qgisapp.h
   qgisappinterface.h
   qgisappstylesheet.h
-  qgsabout.h
   qgsaddattrdialog.h
   qgsaddjoindialog.h
   qgsaddtaborgroup.h
@@ -193,7 +197,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsfieldcalculator.h
   qgsfieldsproperties.h
   qgsformannotationdialog.h
-  qgshtmlannotationdialog.h
   qgsidentifyresultsdialog.h
   qgslabeldialog.h
   qgslabelengineconfigdialog.h
@@ -261,7 +264,6 @@ SET (QGIS_APP_MOC_HDRS
   composer/qgscomposer.h
   composer/qgscomposerarrowwidget.h
   composer/qgscomposerattributetablewidget.h
-  composer/qgscomposerhtmlwidget.h
   composer/qgscomposeritemwidget.h
   composer/qgscomposerlabelwidget.h
   composer/qgscomposerlegendwidget.h
@@ -292,7 +294,15 @@ SET (QGIS_APP_MOC_HDRS
   pluginmanager/qgspluginitemdelegate.h
 
   qgsnewspatialitelayerdialog.h
+)
+
+IF (WITH_QTWEBKIT)
+  SET( QGIS_APP_MOC_HDRS ${QGIS_APP_MOC_HDRS}
+    qgsabout.h
+    qgshtmlannotationdialog.h
+    composer/qgscomposerhtmlwidget.h
   )
+ENDIF (WITH_QTWEBKIT)
 
 SET (WITH_QWTPOLAR TRUE CACHE BOOL "Determines whether QwtPolar should be built")
 

src/app/composer/qgscomposer.cpp

@@ -31,8 +31,10 @@
 #include "qgscomposerarrowwidget.h"
 #include "qgscomposerattributetablewidget.h"
 #include "qgscomposerframe.h"
-#include "qgscomposerhtml.h"
-#include "qgscomposerhtmlwidget.h"
+#ifdef WITH_QTWEBKIT
+  #include "qgscomposerhtml.h"
+  #include "qgscomposerhtmlwidget.h"
+#endif
 #include "qgscomposerlabel.h"
 #include "qgscomposerlabelwidget.h"
 #include "qgscomposerlegend.h"
@@ -736,7 +738,9 @@ void QgsComposer::connectCompositionSlots()
 
   connect( mComposition, SIGNAL( selectedItemChanged( QgsComposerItem* ) ), this, SLOT( showItemOptions( QgsComposerItem* ) ) );
   connect( mComposition, SIGNAL( composerArrowAdded( QgsComposerArrow* ) ), this, SLOT( addComposerArrow( QgsComposerArrow* ) ) );
+#ifdef WITH_QTWEBKIT
   connect( mComposition, SIGNAL( composerHtmlFrameAdded( QgsComposerHtml*, QgsComposerFrame* ) ), this, SLOT( addComposerHtmlFrame( QgsComposerHtml*, QgsComposerFrame* ) ) );
+#endif
   connect( mComposition, SIGNAL( composerLabelAdded( QgsComposerLabel* ) ), this, SLOT( addComposerLabel( QgsComposerLabel* ) ) );
   connect( mComposition, SIGNAL( composerMapAdded( QgsComposerMap* ) ), this, SLOT( addComposerMap( QgsComposerMap* ) ) );
   connect( mComposition, SIGNAL( composerScaleBarAdded( QgsComposerScaleBar* ) ), this, SLOT( addComposerScaleBar( QgsComposerScaleBar* ) ) );
@@ -3365,7 +3369,7 @@ void QgsComposer::addComposerTableV2( QgsComposerAttributeTableV2 *table, QgsCom
   QgsComposerAttributeTableWidget* tWidget = new QgsComposerAttributeTableWidget( table, frame );
   mItemWidgetMap.insert( frame, tWidget );
 }
-
+#ifdef WITH_QTWEBKIT
 void QgsComposer::addComposerHtmlFrame( QgsComposerHtml* html, QgsComposerFrame* frame )
 {
   if ( !html )
@@ -3376,7 +3380,7 @@ void QgsComposer::addComposerHtmlFrame( QgsComposerHtml* html, QgsComposerFrame*
   QgsComposerHtmlWidget* hWidget = new QgsComposerHtmlWidget( html, frame );
   mItemWidgetMap.insert( frame, hWidget );
 }
-
+#endif
 void QgsComposer::deleteItem( QgsComposerItem* item )
 {
   QMap<QgsComposerItem*, QWidget*>::iterator it = mItemWidgetMap.find( item );

src/app/composer/qgscomposer.h

@@ -395,8 +395,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     /**Adds a composer table v2 to the item/widget map and creates a configuration widget*/
     void addComposerTableV2( QgsComposerAttributeTableV2* table, QgsComposerFrame* frame );
 
+#ifdef WITH_QTWEBKIT
     /**Adds composer html and creates a configuration widget*/
     void addComposerHtmlFrame( QgsComposerHtml* html, QgsComposerFrame* frame );
+#endif
 
     /**Removes item from the item/widget map and deletes the configuration widget. Does not delete the item itself*/
     void deleteItem( QgsComposerItem* item );

src/app/pluginmanager/qgspluginmanager.cpp

@@ -30,7 +30,9 @@
 #include <QActionGroup>
 #include <QTextStream>
 #include <QTimer>
-#include <QWebPage>
+#ifdef WITH_QTWEBKIT
+  #include <QWebPage>
+#endif
 #include <QDesktopServices>
 
 #include "qgis.h"
@@ -97,7 +99,10 @@ QgsPluginManager::QgsPluginManager( QWidget * parent, bool pluginsAreEnabled, Qt
 
   // Preset widgets
   leFilter->setFocus( Qt::MouseFocusReason );
+
+#ifdef WITH_QTWEBKIT
   wvDetails->page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+#endif
 
   // Don't restore the last used tab from QSettings
   mOptionsListWidget->setCurrentRow( 0 );
@@ -473,7 +478,7 @@ void QgsPluginManager::reloadModelData()
 
   if ( !mCurrentlyDisplayedPlugin.isEmpty() )
   {
-    wvDetails->setHtml( "" );
+    wvDetails->setText( "" );
     buttonInstall->setEnabled( false );
     buttonUninstall->setEnabled( false );
   }
@@ -839,7 +844,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem * item )
 
   html += "</body>";
 
-  wvDetails->setHtml( html );
+  wvDetails->setText( html );
 
   // Set buttonInstall text (and sometimes focus)
   buttonInstall->setDefault( false );
@@ -1084,7 +1089,7 @@ void QgsPluginManager::setCurrentTab( int idx )
       // tabInfoHTML += "<style>" + QgsApplication::reportStyleSheet() + "</style>";
       tabInfoHTML += it.value();
     }
-    wvDetails->setHtml( tabInfoHTML );
+    wvDetails->setText( tabInfoHTML );
 
     // disable buttons
     buttonInstall->setEnabled( false );
@@ -1151,7 +1156,7 @@ void QgsPluginManager::on_vwPlugins_doubleClicked( const QModelIndex & theIndex
 }
 
 
-
+#ifdef WITH_QTWEBKIT
 void QgsPluginManager::on_wvDetails_linkClicked( const QUrl & url )
 {
   if ( url.scheme() == "rpc2" )
@@ -1178,7 +1183,7 @@ void QgsPluginManager::on_wvDetails_linkClicked( const QUrl & url )
     QDesktopServices::openUrl( url );
   }
 }
-
+#endif
 
 
 void QgsPluginManager::on_leFilter_textChanged( QString theText )

src/app/pluginmanager/qgspluginmanager.h

@@ -116,8 +116,10 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
     //! Load/unload plugin by double click
     void on_vwPlugins_doubleClicked( const QModelIndex & index );
 
+#ifdef WITH_QTWEBKIT
     //! Handle click in the web wiew
     void on_wvDetails_linkClicked( const QUrl & url );
+#endif
 
     //! Update the filter when user changes the filter expression
     void on_leFilter_textChanged( QString theText );

src/app/qgisapp.cpp

@@ -99,7 +99,9 @@
 #include "qgisappstylesheet.h"
 #include "qgis.h"
 #include "qgisplugin.h"
-#include "qgsabout.h"
+#ifdef WITH_QTWEBKIT
+  #include "qgsabout.h"
+#endif
 #include "qgsapplayertreeviewmenuprovider.h"
 #include "qgsapplication.h"
 #include "qgsattributeaction.h"
@@ -1293,7 +1295,9 @@ void QgisApp::createActions()
   connect( mActionNeedSupport, SIGNAL( triggered() ), this, SLOT( supportProviders() ) );
   connect( mActionQgisHomePage, SIGNAL( triggered() ), this, SLOT( helpQgisHomePage() ) );
   connect( mActionCheckQgisVersion, SIGNAL( triggered() ), this, SLOT( checkQgisVersion() ) );
+#ifdef WITH_QTWEBKIT
   connect( mActionAbout, SIGNAL( triggered() ), this, SLOT( about() ) );
+#endif
   connect( mActionSponsors, SIGNAL( triggered() ), this, SLOT( sponsors() ) );
 
   connect( mActionShowPinnedLabels, SIGNAL( toggled( bool ) ), this, SLOT( showPinnedLabels( bool ) ) );
@@ -1979,7 +1983,9 @@ void QgisApp::setTheme( QString theThemeName )
   mActionDecreaseContrast->setIcon( QgsApplication::getThemeIcon( "/mActionDecreaseContrast.svg" ) );
   mActionZoomActualSize->setIcon( QgsApplication::getThemeIcon( "/mActionZoomNative.png" ) );
   mActionQgisHomePage->setIcon( QgsApplication::getThemeIcon( "/mActionQgisHomePage.png" ) );
+#ifdef WITH_QTWEBKIT
   mActionAbout->setIcon( QgsApplication::getThemeIcon( "/mActionHelpAbout.png" ) );
+#endif
   mActionSponsors->setIcon( QgsApplication::getThemeIcon( "/mActionHelpSponsors.png" ) );
   mActionDraw->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.svg" ) );
   mActionToggleEditing->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.svg" ) );
@@ -2212,8 +2218,10 @@ void QgisApp::createCanvasTools()
   mMapTools.mTextAnnotation->setAction( mActionTextAnnotation );
   mMapTools.mFormAnnotation = new QgsMapToolFormAnnotation( mMapCanvas );
   mMapTools.mFormAnnotation->setAction( mActionFormAnnotation );
+#ifdef WITH_QTWEBKIT
   mMapTools.mHtmlAnnotation = new QgsMapToolHtmlAnnotation( mMapCanvas );
   mMapTools.mHtmlAnnotation->setAction( mActionHtmlAnnotation );
+#endif
   mMapTools.mSvgAnnotation = new QgsMapToolSvgAnnotation( mMapCanvas );
   mMapTools.mSvgAnnotation->setAction( mActionSvgAnnotation );
   mMapTools.mAnnotation = new QgsMapToolAnnotation( mMapCanvas );
@@ -2724,6 +2732,7 @@ void QgisApp::sponsors()
   sponsors->activateWindow();
 }
 
+#ifdef WITH_QTWEBKIT
 void QgisApp::about()
 {
   static QgsAbout *abt = NULL;
@@ -2789,6 +2798,7 @@ void QgisApp::about()
   abt->raise();
   abt->activateWindow();
 }
+#endif
 
 void QgisApp::addLayerDefinition()
 {
@@ -5715,13 +5725,14 @@ bool QgisApp::loadAnnotationItemsFromProject( const QDomDocument& doc )
     QgsFormAnnotationItem* newFormItem = new QgsFormAnnotationItem( mMapCanvas );
     newFormItem->readXML( doc, formItemList.at( i ).toElement() );
   }
-
+#ifdef WITH_QTWEBKIT
   QDomNodeList htmlItemList = doc.elementsByTagName( "HtmlAnnotationItem" );
   for ( int i = 0; i < htmlItemList.size(); ++i )
   {
     QgsHtmlAnnotationItem* newHtmlItem = new QgsHtmlAnnotationItem( mMapCanvas );
     newHtmlItem->readXML( doc, htmlItemList.at( i ).toElement() );
   }
+#endif
 
   QDomNodeList svgItemList = doc.elementsByTagName( "SVGAnnotationItem" );
   for ( int i = 0; i < svgItemList.size(); ++i )

src/app/qgisapp.h

@@ -380,6 +380,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionHelpAPI() { return mActionHelpAPI; }
     QAction *actionQgisHomePage() { return mActionQgisHomePage; }
     QAction *actionCheckQgisVersion() { return mActionCheckQgisVersion; }
+
     QAction *actionAbout() { return mActionAbout; }
     QAction *actionSponsors() { return mActionSponsors; }
 
@@ -666,8 +667,11 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 
     //! QGis Sponsors
     void sponsors();
+
+#ifdef WITH_QTWEBKIT
     //! About QGis
     void about();
+#endif
     //! Add a raster layer to the map (will prompt user for file name using dlg )
     void addRasterLayer();
     //#ifdef HAVE_POSTGRESQL