diff --git a/qtcreator.pri b/qtcreator.pri index 23777db090f3a6120f66423e959652b12ee07854..bc26570959bd4ace98fcdb7d8587c61e9b3177ba 100644 --- 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 } diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 4ee52958741578692bb3f908e4f75821afe781b2..f7f3626ae7b49dfb8e2a5c325db04864d929b759 100644 --- 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 \ diff --git a/src/libs/qtconcurrent/qtconcurrent.pri b/src/libs/qtconcurrent/qtconcurrent.pri deleted file mode 100644 index 141de8ee8e2ea2fb4f9ffe08e1277d71e066e83a..0000000000000000000000000000000000000000 --- a/src/libs/qtconcurrent/qtconcurrent.pri +++ /dev/null @@ -1 +0,0 @@ -LIBS *= -l$$qtLibraryName(QtConcurrent) diff --git a/src/libs/qtconcurrent/qtconcurrent.pro b/src/libs/qtconcurrent/qtconcurrent.pro deleted file mode 100644 index f6a84499cc340fdcdab02752fe35e5034f9ae3b5..0000000000000000000000000000000000000000 --- a/src/libs/qtconcurrent/qtconcurrent.pro +++ /dev/null @@ -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 diff --git a/src/libs/qtconcurrent/qtconcurrent_global.h b/src/libs/qtconcurrent/qtconcurrent_global.h deleted file mode 100644 index 8e0462d633491272564c9522ff275160d5a991f3..0000000000000000000000000000000000000000 --- a/src/libs/qtconcurrent/qtconcurrent_global.h +++ /dev/null @@ -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 diff --git a/src/libs/qtconcurrent/QtConcurrentTools b/src/libs/utils/QtConcurrentTools similarity index 94% rename from src/libs/qtconcurrent/QtConcurrentTools rename to src/libs/utils/QtConcurrentTools index ea612c5b4c3e85aad857955a85acd47f022d31a6..e5129e8c5cbadf788787bb6d723b4cb1012e27f5 100644 --- a/src/libs/qtconcurrent/QtConcurrentTools +++ b/src/libs/utils/QtConcurrentTools @@ -30,5 +30,5 @@ ** **************************************************************************/ -#include "qtconcurrent/multitask.h" -#include "qtconcurrent/runextensions.h" +#include "multitask.h" +#include "runextensions.h" diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 88a931d3e4d332d7c33c24afb19ffeb212142c13..7387f51c9c01d1c00fbb09eb8d6fcfd419c02667 100644 --- 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; diff --git a/src/libs/qtconcurrent/multitask.h b/src/libs/utils/multitask.h similarity index 98% rename from src/libs/qtconcurrent/multitask.h rename to src/libs/utils/multitask.h index 31f2703284546c16c6ddfa6b670a428b42587d29..71c09a64531e3ba07c7f0720e72b755b25ed89a5 100644 --- a/src/libs/qtconcurrent/multitask.h +++ b/src/libs/utils/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: diff --git a/src/libs/qtconcurrent/runextensions.h b/src/libs/utils/runextensions.h similarity index 100% rename from src/libs/qtconcurrent/runextensions.h rename to src/libs/utils/runextensions.h diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index 638f99d001d0328860fb4a40672d2084da1c2703..a422fff4fd779ca2e581d79cab60683a2cd67b17 100644 --- 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 \ diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro index 2d8ef2be45f7588ad86e8f55a3e3919f486dc9d3..0a1888c1138b88957cb5cc0c2393f1e2f9ca2fd0 100644 --- 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) } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index e3ee122c6dd5e776b12d866344f4d03e183f67ca..7a4d51022d2fcb95cb41a7f696ea9ad70e33e987 100644 --- 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> diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index af115d56a0ad19f927387252c2d0fd4340ee3240..fe78c4b55883f883e2da306de2487731e319e502 100644 --- 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) diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp index d1bdb3c2814e53d66ff56538a5b783be02256a39..84e99548a1f9b526799a2c68da78fa43953476f5 100644 --- 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; diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index f97dd9f4e2dc24357938c6d71468cc434a700cfb..90712396264c967a2c8c5e13188e8c030949cf11 100644 --- 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> diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 7e82347594e4ac2e4f45032e4e366b14a20bb069..3277f2c4595c55a7052e830bd314cb62becbf9d3 100644 --- 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> diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index 0fb8cd453f834096aaa669e8a751f7e4c9d2ea7a..ca441f502680d13d7bc3ccdaeddbec710473602d 100644 --- 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> diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index aaa84bf72779fe620ec388e8b5ec3c855bf1cc7a..b1fc1a5567f027d80447208c0e4fddf3a1371c4a 100644 --- 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> diff --git a/src/plugins/genericprojectmanager/selectablefilesmodel.cpp b/src/plugins/genericprojectmanager/selectablefilesmodel.cpp index d18e5ca805ac38fd4f90a99712ee51ac66ac89ef..61320d81b39a890040044dc90e7d1152b8577d2b 100644 --- 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> diff --git a/src/plugins/locator/directoryfilter.cpp b/src/plugins/locator/directoryfilter.cpp index 43da2545d03d64bbc0f86c0db58690a3eff2c2e9..aab9d439e23c148d1e00ce387ed13db51f54b9af 100644 --- 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; diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro index e1e3ed5b05ef98eed3a713437dd80eb7b91e200b..fab92816fc95ae116fbbb6906ff1213fda0e51f8 100644 --- 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 \ diff --git a/src/plugins/locator/locator_dependencies.pri b/src/plugins/locator/locator_dependencies.pri index 96d71e68c8d467f2b805d60ed6c6244e531ebc73..a64caedc103f51644196d974398ebb44fc4c5f88 100644 --- 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) diff --git a/src/plugins/locator/locatorplugin.cpp b/src/plugins/locator/locatorplugin.cpp index d82e0c7bfa252be6aefd7d53ef818ae47d8fe066..9a0fc297a0759484e7f0ba5b69daa9942b91c022 100644 --- 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> diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index 179b9a40befc222ed1b590928bdc6b7b330873d3..9289066d87a07058834698a8c502001871cab217 100644 --- 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> diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp index c1f9c2fbd909745d22b531aab651d4a0c3ea7ff9..48ce67f9c285237a86d63f39fc7301ad202b1fa0 100644 --- 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> diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp index d4662199398dd1cc183e9d7017f186921542a68c..083b02f58de79a9a80e89dab7642fb467831ce54 100644 --- 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> diff --git a/src/plugins/qmljseditor/qmljsfindreferences.cpp b/src/plugins/qmljseditor/qmljsfindreferences.cpp index ac93acabf9c05d6a7b2cb54665b495c665d6b258..49a024a1a5ae4e7b59f602af0f824024df902a4a 100644 --- 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> diff --git a/src/plugins/qmljseditor/qmltaskmanager.cpp b/src/plugins/qmljseditor/qmltaskmanager.cpp index a6a6dfb44c0e9d0fb35541b0f60197b7d3532a4a..1bfb716c1f9821913d04d48c9b67c683f8a22c5b 100644 --- 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; diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 6c4367bbe3a05d77d3eb3699a31733ef3949a74b..04f2a0d2cf9d6600c6c043cf14a6e7ec5eabd271 100644 --- 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> diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index 7752c91a53fc7c1831f11f56eee31e65a325b7d2..1f48c2ac87185c80267959bcf1f9ce1f229cdd31 100644 --- 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> diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 677f6d5b63877da7a830e5c1c3f45998d7ebd692..e20653d7989bdceabbf4b635aa641e234da484a1 100644 --- 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() diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 5ecfd73a09075b4a7fbdf3cda55e1a29914976c9..298a44bb35f0686b5c793f90a0e18af217967546 100644 --- 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> diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp index fbbbc4ae6cec2c8a753e64482845c0a47333d626..41b1c4e8fe3b67da26316e1a4fb34109ddebfa91 100644 --- 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> diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 590ddee2cfcba37e6a6fb99b592948169e6e2a62..620b484484e57f31a8714debbd1072424e633de0 100644 --- 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> diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp index 9221c22f70e4df0384824aee182c6d6de735adf3..920461807d018515bd184b8ba0cae6b479e6dfb4 100644 --- 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> diff --git a/src/plugins/updateinfo/updateinfo.pro b/src/plugins/updateinfo/updateinfo.pro index 25f686dfcbf1f06fbd8fb3921c87bc7a24ed6a27..fb3a2b31182c1ad375afe7747cef8a9753922317 100644 --- 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