diff options
| -rw-r--r-- | installerfw.pri | 4 | ||||
| -rw-r--r-- | src/libs/installer/init.cpp | 5 | ||||
| -rw-r--r-- | src/libs/installer/installer.pro | 2 | ||||
| -rw-r--r-- | src/libs/installer/registerdocumentationoperation.cpp | 153 | ||||
| -rw-r--r-- | src/libs/installer/registerdocumentationoperation.h | 54 |
5 files changed, 1 insertions, 217 deletions
diff --git a/installerfw.pri b/installerfw.pri index 86618d6d3..b5d6d7e55 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -51,11 +51,9 @@ equals(TEMPLATE, app):LIBS += -linstaller unix:!macx:LIBS += -lutil macx:LIBS += -framework Carbon -framework Security -CONFIG += help uitools +CONFIG += uitools CONFIG(static, static|shared) { - QTPLUGIN += qsqlite QT += script network xml - DEFINES += USE_STATIC_SQLITE_PLUGIN } GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD) diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 463628c03..ee5c03146 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -54,7 +54,6 @@ #include "replaceoperation.h" #include "licenseoperation.h" #include "linereplaceoperation.h" -#include "registerdocumentationoperation.h" #include "registerqtoperation.h" #include "registerqtv2operation.h" #include "registerqtv23operation.h" @@ -152,9 +151,6 @@ static void initArchives() static void initResources() { Q_INIT_RESOURCE(patch_file_lists); -#if defined(USE_STATIC_SQLITE_PLUGIN) - Q_IMPORT_PLUGIN(qsqlite); // RegisterDocumentationOperation needs this -#endif } static void messageHandler(QtMsgType type, const char *msg) @@ -211,7 +207,6 @@ void QInstaller::init() // added for NDK factory.registerUpdateOperation<SimpleMoveFileOperation>(QLatin1String("SimpleMoveFile")); factory.registerUpdateOperation<CopyDirectoryOperation>(QLatin1String("CopyDirectory")); - factory.registerUpdateOperation<RegisterDocumentationOperation>(QLatin1String("RegisterDocumentation")); factory.registerUpdateOperation<RegisterQtInCreatorOperation>(QLatin1String("RegisterQtInCreator")); factory.registerUpdateOperation<RegisterQtInCreatorV2Operation>(QLatin1String("RegisterQtInCreatorV2")); factory.registerUpdateOperation<RegisterQtInCreatorV23Operation>(QLatin1String("RegisterQtInCreatorV23")); diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index f21394ae2..1b68cb132 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -40,7 +40,6 @@ HEADERS += packagemanagercore.h \ setimportspathonqtcoreoperation.h \ replaceoperation.h \ linereplaceoperation.h \ - registerdocumentationoperation.h \ registerqtoperation.h \ registertoolchainoperation.h \ registerqtv2operation.h \ @@ -114,7 +113,6 @@ SOURCES += packagemanagercore.cpp \ setimportspathonqtcoreoperation.cpp \ replaceoperation.cpp \ linereplaceoperation.cpp \ - registerdocumentationoperation.cpp \ registerqtoperation.cpp \ registertoolchainoperation.cpp \ registerqtv2operation.cpp \ diff --git a/src/libs/installer/registerdocumentationoperation.cpp b/src/libs/installer/registerdocumentationoperation.cpp deleted file mode 100644 index df0007b4a..000000000 --- a/src/libs/installer/registerdocumentationoperation.cpp +++ /dev/null @@ -1,153 +0,0 @@ -/************************************************************************** -** -** This file is part of Installer Framework -** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** 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. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#include "registerdocumentationoperation.h" - -#include <QSettings> -#include <QtHelp/QHelpEngine> -#include <QString> -#include <QFileInfo> -#include <QDir> -#include <QtCore/QDebug> - -using namespace QInstaller; - -RegisterDocumentationOperation::RegisterDocumentationOperation() -{ - setName(QLatin1String("RegisterDocumentation")); -} - -void RegisterDocumentationOperation::backup() -{ -} - -// get the right filename of the qsettingsfile (root/user) -static QString settingsFileName() -{ - #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) - // If the system settings are writable, don't touch the user settings. - // The reason is that a doc registered while running with sudo could otherwise create - // a root-owned configuration file a user directory. - QScopedPointer<QSettings> settings(new QSettings(QSettings::IniFormat, - QSettings::SystemScope, QLatin1String("Nokia"), QLatin1String("QtCreator"))); - - // QSettings::isWritable isn't reliable enough in 4.7, determine writability experimentally - settings->setValue(QLatin1String("iswritable"), QLatin1String("accomplished")); - settings->sync(); - if (settings->status() == QSettings::NoError) { - // we can use the system settings - if (settings->contains(QLatin1String("iswritable"))) - settings->remove(QLatin1String("iswritable")); - } else { - // we have to use user settings - settings.reset(new QSettings(QSettings::IniFormat, QSettings::UserScope, - QLatin1String("Nokia"), QLatin1String("QtCreator"))); - } - - #else - QScopedPointer<QSettings> settings(new QSettings(QSettings::IniFormat, - QSettings::UserScope, QLatin1String("Nokia"), QLatin1String("QtCreator"))); - #endif - return settings->fileName(); -} - -bool RegisterDocumentationOperation::performOperation() -{ - const QStringList args = arguments(); - - if (args.count() != 1) { - setError(InvalidArguments); - setErrorString(tr("Invalid arguments in %0: %1 arguments given, 1 expected.") - .arg(name()).arg(args.count())); - return false; - } - const QString helpFile = args.at(0); - - QFileInfo fileInfo(settingsFileName()); - QDir settingsDir(fileInfo.absolutePath() + QLatin1String("/qtcreator")); - - if (!settingsDir.exists()) - settingsDir.mkpath(settingsDir.absolutePath()); - const QString collectionFile = settingsDir.absolutePath() + QLatin1String("/helpcollection.qhc"); - - if (!QFileInfo(helpFile).exists()) { - setError(UserDefinedError); - setErrorString(tr("Could not register help file %1: File not found.").arg(helpFile)); - return false; - } - - QHelpEngineCore help(collectionFile); - QString oldData = help.customValue(QLatin1String("AddedDocs")).toString(); - if (!oldData.isEmpty()) - oldData.append(QLatin1Char(';')); - const QString newData = oldData + QFileInfo(helpFile).absoluteFilePath(); - if (!help.setCustomValue(QLatin1String("AddedDocs"), newData)) { - qWarning() << "Can't register doc file:" << helpFile << help.error(); -// setError(UserDefinedError); -// setErrorString(help.error()); -// return false; - } - return true; -} - -bool RegisterDocumentationOperation::undoOperation() -{ - const QString helpFile = arguments().first(); - - QFileInfo fileInfo(settingsFileName()); - QDir settingsDir(fileInfo.absolutePath() + QLatin1String("/qtcreator")); - - if (!settingsDir.exists()) - settingsDir.mkpath(settingsDir.absolutePath()); - const QString collectionFile = settingsDir.absolutePath() + QLatin1String("/helpcollection.qhc"); - - if (!QFileInfo( helpFile ).exists()) { - setError ( UserDefinedError ); - setErrorString( tr("Could not unregister help file %1: File not found.").arg( helpFile ) ); - return false; - } - - QHelpEngineCore help(collectionFile); - const QString nsName = help.namespaceName(helpFile); - return help.unregisterDocumentation(nsName); -} - -bool RegisterDocumentationOperation::testOperation() -{ - return true; -} - -Operation *RegisterDocumentationOperation::clone() const -{ - return new RegisterDocumentationOperation(); -} - diff --git a/src/libs/installer/registerdocumentationoperation.h b/src/libs/installer/registerdocumentationoperation.h deleted file mode 100644 index 5fd3a9688..000000000 --- a/src/libs/installer/registerdocumentationoperation.h +++ /dev/null @@ -1,54 +0,0 @@ -/************************************************************************** -** -** This file is part of Installer Framework -** -** Copyright (c) 2010-2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** 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. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#ifndef REGISTERDOCUMENTATIONOPERATION_H -#define REGISTERDOCUMENTATIONOPERATION_H - -#include "qinstallerglobal.h" - -namespace QInstaller { - -class RegisterDocumentationOperation : public Operation -{ -public: - RegisterDocumentationOperation(); - - void backup(); - bool performOperation(); - bool undoOperation(); - bool testOperation(); - Operation *clone() const; -}; - -} // namespace QInstaller - -#endif // REGISTERDOCUMENTATIONOPERATION_H |