From 16e823580b4ed14000d1f75ac2da16c432a8986f Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 9 Jan 2012 09:02:12 +0100 Subject: Remove the use of QT_MODULE() Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154 Reviewed-by: Lars Knoll --- src/declarative/qml/qdeclarativelistmodelworkeragent_p.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/declarative/qml/qdeclarativelistmodelworkeragent_p.h') diff --git a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h index 9945cad787..4c14df33c2 100644 --- a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h @@ -65,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) class QDeclarativeListModel; -- cgit v1.2.3 From e6b224aa2872d7d1030fa98bd30603e16f8f9604 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 14:04:27 +1000 Subject: Update obsolete contact address. Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern Reviewed-by: Alan Alpert --- src/declarative/qml/qdeclarativelistmodelworkeragent_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative/qml/qdeclarativelistmodelworkeragent_p.h') diff --git a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h index 4c14df33c2..7263afb4e0 100644 --- a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** -- cgit v1.2.3 From 635d0a7cf6601b2e46e0eed21a648934bc471c6d Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Wed, 18 Jan 2012 11:22:31 +1000 Subject: Don't hang the worker script engine 1. Wake up the syncDone wait condition when delete the QDeclarativeListModelWorkerAgent, otherwise the the whole worker script engine thread will hang at the sync() call and can't exit gracefully. 2. Call QCoreApplication::processEvents() before delete the worker script engine to cleanup all pending events in main thread to release wait conditions which some worker scripts/agents are waiting for (QDeclarativeListModelWorkerAgent::sync() for example) Change-Id: Ia3712318771633e68238b4d629ba870ff7ce45b9 Reviewed-by: Yunqiao Yin --- src/declarative/qml/qdeclarativelistmodelworkeragent_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/declarative/qml/qdeclarativelistmodelworkeragent_p.h') diff --git a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h index 7263afb4e0..6c97fc54b4 100644 --- a/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/qml/qdeclarativelistmodelworkeragent_p.h @@ -75,7 +75,7 @@ class QDeclarativeListModelWorkerAgent : public QObject public: QDeclarativeListModelWorkerAgent(QDeclarativeListModel *); - + ~QDeclarativeListModelWorkerAgent(); void setV8Engine(QV8Engine *eng); void addref(); -- cgit v1.2.3