diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:40 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:15:40 +0200 |
commit | 62b718af9fb8efe9dca152b8be22963ffa963f3c (patch) | |
tree | 76f201189eb5ec8f16755b0ed566564df988e90f | |
parent | 31b107298609928c0eaa2e974ade59ce9d815e2c (diff) | |
parent | 24fb923ef697d91618e15ee0c66dd5b0d0a22579 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iefc16b6899346b1d15bcf0e4394ede2eade3f933
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativepositioners.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 4 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativetimeline.cpp | 4 | ||||
-rw-r--r-- | tools/qml/qml.pro | 3 |
6 files changed, 12 insertions, 8 deletions
@@ -74,7 +74,6 @@ bin/qttracereplay* bin/rcc* bin/uic* bin/patternist* -bin/phonon* bin/qcollectiongenerator* bin/qdbus* bin/qhelpconverter* diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 1dbdbdaf..bca94ebd 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -52,6 +52,8 @@ #include <QDebug> #include <QCoreApplication> +#include <algorithm> + QT_BEGIN_NAMESPACE static const QDeclarativeItemPrivate::ChangeTypes watchedChanges @@ -230,7 +232,7 @@ void QDeclarativeBasePositioner::prePositioning() d->doingPositioning = true; //Need to order children by creation order modified by stacking order QList<QGraphicsItem *> children = d->QGraphicsItemPrivate::children; - qSort(children.begin(), children.end(), d->insertionOrder); + std::sort(children.begin(), children.end(), QGraphicsItemPrivate::insertionOrder); QPODVector<PositionedItem,8> oldItems; positionedItems.copyAndClear(oldItems); diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index d0c6517c..6256bae3 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -75,6 +75,8 @@ #include <QtCore/qdebug.h> #include <QtCore/qdatetime.h> +#include <algorithm> + QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(compilerDump, QML_COMPILER_DUMP); @@ -808,7 +810,7 @@ bool QDeclarativeCompiler::buildObject(QDeclarativeParser::Object *obj, const Bi defaultProperty->values += explicitProperty->values; foreach(QDeclarativeParser::Value *value, defaultProperty->values) value->addref(); - qSort(defaultProperty->values.begin(), defaultProperty->values.end(), ValuePtrLessThan); + std::sort(defaultProperty->values.begin(), defaultProperty->values.end(), ValuePtrLessThan); } else { defaultProperty = obj->defaultProperty; diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index caf97b25..b96b64c3 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -52,6 +52,8 @@ #include <private/qdeclarativetypenamecache_p.h> #include <private/qdeclarativeengine_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) @@ -400,7 +402,7 @@ QString QDeclarativeImportsPrivate::resolvedUri(const QString &dir_arg, QDeclara dir.chop(1); QStringList paths = database->fileImportPath; - qSort(paths.begin(), paths.end(), greaterThan); // Ensure subdirs preceed their parents. + std::sort(paths.begin(), paths.end(), greaterThan); // Ensure subdirs preceed their parents. QString stableRelativePath = dir; foreach(const QString &path, paths) { diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp index 2e7ba8c4..d4045ef3 100644 --- a/src/declarative/util/qdeclarativetimeline.cpp +++ b/src/declarative/util/qdeclarativetimeline.cpp @@ -50,6 +50,8 @@ #include <QEasingCurve> #include <QTime> +#include <algorithm> + QT_BEGIN_NAMESPACE struct Update { @@ -807,7 +809,7 @@ int QDeclarativeTimeLinePrivate::advance(int t) length -= qMin(length, advanceTime); syncPoint -= advanceTime; - qSort(updates.begin(), updates.end()); + std::sort(updates.begin(), updates.end()); updateQueue = &updates; for (int ii = 0; ii < updates.count(); ++ii) { const Update &v = updates.at(ii).second; diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index f9106876..397287e7 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -12,9 +12,6 @@ wince* { qtHaveModule(scripttools) { QT += scripttools } - contains(QT_CONFIG, phonon) { - QT += phonon - } qtHaveModule(xmlpatterns) { QT += xmlpatterns } |