summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Qt Continuous Integration System [Tue, 24 May 2011 11:46:57 +0000 (21:46 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Update licenseheader text in source files for qtdeclarative Qt module
Jyri Tahtela [Tue, 24 May 2011 11:43:28 +0000 (14:43 +0300)]
Update licenseheader text in source files for qtdeclarative Qt module
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
Qt Continuous Integration System [Mon, 23 May 2011 12:43:48 +0000 (22:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Doc: Fixed qdoc warnings.
Doc: Various fixes to documentation, some based on changes in master.
Doc: Added missing project and desktop files.
Squashed commit of changes from the 4.8-temp branch.
Doc: Fixed incorrect inline snippet for an example .sci file.
Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit
539311f7b2687e3148ea695ce06fee768abe7b44)
David Boddie [Wed, 11 May 2011 12:19:37 +0000 (14:19 +0200)]
Doc: Fixed qdoc warnings.
David Boddie [Tue, 10 May 2011 17:50:33 +0000 (19:50 +0200)]
Doc: Various fixes to documentation, some based on changes in
David Boddie [Tue, 10 May 2011 17:37:39 +0000 (19:37 +0200)]
Doc: Added missing project and desktop files.
David Boddie [Wed, 11 May 2011 15:35:46 +0000 (17:35 +0200)]
Squashed commit of changes from the 4.8-temp branch.
David Boddie [Mon, 18 Apr 2011 13:21:15 +0000 (15:21 +0200)]
Doc: Fixed incorrect inline snippet for an example .sci file.
Task-number: QTBUG-18812
(cherry picked from commit
4e8672c87bd7e740b01ca29a2a3c8ba902ed664b)
(cherry picked from commit
d1e70c3dd05df1f92f7a895de0b86b0c3a562511)
David Boddie [Wed, 27 Apr 2011 17:16:41 +0000 (19:16 +0200)]
Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
(cherry picked from commit
539311f7b2687e3148ea695ce06fee768abe7b44)
Qt Continuous Integration System [Fri, 20 May 2011 02:14:17 +0000 (12:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Remove Qt3Support code from qtdeclarative module
Jason McDonald [Fri, 20 May 2011 01:33:02 +0000 (11:33 +1000)]
Remove Qt3Support code from qtdeclarative module
Change-Id: I7da1286486a138042717241461062883aacc6250
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
Qt Continuous Integration System [Fri, 13 May 2011 18:55:40 +0000 (04:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Honor -nomake for examples and demos
Update module version number to 5.0.0
Eckhart Koppen [Fri, 13 May 2011 18:51:24 +0000 (21:51 +0300)]
Honor -nomake for examples and demos
Don't build or install demos and examples when they are disabled.
Reviewed-by: TrustMe
Eckhart Koppen [Fri, 13 May 2011 10:30:08 +0000 (13:30 +0300)]
Update module version number to 5.0.0
Updated .pri file variables
Qt Continuous Integration System [Thu, 12 May 2011 14:04:22 +0000 (00:04 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Make QLineControl send accessibility updates.
Frederik Gladhorn [Tue, 26 Apr 2011 16:41:15 +0000 (18:41 +0200)]
Make QLineControl send accessibility updates.
To make it emit the signals for the right object, it needs its parent to
be the QGraphicsItem/SGItem/QLineEdit.
According to IA2 it should emit TextUpdated and CursorMoved signals.
TextChanged is deprecated.
More fine grained signals would be desireable but this makes changes work at all.
Reviewed-by: Morten Sorvig
Qt Continuous Integration System [Thu, 12 May 2011 12:04:15 +0000 (22:04 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
QmlDebug: Fix QmlOstPlugin compilation failure
QmlDebug: Fix QmlOstPlugin compilation failure
Kai Koehne [Thu, 12 May 2011 06:33:21 +0000 (08:33 +0200)]
QmlDebug: Fix QmlOstPlugin compilation failure
Fix signature of waitForMessage.
Reviewed-by: Tom Sutcliffe
(cherry picked from commit
5c830ed2a612b940c377fb4e8a2372655f175707)
Tom Sutcliffe [Wed, 11 May 2011 10:09:23 +0000 (12:09 +0200)]
QmlDebug: Fix QmlOstPlugin compilation failure
Implement waitForMessage()/waitForReadyRead functionality required
by
bde58ad1e7d2b38d.
Reviewed-by: kkoehne
(cherry picked from commit
7acaea8557c1c6a758d9a26eff3fb1b3ec19084f)
Qt Continuous Integration System [Wed, 11 May 2011 15:03:54 +0000 (01:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Views do not notify count changes properly
Uninitialized memory is compared.
Clear the root index when the model is reset.
Fix warning about ASCII cast in calling QString::contains (cherry picked from commit
4671c273edb87e55436dd3bf0b371267c5e34ff7)
Martin Jones [Thu, 5 May 2011 04:18:28 +0000 (14:18 +1000)]
Views do not notify count changes properly
The views don't have a valid count until both a model and a delegate
are provided. But, countChanged() is not called when a delegate is
set after the model, so bindings to count were not evaluated. Also
test that count is updated for insertion/removal
Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314
Task-number: QTBUG-19037
Reviewed-by: Bea Lam
(cherry picked from commit
4fbcb6a531bf424a8dbbbd0ca2947d9e15118885)
Martin Jones [Thu, 5 May 2011 03:24:32 +0000 (13:24 +1000)]
Uninitialized memory is compared.
Memory is allocated and used without first clearing it. At
the least this annoys valgrind, but also has potential for real
problems.
Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d
Task-number: QTBUG-15187
Reviewed-by: Aaron Kennedy
(cherry picked from commit
95aa4e4f9b82c3652ffc93310b190db869d491df)
Girish Ramakrishnan [Wed, 27 Apr 2011 05:53:43 +0000 (15:53 +1000)]
Clear the root index when the model is reset.
Task-number: QTBUG-18839
Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6
Merge-request: 2598
Reviewed-by: Martin Jones <martin.jones@nokia.com>
(cherry picked from commit
f6b7ce204ee88be0fedb4cfcff382f208fa4ed33)
Thiago Macieira [Tue, 26 Apr 2011 13:50:49 +0000 (15:50 +0200)]
Fix warning about ASCII cast in calling QString::contains
(cherry picked from commit
4671c273edb87e55436dd3bf0b371267c5e34ff7)
Qt Continuous Integration System [Wed, 11 May 2011 13:09:23 +0000 (23:09 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Add QTDECLARATIVE_VERSION macro for qtdeclarative
Liang Qi [Wed, 11 May 2011 11:21:07 +0000 (13:21 +0200)]
Add QTDECLARATIVE_VERSION macro for qtdeclarative
Provide version info for each library.
Task-number: QTMODULARIZATION-44
Reviewed-by: axis
Qt Continuous Integration System [Tue, 10 May 2011 18:49:31 +0000 (04:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Removed some trailing whitespace
Moved the QML Observer Service and related functionality into Qt
Thorbjørn Lindeijer [Tue, 3 May 2011 12:46:43 +0000 (14:46 +0200)]
Removed some trailing whitespace
(cherry picked from commit
713a4c2fc2a52277a9b820608e3270507850ac47)
Thorbjørn Lindeijer [Fri, 25 Mar 2011 12:36:16 +0000 (13:36 +0100)]
Moved the QML Observer Service and related functionality into Qt
This code was previously developed as part of Qt Creator in
share/qtcreator/qml/qmljsdebugger/
Moving it into Qt will allow us to simplify the setup required before
you can debug QML applications.
To avoid adding too much weight to the QtDeclarative module, a
declarativeobserver plugin was introduced that contains the
QDeclarativeViewObserver and related classes. The
QDeclarativeObserverService is just a stub service that loads this
plugin once a QML debugging client connects. The plugin implements the
QDeclarativeObserverInterface
A QJSDebugService was separated out of QJSDebuggerAgent, so
that the service can be active while the agent is instantiated lazily.
Each QDeclarativeEngine adds itself to the QJSDebugService. Currently
only the first one is used when instantiating the agent.
QDeclarativeObserverService is hooked into QDeclarativeView, with the
view registering itself to the service, allowing the
QDeclarativeViewObserver to be created for the view once somebody
connects to the service. Again, only the first view is used at the
moment.
Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
(cherry picked from commit
35faeb205843c4f0b921d2b878d2d24962c64664)
Fixups squashed into this one:
(cherry picked from commit
0abf1dd99eeb252ae10c9f3cd99b64ee0b4d6e72)
(cherry picked from commit
894515429397be20670806825099b4b9896d50d6)
(cherry picked from commit
7d9f03c87e0e096934583a36340de5446e1d0520)
Conflicts:
src/plugins/qmltooling/qmltooling.pro
src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp
Qt Continuous Integration System [Tue, 10 May 2011 16:18:53 +0000 (02:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
QDeclarativeDebugServer: Send hello answer before any service messages
Thorbjørn Lindeijer [Wed, 6 Apr 2011 14:31:09 +0000 (16:31 +0200)]
QDeclarativeDebugServer: Send hello answer before any service messages
This is necessary since some services may like to send a message back
immediately when its state changes to enabled.
Reviewed-by: Kai Koehne
(cherry picked from commit
9fa0a9319ee0f178d03f9bdc4afbabb8563b4c62)
Qt Continuous Integration System [Fri, 6 May 2011 06:43:30 +0000 (16:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
Added .tag file with Git revision.
Fix compilation with private header patch
Use private headers
Define the QT_NO_.... when the module is absant from QT_CONFIG
Add module.prf, and install MODULE_PRI for each module
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.
Olivier Goffart [Mon, 2 May 2011 14:54:54 +0000 (16:54 +0200)]
Fix compilation with private header patch
Marius Storm-Olsen [Thu, 21 Apr 2011 12:55:54 +0000 (07:55 -0500)]
Use private headers
Olivier Goffart [Wed, 6 Apr 2011 13:33:13 +0000 (15:33 +0200)]
Define the QT_NO_.... when the module is absant from QT_CONFIG
Task-number: QTMODULARIZATION-38
Marius Storm-Olsen [Fri, 1 Apr 2011 10:47:28 +0000 (05:47 -0500)]
Add module.prf, and install MODULE_PRI for each module
Output warning if not present
axis [Wed, 27 Apr 2011 10:34:43 +0000 (12:34 +0200)]
Added dependency information to the sync.profile.
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test
Prasanth Ullattil [Wed, 23 Mar 2011 09:55:02 +0000 (10:55 +0100)]
Changed the path for qpluginbase.pri
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.
axis [Mon, 21 Mar 2011 11:55:15 +0000 (12:55 +0100)]
Fixed parserstress test.
axis [Thu, 17 Mar 2011 09:58:42 +0000 (10:58 +0100)]
Switched to using QT.declaratice.imports variable.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.
Olivier Goffart [Tue, 11 Jan 2011 10:09:56 +0000 (11:09 +0100)]
compile qtdeclarative/import
Liang Qi [Fri, 7 Jan 2011 12:47:49 +0000 (13:47 +0100)]
Make auto test build
Marius Storm-Olsen [Thu, 6 Jan 2011 18:52:17 +0000 (12:52 -0600)]
Make each module refer to its own bin/
Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.
Each module now sets the QT_CONFIG variable itself.
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes path to the modules .pri file
Marius Storm-Olsen [Fri, 17 Dec 2010 05:34:20 +0000 (23:34 -0600)]
Add the source path to the modules .pri file
Liang Qi [Thu, 25 Nov 2010 14:20:01 +0000 (15:20 +0100)]
Make declarative compile.
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.
This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:
http://qt.gitorious.org/qt/pages/GitIntroductionWithQt
If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.
Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12