mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 02:36:34 +01:00
Fixed build issues with copyright symlink and DEVELOPING define
This commit is contained in:
nowrep
parent
c23f3f8b5d
commit
a2951f4c74
@ -7,9 +7,7 @@
|
||||
QT += core gui webkit sql network
|
||||
TARGET = qupzilla
|
||||
TEMPLATE = app
|
||||
VERSION = 1.00.b4
|
||||
TRANSLATIONS +=cs_CZ.ts\
|
||||
sk_SK.ts
|
||||
VERSION = 1.00.rc1
|
||||
|
||||
DESTDIR = ../bin
|
||||
OBJECTS_DIR = ../build
|
||||
@ -21,6 +19,15 @@ UI_DIR = ../build
|
||||
##Some bug in qtsingleapp / qvector template
|
||||
!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT
|
||||
|
||||
unix:QT += dbus
|
||||
win32:DEFINES += W7API
|
||||
win32:RC_FILE = appicon.rc
|
||||
win32:LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
|
||||
|
||||
|
||||
TRANSLATIONS +=cs_CZ.ts\
|
||||
sk_SK.ts
|
||||
|
||||
INCLUDEPATH += 3rdparty\
|
||||
app\
|
||||
autofill\
|
||||
@ -273,16 +280,10 @@ RESOURCES += \
|
||||
data/html.qrc
|
||||
|
||||
OTHER_FILES += \
|
||||
appicon.rc \
|
||||
themes/default/main.css
|
||||
appicon.rc
|
||||
|
||||
include(3rdparty/qtsingleapplication.pri)
|
||||
|
||||
unix:QT += dbus
|
||||
win32:DEFINES += W7API
|
||||
win32:RC_FILE = appicon.rc
|
||||
win32:LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -18,12 +18,6 @@
|
||||
#ifndef AUTOSAVER_H
|
||||
#define AUTOSAVER_H
|
||||
|
||||
#ifdef QT_NO_DEBUG
|
||||
#ifdef DEVELOPING
|
||||
#error "TRYING TO RELEASE WITH DEVELOPING FLAG"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <QObject>
|
||||
#include <QBasicTimer>
|
||||
#include <QDebug>
|
||||
|
||||
@ -61,7 +61,7 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
|
||||
, m_isRestoring(false)
|
||||
{
|
||||
setOverrideCursor(Qt::WaitCursor);
|
||||
#if defined(Q_WS_X11) & !defined(DEVELOPING)
|
||||
#if defined(Q_WS_X11) & !defined(NO_SYSTEM_DATAPATH)
|
||||
DATADIR = "/usr/share/qupzilla/";
|
||||
#else
|
||||
DATADIR = qApp->applicationDirPath()+"/";
|
||||
@ -623,7 +623,7 @@ void MainApplication::checkProfile(QString path)
|
||||
return;
|
||||
}
|
||||
versionFile.close();
|
||||
#ifdef DEVELOPING
|
||||
#ifdef UNRELEASED_BUILD
|
||||
return;
|
||||
#endif
|
||||
//Starting profile migration manager
|
||||
@ -656,7 +656,7 @@ bool MainApplication::checkSettingsDir()
|
||||
return true;
|
||||
}
|
||||
versionFile.close();
|
||||
#ifdef DEVELOPING
|
||||
#ifdef UNRELEASED_BUILD
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -18,15 +18,6 @@
|
||||
#ifndef QUPZILLA_H
|
||||
#define QUPZILLA_H
|
||||
|
||||
//Comment for release building
|
||||
#define DEVELOPING
|
||||
|
||||
#ifdef QT_NO_DEBUG
|
||||
#ifdef DEVELOPING
|
||||
#error "TRYING TO RELEASE WITH DEVELOPING FLAG"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QMenuBar>
|
||||
#include <QTranslator>
|
||||
|
||||
@ -1 +0,0 @@
|
||||
/home/david/Programování/Qt C++/QupZilla/COPYRIGHT
|
||||
148
src/data/html/copyright
Normal file
148
src/data/html/copyright
Normal file
@ -0,0 +1,148 @@
|
||||
/* ============================================================
|
||||
* QupZilla - WebKit based browser
|
||||
* Copyright (C) 2010-2011 nowrep
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
* ============================================================ */
|
||||
-----------------------------------------------------------
|
||||
AdBlock, LineEdit class and SqueezeLabel class:
|
||||
-----------------------------------------------------------
|
||||
* Copyright (c) 2008 - 2009, Benjamin C. Meyer <ben@meyerhome.net>
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the Benjamin Meyer nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
QtSingleApplication class:
|
||||
-----------------------------------------------------------------------------
|
||||
**
|
||||
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of a Qt Solutions component.
|
||||
**
|
||||
** Commercial Usage
|
||||
** Licensees holding valid Qt Commercial licenses may use this file in
|
||||
** accordance with the Qt Solutions Commercial License Agreement provided
|
||||
** with the Software or, alternatively, in accordance with the terms
|
||||
** contained in a written agreement between you and Nokia.
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
** General Public License version 2.1 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.LGPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU Lesser General Public License version 2.1 requirements
|
||||
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain
|
||||
** additional rights. These rights are described in the Nokia Qt LGPL
|
||||
** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
|
||||
** package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3.0 as published by the Free Software
|
||||
** Foundation and appearing in the file LICENSE.GPL included in the
|
||||
** packaging of this file. Please review the following information to
|
||||
** ensure the GNU General Public License version 3.0 requirements will be
|
||||
** met: http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Please note Third Party Software included with Qt Solutions may impose
|
||||
** additional restrictions and it is the user's responsibility to ensure
|
||||
** that they have met the licensing requirements of the GPL, LGPL, or Qt
|
||||
** Solutions Commercial license and the relevant license of the Third
|
||||
** Party Software they are using.
|
||||
**
|
||||
** If you are unsure which license is appropriate for your use, please
|
||||
** contact Nokia at qt-info@nokia.com.
|
||||
**
|
||||
---------------------------------------------------------------------------
|
||||
Click2Flash plugin:
|
||||
---------------------------------------------------------------------------
|
||||
/* ============================================================
|
||||
*
|
||||
* Copyright (C) 2009 by Benjamin C. Meyer <ben@meyerhome.net>
|
||||
* Copyright (C) 2010 by Matthieu Gicquel <matgic78@gmail.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation; either version 2 of
|
||||
* the License or (at your option) version 3 or any later version
|
||||
* accepted by the membership of KDE e.V. (or its successor approved
|
||||
* by the membership of KDE e.V.), which shall act as a proxy
|
||||
* defined in Section 14 of version 3 of the license.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* ============================================================ */
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
EcWin7 class:
|
||||
---------------------------------------------------------------------------
|
||||
/* EcWin7 - Support library for integrating Windows 7 taskbar features
|
||||
* into any Qt application
|
||||
* Copyright (C) 2010 Emanuele Colombo
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
QtWin class from
|
||||
http://labs.qt.nokia.com/2009/09/15/using-blur-behind-on-windows/
|
||||
-----------------------------------------------------------------------------
|
||||
In application are used also some icons from Faenza icon set, which are
|
||||
licensed under the GNU/GPL license.
|
||||
More info at http://tiheum.deviantart.com/art/Faenza-Icons-173323228
|
||||
-----------------------------------------------------------------------------
|
||||
@ -24,9 +24,7 @@ Updater::Updater(QupZilla* mainClass, QObject* parent) :
|
||||
QObject(parent)
|
||||
,p_QupZilla(mainClass)
|
||||
{
|
||||
#ifndef DEVELOPING
|
||||
QTimer::singleShot(60*1000, this, SLOT(start()) ); //Start checking after 1 minute
|
||||
#endif
|
||||
}
|
||||
|
||||
void Updater::start()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user