Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

Removed QT_NO_DEBUG_OUTPUT define from headers, instead it is defined in

Browse Source 
.pro project file
This commit is contained in:
nowrep 2011-03-18 16:08:24 +01:00
parent 54a678fff8
commit c148836d10
40 changed files with 192 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ src0.9.7
*.deb
*.pro.user
license_template
Makefile

7
src/QupZilla.pro
View File

@ -4,7 +4,6 @@
#
#-------------------------------------------------
DESTDIR = ../bin
QT += core gui webkit sql network
TARGET = qupzilla
TEMPLATE = app
@ -12,11 +11,14 @@ VERSION = 0.90.8
TRANSLATIONS +=cs_CZ.ts\
sk_SK.ts
DESTDIR = ../bin
OBJECTS_DIR = ../build
MOC_DIR = ../build
RCC_DIR = ../build
UI_DIR = ../build
!CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT
INCLUDEPATH += 3rdparty\
app\
autofill\
@ -171,7 +173,8 @@ FORMS += \
rss/rsswidget.ui \
autofill/autofillnotification.ui \
rss/rssnotification.ui \
preferences/sslmanager.ui
preferences/sslmanager.ui \
other/clearprivatedata.ui
RESOURCES += \
data/icons.qrc \

4
src/app/autosaver.h
View File

@ -18,10 +18,6 @@
#ifndef AUTOSAVER_H
#define AUTOSAVER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#ifdef QT_NO_DEBUG
#ifdef DEVELOPING
#error "TRYING TO RELEASE WITH DEVELOPING FLAG"

4
src/app/commandlineoptions.h
View File

@ -18,10 +18,6 @@
#ifndef COMMANDLINEOPTIONS_H
#define COMMANDLINEOPTIONS_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QObject>
#include <iostream>

4
src/app/mainapplication.h
View File

@ -19,10 +19,6 @@
#define MAINAPPLICATION_H
#define mApp MainApplication::getInstance()
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QToolBar>
#include <QWebSettings>
#include <QUrl>

4
src/app/qupzilla.h
View File

@ -18,10 +18,6 @@
#ifndef QUPZILLA_H
#define QUPZILLA_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
//Comment for release building
#define DEVELOPING
//Check if i don't fuck anything

4
src/autofill/autofillmodel.h
View File

@ -18,10 +18,6 @@
#ifndef AUTOFILLMODEL_H
#define AUTOFILLMODEL_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QObject>
#include <QUrl>
#include <QNetworkRequest>

4
src/bookmarks/bookmarksmanager.h
View File

@ -18,10 +18,6 @@
#ifndef BOOKMARKSMANAGER_H
#define BOOKMARKSMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QTreeWidgetItem>
#include <QInputDialog>

3
src/bookmarks/bookmarksmodel.h
View File

@ -17,9 +17,6 @@
* ============================================================ */
#ifndef BOOKMARKSMODEL_H
#define BOOKMARKSMODEL_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QUrl>
#include <QSettings>

4
src/bookmarks/bookmarkstoolbar.h
View File

@ -18,10 +18,6 @@
#ifndef BOOKMARKSTOOLBAR_H
#define BOOKMARKSTOOLBAR_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QToolBar>
#include <QMenu>
#include <QToolButton>

3
src/bookmarks/bookmarkswidget.h
View File

@ -17,9 +17,6 @@
* ============================================================ */
#ifndef BOOKMARKSWIDGET_H
#define BOOKMARKSWIDGET_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QMenu>
#include <QFormLayout>

4
src/cookies/cookiejar.h
View File

@ -18,10 +18,6 @@
#ifndef COOKIEJAR_H
#define COOKIEJAR_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QNetworkCookieJar>
#include <QDebug>
#include <QSettings>

4
src/cookies/cookiemanager.h
View File

@ -18,10 +18,6 @@
#ifndef COOKIEMANAGER_H
#define COOKIEMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QTimer>
#include <QNetworkCookie>

4
src/downloads/downloadmanager.h
View File

@ -18,10 +18,6 @@
#ifndef DOWNLOADMANAGER_H
#define DOWNLOADMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDialog>
#include <QLabel>
#include <QFileIconProvider>

4
src/history/historymanager.h
View File

@ -18,10 +18,6 @@
#ifndef HISTORYMANAGER_H
#define HISTORYMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QTreeWidgetItem>
#include <QPointer>

4
src/history/historymodel.h
View File

@ -18,10 +18,6 @@
#ifndef HISTORYMODEL_H
#define HISTORYMODEL_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include "QtSql/QSqlDatabase"
#include "QSqlQuery"
#include "QDateTime"

4
src/main.cpp
View File

@ -15,9 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QtGui/QApplication>
#include <QTextCodec>

4
src/navigation/locationbar.h
View File

@ -18,10 +18,6 @@
#ifndef LOCATIONBAR_H
#define LOCATIONBAR_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QLabel>
#include <QCompleter>
#include <QStandardItemModel>

4
src/navigation/locationcompleter.h
View File

@ -18,10 +18,6 @@
#ifndef LOCATIONCOMPLETER_H
#define LOCATIONCOMPLETER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QCompleter>
#include <QDebug>
#include <QStringList>

4
src/navigation/websearchbar.h
View File

@ -18,10 +18,6 @@
#ifndef WEBSEARCHBAR_H
#define WEBSEARCHBAR_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QPushButton>
#include <QToolButton>

4
src/network/networkmanager.h
View File

@ -18,10 +18,6 @@
#ifndef NETWORKMANAGER_H
#define NETWORKMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QNetworkAccessManager>
#include <QDialogButtonBox>
#include <QBoxLayout>

