diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-02 13:45:38 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-02 13:45:38 +0200 |
commit | 88e39d8654057451ddb79cdb6b9a279f937932b2 (patch) | |
tree | a7d30c84045850f0646bd7bfb81cf02779636ff0 /src/gui/util | |
parent | 6ac7f6afd0e38e38eb4dd0136e45832d47cd68fe (diff) |
remove Qt/Embedded.
Everybody use Lighhouse instead :)
Diffstat (limited to 'src/gui/util')
-rw-r--r-- | src/gui/util/qdesktopservices_qws.cpp | 93 | ||||
-rw-r--r-- | src/gui/util/qsystemtrayicon_qpa.cpp (renamed from src/gui/util/qsystemtrayicon_qws.cpp) | 0 | ||||
-rw-r--r-- | src/gui/util/util.pri | 2 |
3 files changed, 1 insertions, 94 deletions
diff --git a/src/gui/util/qdesktopservices_qws.cpp b/src/gui/util/qdesktopservices_qws.cpp deleted file mode 100644 index 324fa51a62..0000000000 --- a/src/gui/util/qdesktopservices_qws.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** 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. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qcoreapplication.h> -#include <qdir.h> - -QT_BEGIN_NAMESPACE - -static bool launchWebBrowser(const QUrl &url) -{ - Q_UNUSED(url); - qWarning("QDesktopServices::launchWebBrowser not implemented"); - return false; -} - -static bool openDocument(const QUrl &file) -{ - Q_UNUSED(file); - qWarning("QDesktopServices::openDocument not implemented"); - return false; -} - - -QString QDesktopServices::storageLocation(StandardLocation type) -{ - if (type == DataLocation) { - QString qwsDataHome = QLatin1String(qgetenv("QWS_DATA_HOME")); - if (qwsDataHome.isEmpty()) - qwsDataHome = QDir::homePath() + QLatin1String("/.qws/share"); - qwsDataHome += QLatin1String("/data/") - + QCoreApplication::organizationName() + QLatin1Char('/') - + QCoreApplication::applicationName(); - return qwsDataHome; - } - if (type == QDesktopServices::CacheLocation) { - QString qwsCacheHome = QLatin1String(qgetenv("QWS_CACHE_HOME")); - if (qwsCacheHome.isEmpty()) - qwsCacheHome = QDir::homePath() + QLatin1String("/.qws/cache/"); - qwsCacheHome += QCoreApplication::organizationName() + QLatin1Char('/') - + QCoreApplication::applicationName(); - return qwsCacheHome; - } - - qWarning("QDesktopServices::storageLocation %d not implemented", type); - return QString(); -} - -QString QDesktopServices::displayName(StandardLocation type) -{ - Q_UNUSED(type); - qWarning("QDesktopServices::displayName not implemented"); - return QString(); -} - -QT_END_NAMESPACE diff --git a/src/gui/util/qsystemtrayicon_qws.cpp b/src/gui/util/qsystemtrayicon_qpa.cpp index 48f8fe8922..48f8fe8922 100644 --- a/src/gui/util/qsystemtrayicon_qws.cpp +++ b/src/gui/util/qsystemtrayicon_qpa.cpp diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri index 2814a2d30a..46230b5be5 100644 --- a/src/gui/util/util.pri +++ b/src/gui/util/util.pri @@ -43,7 +43,7 @@ unix:x11 { embedded|qpa { SOURCES += \ - util/qsystemtrayicon_qws.cpp + util/qsystemtrayicon_qpa.cpp } !embedded:!qpa:!x11:mac { |