From a2951f4c74d44616e993e9e00a7a2b153995be5e Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 4 Oct 2011 18:05:26 +0200 Subject: [PATCH] Fixed build issues with copyright symlink and DEVELOPING define --- src/QupZilla.pro | 21 ++--- src/app/autosaver.h | 6 -- src/app/mainapplication.cpp | 6 +- src/app/qupzilla.h | 9 --- src/data/html/copyright | 149 +++++++++++++++++++++++++++++++++++- src/other/updater.cpp | 2 - 6 files changed, 162 insertions(+), 31 deletions(-) mode change 120000 => 100644 src/data/html/copyright diff --git a/src/QupZilla.pro b/src/QupZilla.pro index 43be4358d..0d91debf4 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -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 - diff --git a/src/app/autosaver.h b/src/app/autosaver.h index ea756dd4a..919710608 100644 --- a/src/app/autosaver.h +++ b/src/app/autosaver.h @@ -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 #include #include diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp index cede3f4a5..e40b30ce0 100644 --- a/src/app/mainapplication.cpp +++ b/src/app/mainapplication.cpp @@ -61,7 +61,7 @@ MainApplication::MainApplication(const QList &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 } diff --git a/src/app/qupzilla.h b/src/app/qupzilla.h index c6970fcef..611aeecc4 100644 --- a/src/app/qupzilla.h +++ b/src/app/qupzilla.h @@ -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 #include #include diff --git a/src/data/html/copyright b/src/data/html/copyright deleted file mode 120000 index 2bef70ecc..000000000 --- a/src/data/html/copyright +++ /dev/null @@ -1 +0,0 @@ -/home/david/Programování/Qt C++/QupZilla/COPYRIGHT \ No newline at end of file diff --git a/src/data/html/copyright b/src/data/html/copyright new file mode 100644 index 000000000..fcc902247 --- /dev/null +++ b/src/data/html/copyright @@ -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 . +* ============================================================ */ +----------------------------------------------------------- + AdBlock, LineEdit class and SqueezeLabel class: +----------------------------------------------------------- +* Copyright (c) 2008 - 2009, Benjamin C. Meyer +* +* 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 +* Copyright (C) 2010 by Matthieu Gicquel +* +* 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 . +* +* ============================================================ */ + +----------------------------------------------------------------------------- + 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 +----------------------------------------------------------------------------- diff --git a/src/other/updater.cpp b/src/other/updater.cpp index 36c6c5d12..9e2b8b27a 100644 --- a/src/other/updater.cpp +++ b/src/other/updater.cpp @@ -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()