Make compile without webkit again

diff --git a/src/qtui/settingspages/appearancesettingspage.cpp b/src/qtui/settingspages/appearancesettingspage.cpp
index 8ab7ce3..70cae91 100644 (file)
--- a/src/qtui/settingspages/appearancesettingspage.cpp
+++ b/src/qtui/settingspages/appearancesettingspage.cpp
@@ -43,11 +43,6 @@ AppearanceSettingsPage::AppearanceSettingsPage(QWidget *parent)
   initStyleComboBox();
   initLanguageComboBox();
 
   initStyleComboBox();
   initLanguageComboBox();
 

-#ifndef HAVE_WEBKIT
-  ui.showWebPreview->hide();
-  ui.showWebPreview->setEnabled(false);
-#endif
-

   foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
     connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
   }
   foreach(QComboBox *comboBox, findChildren<QComboBox *>()) {
     connect(comboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(widgetHasChanged()));
   }

diff --git a/src/qtui/settingspages/chatviewsettingspage.cpp b/src/qtui/settingspages/chatviewsettingspage.cpp
index f9c2643..e2331a6 100644 (file)
--- a/src/qtui/settingspages/chatviewsettingspage.cpp
+++ b/src/qtui/settingspages/chatviewsettingspage.cpp
@@ -28,6 +28,11 @@ ChatViewSettingsPage::ChatViewSettingsPage(QWidget *parent)
 {
   ui.setupUi(this);
 
 {
   ui.setupUi(this);
 

+#ifndef HAVE_WEBKIT
+  ui.showWebPreview->hide();
+  ui.showWebPreview->setEnabled(false);
+#endif
+

   initAutoWidgets();
 }
 
   initAutoWidgets();
 }
 

diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui
index 1bbe072..625896c 100644 (file)
--- a/src/qtui/settingspages/chatviewsettingspage.ui
+++ b/src/qtui/settingspages/chatviewsettingspage.ui
@@ -100,7 +100,7 @@
     </widget>
    </item>
    <item>
     </widget>
    </item>
    <item>

-    <widget class="QCheckBox" name="showWebPreview_2">
+    <widget class="QCheckBox" name="showWebPreview">

      <property name="toolTip">
       <string>Show a website preview window when hovering the mouse over a web address</string>
      </property>
      <property name="toolTip">
       <string>Show a website preview window when hovering the mouse over a web address</string>
      </property>


@@ -758,7 +758,7 @@
  <tabstops>
   <tabstop>timestampFormat</tabstop>
   <tabstop>allowMircColors</tabstop>
  <tabstops>
   <tabstop>timestampFormat</tabstop>
   <tabstop>allowMircColors</tabstop>

-  <tabstop>showWebPreview_2</tabstop>
+  <tabstop>showWebPreview</tabstop>

   <tabstop>useCustomColors</tabstop>
   <tabstop>actionMsgColor</tabstop>
   <tabstop>channelMsgColor</tabstop>
   <tabstop>useCustomColors</tabstop>
   <tabstop>actionMsgColor</tabstop>
   <tabstop>channelMsgColor</tabstop>