Fix building with Qt 4.7

remotes/origin/falkon
David Rosca 12 years ago
parent cf044356fa
commit eec67d1941
  1. 2
      src/lib/app/browserwindow.cpp
  2. 2
      src/lib/navigation/completer/locationcompleterdelegate.cpp
  3. 2
      src/lib/navigation/completer/locationcompleterrefreshjob.cpp
  4. 16
      src/lib/other/clearprivatedata.ui
  5. 2
      src/lib/tools/buttonwithmenu.h

@ -66,6 +66,8 @@
#include "historymenu.h"
#include "mainmenu.h"
#include <algorithm>
#include <QKeyEvent>
#include <QSplitter>
#include <QStatusBar>

@ -21,6 +21,8 @@
#include "iconprovider.h"
#include "qzsettings.h"
#include <algorithm>
#include <QPainter>
#include <QApplication>
#include <QMouseEvent>

@ -24,6 +24,8 @@
#include "bookmarks.h"
#include "qztools.h"
#include <algorithm>
#include <QDateTime>
#if QT_VERSION >= 0x050000

@ -21,7 +21,7 @@
</property>
</widget>
</item>
<item row="0" column="1" alignment="Qt::AlignRight">
<item row="0" column="1">
<widget class="QLabel" name="icon">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -54,7 +54,7 @@
</property>
</widget>
</item>
<item row="2" column="1" alignment="Qt::AlignRight">
<item row="2" column="1">
<widget class="QComboBox" name="historyLength">
<property name="enabled">
<bool>false</bool>
@ -121,7 +121,7 @@
</property>
</widget>
</item>
<item row="6" column="1" alignment="Qt::AlignRight">
<item row="6" column="1">
<widget class="QPushButton" name="editCookies">
<property name="text">
<string>Edit cookies</string>
@ -145,7 +145,7 @@
</property>
</widget>
</item>
<item row="8" column="1" alignment="Qt::AlignRight">
<item row="8" column="1">
<widget class="QPushButton" name="editNotifs">
<property name="text">
<string>Edit permissions</string>
@ -159,14 +159,14 @@
</property>
</widget>
</item>
<item row="9" column="1" alignment="Qt::AlignRight">
<item row="9" column="1">
<widget class="QPushButton" name="editGeoloc">
<property name="text">
<string>Edit permissions</string>
</property>
</widget>
</item>
<item row="10" column="1" alignment="Qt::AlignRight">
<item row="10" column="1">
<widget class="QPushButton" name="optimizeDb">
<property name="text">
<string>Optimize database</string>
@ -187,7 +187,7 @@
</property>
</widget>
</item>
<item row="12" column="0" alignment="Qt::AlignLeft">
<item row="12" column="0">
<widget class="QPushButton" name="clear">
<property name="minimumSize">
<size>
@ -200,7 +200,7 @@
</property>
</widget>
</item>
<item row="12" column="1" alignment="Qt::AlignRight">
<item row="12" column="1">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>

@ -18,6 +18,8 @@
#ifndef BUTTONWITHMENU_H
#define BUTTONWITHMENU_H
#include <QVariant>
#include "toolbutton.h"
#include "qzcommon.h"

Loading…
Cancel
Save