Commit 622cac50 authored by Friedemann Kleint's avatar Friedemann Kleint Committed by Eike Ziller

Move QtConcurrent library into Utils.

It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent def4b89e
......@@ -156,6 +156,7 @@ win32-msvc* {
}
qt:greaterThan(QT_MAJOR_VERSION, 4) {
contains(QT, core): QT += concurrent
contains(QT, gui): QT += widgets
contains(QT, declarative): QT += quick1
}
......@@ -6,7 +6,6 @@ QT += core gui
# because of dependencies of app
SUBDIRS = \
3rdparty \
qtconcurrent \
utils \
utils/process_stub.pro \
languageutils \
......
LIBS *= -l$$qtLibraryName(QtConcurrent)
TEMPLATE = lib
TARGET = QtConcurrent
DEFINES += BUILD_QTCONCURRENT
include(../../qtcreatorlibrary.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
HEADERS += \
qtconcurrent_global.h \
multitask.h \
runextensions.h
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 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 QTCONCURRENT_GLOBAL_H
#define QTCONCURRENT_GLOBAL_H
#include <QtCore/qglobal.h>
#if defined(BUILD_QTCONCURRENT)
# define QTCONCURRENT_EXPORT Q_DECL_EXPORT
#else
# define QTCONCURRENT_EXPORT Q_DECL_IMPORT
#endif
#endif // QTCONCURRENT_GLOBAL_H
......@@ -30,5 +30,5 @@
**
**************************************************************************/
#include "qtconcurrent/multitask.h"
#include "qtconcurrent/runextensions.h"
#include "multitask.h"
#include "runextensions.h"
......@@ -40,7 +40,7 @@
#include <QtCore/QCoreApplication>
#include <QtCore/QTextCodec>
#include <qtconcurrent/runextensions.h>
#include "runextensions.h"
using namespace Utils;
......
......@@ -33,7 +33,7 @@
#ifndef MULTITASK_H
#define MULTITASK_H
#include "qtconcurrent_global.h"
#include "utils_global.h"
#include "runextensions.h"
#include <QtCore/QObject>
......@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
namespace QtConcurrent {
class QTCONCURRENT_EXPORT MultiTaskBase : public QObject, public QRunnable
class QTCREATOR_UTILS_EXPORT MultiTaskBase : public QObject, public QRunnable
{
Q_OBJECT
protected slots:
......
......@@ -203,7 +203,9 @@ HEADERS += \
$$PWD/networkaccessmanager.h \
$$PWD/persistentsettings.h \
$$PWD/completingtextedit.h \
$$PWD/json.h
$$PWD/json.h \
$$PWD/multitask.h \
$$PWD/runextensions.h
FORMS += $$PWD/filewizardpage.ui \
$$PWD/projectintropage.ui \
......
......@@ -8,9 +8,7 @@ include(utils_dependencies.pri)
include(utils-lib.pri)
greaterThan(QT_MAJOR_VERSION, 4) {
QT += concurrent
} else {
lessThan(QT_MAJOR_VERSION, 5) {
# Needed for QtCore/private/qwineventnotifier_p.h
win32:include(../../private_headers.pri)
}
......
......@@ -45,7 +45,7 @@
#include <coreplugin/actionmanager/actioncontainer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectexplorer.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <QtCore/QtConcurrentRun>
#include <QtCore/QCoreApplication>
#include <QtCore/QSettings>
......
......@@ -4,7 +4,7 @@ DEFINES += CORE_LIBRARY
QT += network \
script \
sql
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport concurrent
greaterThan(QT_MAJOR_VERSION, 4): QT += printsupport
CONFIG += help
include(../../qtcreatorplugin.pri)
......
......@@ -49,7 +49,7 @@
#include <QtCore/QThreadPool>
#include <QtCore/QDebug>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
using namespace CPlusPlus;
using namespace CppTools;
......
......@@ -66,7 +66,7 @@
#include <QtCore/QtConcurrentMap>
#include <QtCore/QDir>
#include <QtGui/QApplication>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <functional>
......
......@@ -45,7 +45,7 @@
#include <QtCore/QtConcurrentRun>
#ifndef ICHECK_BUILD
# include <QtCore/QFutureSynchronizer>
# include <qtconcurrent/runextensions.h>
# include <utils/runextensions.h>
# include <texteditor/itexteditor.h>
# include <texteditor/basetexteditor.h>
# include <projectexplorer/project.h>
......
......@@ -61,7 +61,7 @@
#include <QtCore/QtConcurrentRun>
#include <QtCore/QFutureSynchronizer>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <find/ifindfilter.h>
#include <find/searchresultwindow.h>
......
......@@ -38,7 +38,7 @@
#include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/icore.h>
#include <find/textfindconstants.h>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <projectexplorer/project.h>
......
......@@ -34,7 +34,7 @@
#include <coreplugin/fileiconprovider.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <QtGui/QHBoxLayout>
#include <QtGui/QDialogButtonBox>
#include <QtGui/QTreeView>
......
......@@ -38,7 +38,7 @@
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <utils/filesearch.h>
using namespace Locator;
......
......@@ -2,7 +2,6 @@ TEMPLATE = lib
TARGET = Locator
DEFINES += LOCATOR_LIBRARY
include(../../qtcreatorplugin.pri)
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
include(locator_dependencies.pri)
HEADERS += locatorplugin.h \
commandlocator.h \
......
include(../../libs/qtconcurrent/qtconcurrent.pri)
include(../../plugins/coreplugin/coreplugin.pri)
......@@ -49,7 +49,7 @@
#include <coreplugin/progressmanager/futureprogress.h>
#include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <utils/qtcassert.h>
#include <QtCore/QSettings>
......
......@@ -47,7 +47,7 @@
#include <coreplugin/fileiconprovider.h>
#include <utils/filterlineedit.h>
#include <utils/qtcassert.h>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <QtCore/QtConcurrentRun>
#include <QtCore/QFileInfo>
......
......@@ -38,7 +38,7 @@
#include "directoryfilter.h"
#include <coreplugin/coreconstants.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <utils/qtcassert.h>
#include <QtCore/QCoreApplication>
......
......@@ -58,7 +58,7 @@
#include <QtCore/QHash>
#include <QtCore/QFutureWatcher>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <QtGui/QApplication>
#include <QtGui/QMainWindow>
......
......@@ -62,7 +62,7 @@
#include <QtCore/QDir>
#include <QtGui/QApplication>
#include <QtGui/QLabel>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <functional>
......
......@@ -45,7 +45,7 @@
#include <QtCore/QDebug>
#include <QtCore/QtConcurrentRun>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
using namespace QmlJS;
......
......@@ -58,7 +58,7 @@
#include <QtCore/QFileInfo>
#include <QtCore/QLibraryInfo>
#include <QtCore/QtConcurrentRun>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <QtCore/QTextStream>
#include <QtCore/QCoreApplication>
#include <QtCore/QTimer>
......
......@@ -59,7 +59,7 @@
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <QtCore/QtConcurrentRun>
#include <QtGui/QMessageBox>
......
......@@ -74,7 +74,7 @@
#include <QtGui/QMainWindow>
#include <QtGui/QMessageBox>
#include <QtGui/QPushButton>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
// Static cached data in struct Qt4NodeStaticData providing information and icons
// for file types and the project. Do some magic via qAddPostRoutine()
......
......@@ -64,7 +64,7 @@
#include <qtsupport/profilereader.h>
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionmanager.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <QtCore/QDebug>
#include <QtCore/QDir>
......
......@@ -42,7 +42,7 @@
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/runconfiguration.h>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <utils/qtcassert.h>
#include <QtGui/QDesktopServices>
......
......@@ -51,7 +51,7 @@
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <qtconcurrent/runextensions.h>
#include <utils/runextensions.h>
#include <QtCore/QDir>
#include <QtGui/QToolTip>
......
......@@ -44,7 +44,7 @@
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
#include <coreplugin/progressmanager/progressmanager.h>
#include <qtconcurrent/QtConcurrentTools>
#include <utils/QtConcurrentTools>
#include <QtCore/QtAlgorithms>
#include <QtCore/QtPlugin>
......
TARGET = UpdateInfo
TEMPLATE = lib
QT += network xml
greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent
HEADERS += updateinfoplugin.h \
updateinfobutton.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment