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: Eike Ziller <eike.ziller@nokia.com>
2012-02-09 09:35:03 +01:00
parent def4b89e7d
commit 622cac50f4
36 changed files with 32 additions and 92 deletions
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -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
 }
--- a/src/libs/libs.pro
+++ b/src/libs/libs.pro
@@ -6,7 +6,6 @@ QT += core gui
 # because of dependencies of app
 SUBDIRS   = \
    3rdparty \
-    qtconcurrent \
    utils \
    utils/process_stub.pro \
    languageutils \
--- a/src/libs/qtconcurrent/qtconcurrent.pri
+++ b/src/libs/qtconcurrent/qtconcurrent.pri
@@ -1 +0,0 @@
-LIBS *= -l$$qtLibraryName(QtConcurrent)
--- a/src/libs/qtconcurrent/qtconcurrent.pro
+++ b/src/libs/qtconcurrent/qtconcurrent.pro
@@ -1,12 +0,0 @@
-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
--- a/src/libs/qtconcurrent/qtconcurrent_global.h
+++ b/src/libs/qtconcurrent/qtconcurrent_global.h
@@ -1,44 +0,0 @@
-/**************************************************************************
-**
-** 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
--- a/src/libs/qtconcurrent/QtConcurrentTools
+++ b/src/libs/qtconcurrent/QtConcurrentTools
@@ -30,5 +30,5 @@
 **
 **************************************************************************/

-#include "qtconcurrent/multitask.h"
-#include "qtconcurrent/runextensions.h"
+#include "multitask.h"
+#include "runextensions.h"
--- a/src/libs/utils/filesearch.cpp
+++ b/src/libs/utils/filesearch.cpp
@@ -40,7 +40,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTextCodec>

-#include <qtconcurrent/runextensions.h>
+#include "runextensions.h"

 using namespace Utils;

--- a/src/libs/qtconcurrent/multitask.h
+++ b/src/libs/qtconcurrent/multitask.h
@@ -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:
--- a/src/libs/qtconcurrent/runextensions.h
+++ b/src/libs/qtconcurrent/runextensions.h
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -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 \
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -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)
 }
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -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>
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -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)
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -49,7 +49,7 @@
 #include <QtCore/QThreadPool>
 #include <QtCore/QDebug>

-#include <qtconcurrent/runextensions.h>
+#include <utils/runextensions.h>

 using namespace CPlusPlus;
 using namespace CppTools;
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -66,7 +66,7 @@
 #include <QtCore/QtConcurrentMap>
 #include <QtCore/QDir>
 #include <QtGui/QApplication>
-#include <qtconcurrent/runextensions.h>
+#include <utils/runextensions.h>

 #include <functional>

--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -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>
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -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>
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -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>
--- a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp
+++ b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp
@@ -34,7 +34,7 @@

 #include <coreplugin/fileiconprovider.h>

-#include <qtconcurrent/QtConcurrentTools>
+#include <utils/QtConcurrentTools>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QTreeView>
--- a/src/plugins/locator/directoryfilter.cpp
+++ b/src/plugins/locator/directoryfilter.cpp
@@ -38,7 +38,7 @@
 #include <QtGui/QFileDialog>
 #include <QtGui/QMessageBox>

-#include <qtconcurrent/QtConcurrentTools>
+#include <utils/QtConcurrentTools>
 #include <utils/filesearch.h>

 using namespace Locator;
--- a/src/plugins/locator/locator.pro
+++ b/src/plugins/locator/locator.pro
@@ -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 \
--- a/src/plugins/locator/locator_dependencies.pri
+++ b/src/plugins/locator/locator_dependencies.pri
@@ -1,2 +1 @@
-include(../../libs/qtconcurrent/qtconcurrent.pri)
 include(../../plugins/coreplugin/coreplugin.pri)
--- a/src/plugins/locator/locatorplugin.cpp
+++ b/src/plugins/locator/locatorplugin.cpp
@@ -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>
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -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>
--- a/src/plugins/locator/settingspage.cpp
+++ b/src/plugins/locator/settingspage.cpp
@@ -38,7 +38,7 @@
 #include "directoryfilter.h"

 #include <coreplugin/coreconstants.h>
-#include <qtconcurrent/QtConcurrentTools>
+#include <utils/QtConcurrentTools>
 #include <utils/qtcassert.h>

 #include <QtCore/QCoreApplication>
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -58,7 +58,7 @@
 #include <QtCore/QHash>
 #include <QtCore/QFutureWatcher>

-#include <qtconcurrent/QtConcurrentTools>
+#include <utils/QtConcurrentTools>

 #include <QtGui/QApplication>
 #include <QtGui/QMainWindow>
--- a/src/plugins/qmljseditor/qmljsfindreferences.cpp
+++ b/src/plugins/qmljseditor/qmljsfindreferences.cpp
@@ -62,7 +62,7 @@
 #include <QtCore/QDir>
 #include <QtGui/QApplication>
 #include <QtGui/QLabel>
-#include <qtconcurrent/runextensions.h>
+#include <utils/runextensions.h>

 #include <functional>

--- a/src/plugins/qmljseditor/qmltaskmanager.cpp
+++ b/src/plugins/qmljseditor/qmltaskmanager.cpp
@@ -45,7 +45,7 @@

 #include <QtCore/QDebug>
 #include <QtCore/QtConcurrentRun>
-#include <qtconcurrent/runextensions.h>
+#include <utils/runextensions.h>

 using namespace QmlJS;

--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -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>
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -59,7 +59,7 @@

 #include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <qtconcurrent/runextensions.h>
+#include <utils/runextensions.h>
 #include <QtCore/QtConcurrentRun>
 #include <QtGui/QMessageBox>

--- a/src/plugins/qt4projectmanager/qt4nodes.cpp
+++ b/src/plugins/qt4projectmanager/qt4nodes.cpp
@@ -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()
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -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>
--- a/src/plugins/qtsupport/qmldumptool.cpp
+++ b/src/plugins/qtsupport/qmldumptool.cpp
@@ -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>
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -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>
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -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>
--- a/src/plugins/updateinfo/updateinfo.pro
+++ b/src/plugins/updateinfo/updateinfo.pro
@@ -1,7 +1,6 @@
 TARGET = UpdateInfo
 TEMPLATE = lib
 QT += network xml
-greaterThan(QT_MAJOR_VERSION, 4): QT += concurrent

 HEADERS += updateinfoplugin.h \
    updateinfobutton.h