4
src/network/networkmanagerproxy.h
View File

@ -18,10 +18,6 @@
#ifndef NETWORKMANAGERPROXY_H
#define NETWORKMANAGERPROXY_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QObject>
#include <QNetworkRequest>
#include <QNetworkAccessManager>

4
src/other/aboutdialog.h
View File

@ -18,10 +18,6 @@
#ifndef ABOUTDIALOG_H
#define ABOUTDIALOG_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDialog>
namespace Ui {

1
src/other/clearprivatedata.cpp
View File

@ -21,6 +21,7 @@
#include "mainapplication.h"
#include "networkmanager.h"
#include "clickablelabel.h"
#include "ui_clearprivatedata.h"
ClearPrivateData::ClearPrivateData(QupZilla* mainClass, QWidget* parent) :
QDialog(parent)

4
src/other/clearprivatedata.h
View File

@ -18,10 +18,6 @@
#ifndef CLEARPRIVATEDATA_H
#define CLEARPRIVATEDATA_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDialog>
#include <QBoxLayout>
#include <QDialogButtonBox>

184
src/other/clearprivatedata.ui Normal file
View File

@ -0,0 +1,184 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ClearPrivateData</class>
<widget class="QDialog" name="ClearPrivateData">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>321</width>
<height>274</height>
</rect>
</property>
<property name="windowTitle">
<string>Clear Recent History</string>
</property>
<property name="windowIcon">
<iconset resource="../data/icons.qrc">
<normaloff>:/icons/qupzilla.png</normaloff>:/icons/qupzilla.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="3">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Choose what you want to delete:</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="history">
<property name="text">
<string>Clear history</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="cookies">
<property name="text">
<string>Clear cookies</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QCheckBox" name="cache">
<property name="text">
<string>Clear cache</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="icons">
<property name="text">
<string>Clear icons</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="label">
<property name="styleSheet">
<string notr="true">color: blue; text-decoration: underline;</string>
</property>
<property name="text">
<string>Clear cookies from Adobe Flash Player</string>
</property>
</widget>
</item>
<item row="8" column="1" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>&lt;b&gt;Clear Recent History&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="icon">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../data/icons.qrc">:/icons/preferences/applications-system.png</pixmap>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<widget class="QComboBox" name="historyLength">
<item>
<property name="text">
<string>Today</string>
</property>
</item>
<item>
<property name="text">
<string>Week</string>
</property>
</item>
<item>
<property name="text">
<string>Month</string>
</property>
</item>
<item>
<property name="text">
<string>All</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>ClearPrivateData</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>ClearPrivateData</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

4
src/other/sourceviewer.h
View File

@ -18,10 +18,6 @@
#ifndef SOURCEVIEWER_H
#define SOURCEVIEWER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QBoxLayout>
#include <QTextEdit>

4
src/other/updater.h
View File

@ -18,10 +18,6 @@
#ifndef UPDATER_H
#define UPDATER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QObject>
#include <QSystemTrayIcon>
#include <QMenu>

3
src/plugins/pluginproxy.h
View File

@ -17,9 +17,6 @@
* ============================================================ */
#ifndef PLUGINPROXY_H
#define PLUGINPROXY_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDebug>
#include <QMenu>

3
src/plugins/plugins.h
View File

@ -17,9 +17,6 @@
* ============================================================ */
#ifndef PLUGINLOADER_H
#define PLUGINLOADER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QObject>
#include <QtPlugin>

4
src/preferences/autofillmanager.h
View File

@ -18,10 +18,6 @@
#ifndef AUTOFILLMANAGER_H
#define AUTOFILLMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QDialog>
#include <QTimer>

3
src/preferences/pluginslist.h
View File

@ -17,9 +17,6 @@
* ============================================================ */
#ifndef PLUGINSLIST_H
#define PLUGINSLIST_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QListWidgetItem>

4
src/preferences/preferences.h
View File

@ -18,10 +18,6 @@
#ifndef PREFERENCES_H
#define PREFERENCES_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDialog>
#include <QFileDialog>
#include <QListWidgetItem>

4
src/rss/rssmanager.h
View File

@ -18,10 +18,6 @@
#ifndef RSSMANAGER_H
#define RSSMANAGER_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWidget>
#include <QTreeWidget>
#include <QUrl>

4
src/webview/searchtoolbar.h
View File

@ -18,10 +18,6 @@
#ifndef SEARCHTOOLBAR_H
#define SEARCHTOOLBAR_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QToolBar>
#include <QLineEdit>
#include <QAction>

4
src/webview/siteinfo.h
View File

@ -18,10 +18,6 @@
#ifndef SITEINFO_H
#define SITEINFO_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDialog>
namespace Ui {

4
src/webview/tabbar.h
View File

@ -18,10 +18,6 @@
#ifndef TABBAR_H
#define TABBAR_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QTabBar>
#include <QAction>
#include <QDebug>

4
src/webview/tabwidget.h
View File

@ -18,10 +18,6 @@
#ifndef TABWIDGET_H
#define TABWIDGET_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include "webview.h"
#include "webtab.h"
#include <QTabWidget>

4
src/webview/webpage.h
View File

@ -18,10 +18,6 @@
#ifndef WEBPAGE_H
#define WEBPAGE_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QDebug>
#include <QUrl>
#include <QWebView>

4
src/webview/webview.h
View File

@ -18,10 +18,6 @@
#ifndef WEBVIEW_H
#define WEBVIEW_H
#if defined(QT_NO_DEBUG) & !defined(QT_NO_DEBUG_OUTPUT)
#define QT_NO_DEBUG_OUTPUT
#endif
#include <QWebView>
#include <QDebug>
#include <QTabWidget>