diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-09-20 18:36:42 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-02 16:28:58 +0000 |
commit | 104b4b528207f1c50e206e5c29b11e01e7e4a433 (patch) | |
tree | 4ec05ac859ceaaaef2a805b2cb220b991d710f68 /src | |
parent | 20cb71daf6814a1bbb3008e4fa239d935ac20a55 (diff) |
Remove qbs-qmltypes app
Now that we generate the qbs.qmltypes file during the build, it is no
longer needed.
Change-Id: I3180f55074b291d645abad65437d0cba4c80df25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/app/app.pro | 3 | ||||
-rw-r--r-- | src/app/apps.qbs | 1 | ||||
-rw-r--r-- | src/app/qbs-qmltypes/main.cpp | 77 | ||||
-rw-r--r-- | src/app/qbs-qmltypes/qbs-qmltypes.pro | 6 | ||||
-rw-r--r-- | src/app/qbs-qmltypes/qbs-qmltypes.qbs | 9 | ||||
-rw-r--r-- | src/packages/archive/archive.qbs | 1 |
6 files changed, 1 insertions, 96 deletions
diff --git a/src/app/app.pro b/src/app/app.pro index e38b69ba4..935ce1776 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -5,7 +5,6 @@ SUBDIRS =\ qbs-setup-android \ qbs-setup-toolchains \ qbs-setup-qt \ - config \ - qbs-qmltypes + config !isEmpty(QT.widgets.name):SUBDIRS += config-ui diff --git a/src/app/apps.qbs b/src/app/apps.qbs index bd4145339..1fcb15e43 100644 --- a/src/app/apps.qbs +++ b/src/app/apps.qbs @@ -6,7 +6,6 @@ Project { "config-ui/config-ui.qbs", "qbs/qbs.qbs", "qbs-create-project/qbs-create-project.qbs", - "qbs-qmltypes/qbs-qmltypes.qbs", "qbs-setup-android/qbs-setup-android.qbs", "qbs-setup-qt/qbs-setup-qt.qbs", "qbs-setup-toolchains/qbs-setup-toolchains.qbs", diff --git a/src/app/qbs-qmltypes/main.cpp b/src/app/qbs-qmltypes/main.cpp deleted file mode 100644 index a7cfebf6b..000000000 --- a/src/app/qbs-qmltypes/main.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qbs. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include "../shared/logging/consolelogger.h" - -#include <api/languageinfo.h> -#include <logging/translator.h> - -#include <QtCore/qcoreapplication.h> -#include <QtCore/qbytearray.h> - -#include <cstdlib> -#include <iostream> - -using qbs::Internal::Tr; - -int main(int argc, char *argv[]) -{ - QCoreApplication app(argc, argv); - ConsoleLogger::instance(); - - const QStringList args = app.arguments().mid(1); - if (args.count() == 1 && (args.first() == QLatin1String("--help") - || args.first() == QLatin1String("-h"))) { - qbsInfo() << Tr::tr("This tool dumps information about the QML types supported by qbs.\n" - "It takes no command-line parameters.\n" - "The output is intended to be processed by other tools and has " - "little value for humans."); - return EXIT_SUCCESS; - } - if (!args.isEmpty()) { - qbsWarning() << Tr::tr("You supplied command-line parameters, " - "but this tool does not use any."); - } - - qbs::LanguageInfo languageInfo; - const QByteArray typeData = languageInfo.qmlTypeInfo(); - - std::cout << typeData.constData(); - - return 0; -} diff --git a/src/app/qbs-qmltypes/qbs-qmltypes.pro b/src/app/qbs-qmltypes/qbs-qmltypes.pro deleted file mode 100644 index 9e344aa7c..000000000 --- a/src/app/qbs-qmltypes/qbs-qmltypes.pro +++ /dev/null @@ -1,6 +0,0 @@ -include(../app.pri) - -TARGET = qbs-qmltypes - -SOURCES += \ - main.cpp \ diff --git a/src/app/qbs-qmltypes/qbs-qmltypes.qbs b/src/app/qbs-qmltypes/qbs-qmltypes.qbs deleted file mode 100644 index f7368a1a8..000000000 --- a/src/app/qbs-qmltypes/qbs-qmltypes.qbs +++ /dev/null @@ -1,9 +0,0 @@ -import qbs 1.0 - -QbsApp { - name: "qbs-qmltypes" - files: [ - "main.cpp" - ] -} - diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs index 27216c6fb..0deb36bb7 100644 --- a/src/packages/archive/archive.qbs +++ b/src/packages/archive/archive.qbs @@ -8,7 +8,6 @@ QbsProduct { Depends { name: "qbs-config" } Depends { name: "qbs-config-ui" } Depends { name: "qbs-create-project" } - Depends { name: "qbs-qmltypes" } Depends { name: "qbs-setup-android" } Depends { name: "qbs-setup-qt" } Depends { name: "qbs-setup-toolchains" } |