Qt Continuous Integration System [Sun, 4 Dec 2011 23:03:28 +0000 (09:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
Fix QtDemo declarative examples
Correct image paths for dynamicscene
Fix stack overwrite in QDBusDemarshaller
Qt Linguist: Fix crashes
fixed error generating wrong introspection string in header output file
Backport SMP safe initialisation of QNetworkConfigurationManager
Remove more "unused variable" warnings
QTreeView: fix crash when starting a drag with hidden columns.
QSQLITE support only one statement at a time
Symbian-linux crosscompilation configuration align
Fix Symbian def-file
Set execution bits for more scripts.
SSL: fix build when compiled with -openssl-linked
Set execution bits for .test files.
New API to set AVKON flag to inputcontext in Qt/Symbian.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
Fixing memory leak in QtGui qt_cleanup
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
Qt Continuous Integration System [Fri, 2 Dec 2011 03:55:04 +0000 (13:55 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Fix QtDemo declarative examples
Correct image paths for dynamicscene
Alan Alpert [Fri, 2 Dec 2011 03:27:26 +0000 (13:27 +1000)]
Fix QtDemo declarative examples
The attempt to turn them into C++ examples messed them up as QML
examples. Have QtDemo treat them as C++ examples for now.
Task-Number: QTBUG-22983
Reviewed-By: Chris Adams
Alan Alpert [Fri, 2 Dec 2011 03:14:56 +0000 (13:14 +1000)]
Correct image paths for dynamicscene
Task-number: QTBUG-22937
Reviewed-by: Chris Adams
Qt Continuous Integration System [Thu, 1 Dec 2011 15:19:03 +0000 (01:19 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
QSQLITE support only one statement at a time
Qt Continuous Integration System [Thu, 1 Dec 2011 10:56:08 +0000 (20:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Remove more "unused variable" warnings
QTreeView: fix crash when starting a drag with hidden columns.
Qt Continuous Integration System [Thu, 1 Dec 2011 00:48:39 +0000 (10:48 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix stack overwrite in QDBusDemarshaller
Qt Linguist: Fix crashes
fixed error generating wrong introspection string in header output file
Sami Rosendahl [Wed, 30 Nov 2011 19:36:56 +0000 (20:36 +0100)]
Fix stack overwrite in QDBusDemarshaller
QDBusArgument extraction operators and QDBusDemarshaller that implements
the extraction do not check the type of the extracted value.
Helper function template qIterGet in qdbusdemarshaller.cpp that is used
for extracting basic data types only reserves space from the stack for
the expected type as specified by client.
If the actual type in the DBus parameter is larger stack will be
overwritten in the helper function by at most 7 bytes (expected one byte,
received dbus_uint_64_t of size 8 bytes).
The fix always reserves space for the largest basic type dbus_uint64_t
readable by dbus_message_iter_get_basic API.
See also http://dbus.freedesktop.org/doc/api/html/group__DBusMessage.html#ga41c23a05e552d0574d0444d4693d18ab
PMO 280456
Task-number: QTBUG-22735
Merge-request: 1469
Reviewed-by: thiago
Takumi ASAKI [Wed, 30 Nov 2011 19:29:29 +0000 (20:29 +0100)]
Qt Linguist: Fix crashes
Fix crash when select translation after close and open file.
This patches includes refactoring of
b68b59f252930538cc124b31decc990ab57bea20
Merge-request: 1480
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Ralf Habacker [Wed, 30 Nov 2011 19:21:24 +0000 (20:21 +0100)]
fixed error generating wrong introspection string in header output file
When using dbus introspection files with CRLF encoding the CR is not
handled and results into a CR code at a wrong location in the output file
Task-number: QTBUG-17634
Merge-request: 1478
Reviewed-by: thiago
Qt Continuous Integration System [Wed, 30 Nov 2011 18:56:40 +0000 (04:56 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Backport SMP safe initialisation of QNetworkConfigurationManager
Shane Kearns [Wed, 30 Nov 2011 13:39:23 +0000 (13:39 +0000)]
Backport SMP safe initialisation of QNetworkConfigurationManager
The original commit in Qt5 uses new atomics API that is not
in Qt4. I have replaced with equivalent calls.
Also the init/cleanup functions are different, so those are renamed.
Reviewed-by: mread
Task-number: ou1cimx1#946677
Original commit message follows:
Author: Thiago Macieira <thiago@kde.org>
Date: Wed Jul 6 00:06:15 2011 +0200
Fix the QNetworkConnectionManagerPrivate initialisation code.
The current code was meant to be a thread-safe initialisation that
also ran a couple of extra steps. But it wasn't. While it's ok to call
qAddPostRoutine(), the call to updateConfigurations() was
thread-unsafe. It is possible that another thread got the pointer to
the Private before updateConfigurations() finished.
So instead protect the initialisation with a mutex.
It's possible that the value of the pointer becomes visible to
other processors before the other contained values, so use
atomics here.
To call qAddPostRoutine safely from the main thread, use the trick
of deleteLater() (which is thread-safe) in another thread connecting
to a slot.
Qt Continuous Integration System [Wed, 30 Nov 2011 14:34:53 +0000 (00:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian-linux crosscompilation configuration align
Gabriel de Dietrich [Wed, 30 Nov 2011 14:06:08 +0000 (15:06 +0100)]
Remove more "unused variable" warnings
Reviewed-by: Frederik
David Faure [Tue, 29 Nov 2011 19:55:26 +0000 (20:55 +0100)]
QTreeView: fix crash when starting a drag with hidden columns.
Crash was introduced by
d639105759491 (Qt-4.8 only)
Amended to remove "unused variable" warning.
Task-number: QTBUG-15834
Merge-request: MR-2725
Reviewed-by: Gabriel
Qt Continuous Integration System [Wed, 30 Nov 2011 11:32:16 +0000 (21:32 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
QSQLITE support only one statement at a time
Honglei Zhang [Wed, 30 Nov 2011 11:26:22 +0000 (13:26 +0200)]
QSQLITE support only one statement at a time
SQLite driver support only one statement at a time. This fix makes the
exec and prepare call failed if more than one statements are given.
This is bug fix for QTBUG-21884. Also the behaviour is documented in
the API specification.
Task-number: QTBUG-21884
Reviewed-by: Charles Yin
Water-Team [Wed, 30 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Qt Continuous Integration System [Tue, 29 Nov 2011 22:09:43 +0000 (08:09 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian def-file
Qt Continuous Integration System [Tue, 29 Nov 2011 18:30:49 +0000 (04:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian-linux crosscompilation configuration align
Pasi Pentikainen [Tue, 29 Nov 2011 15:45:27 +0000 (17:45 +0200)]
Symbian-linux crosscompilation configuration align
Change the configure-sh on Symbian linux crosscompilation to set rtti.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14361
Qt Continuous Integration System [Tue, 29 Nov 2011 13:10:34 +0000 (23:10 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: (121 commits)
Fix Symbian def-file
SSL: fix build when compiled with -openssl-linked
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
Change the links to behavior examples.
Fix warning about unbalanced parantheses.
...
Qt Continuous Integration System [Tue, 29 Nov 2011 13:01:55 +0000 (23:01 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Set execution bits for more scripts.
Set execution bits for .test files.
Fix more permissions (no execute bit).
Fix permission (no execute bit).
QGraphicsLayoutItem - bound constraint the minimum and maximum size
Notify X11 of its resizable state through MWM Hints.
Pasi Pentikainen [Tue, 29 Nov 2011 11:29:42 +0000 (13:29 +0200)]
Fix Symbian def-file
Fix the Symbain bwins def-file QtGuiu.def to include changes caused by
commit
6b6397f91125ddfc2abdea9704bbed08beb22ab7.
Reviewed-by: Murray Read
Frederik Gladhorn [Tue, 29 Nov 2011 10:58:57 +0000 (11:58 +0100)]
Set execution bits for more scripts.
Qt Continuous Integration System [Tue, 29 Nov 2011 08:49:08 +0000 (18:49 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Water-Team [Tue, 29 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Qt Continuous Integration System [Mon, 28 Nov 2011 18:21:02 +0000 (04:21 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Qt Continuous Integration System [Mon, 28 Nov 2011 14:14:16 +0000 (00:14 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
SSL: fix build when compiled with -openssl-linked
Qt Continuous Integration System [Mon, 28 Nov 2011 12:11:25 +0000 (22:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (169 commits)
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Symbian-linux crosscompilation case changes
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
Change the links to behavior examples.
Fix warning about unbalanced parantheses.
Fix abstractitemmodel compilation error.
...
Peter Hartmann [Thu, 24 Nov 2011 12:15:18 +0000 (13:15 +0100)]
SSL: fix build when compiled with -openssl-linked
... and only resolve the functions when the methods are available.
SSL 2 functionality is not always available in OpenSSL anymore.
Change-Id: Ia3178685b26c67ac55447476789e06710b596181
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
(cherry picked from commit
09404c072fec2e195d8114dc4d95ce3683c341cf)
Qt Continuous Integration System [Mon, 28 Nov 2011 09:21:04 +0000 (19:21 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
New API to set AVKON flag to inputcontext in Qt/Symbian.
Fixing memory leak in QtGui qt_cleanup
Qt Continuous Integration System [Sun, 27 Nov 2011 16:58:08 +0000 (02:58 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (189 commits)
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Symbian-linux crosscompilation case changes
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
Change the links to behavior examples.
Fix warning about unbalanced parantheses.
Fix abstractitemmodel compilation error.
...
Water-Team [Sun, 27 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Sergio Ahumada [Sat, 26 Nov 2011 23:16:08 +0000 (00:16 +0100)]
Merge remote-tracking branch 'upstream/4.8'
Qt Continuous Integration System [Sat, 26 Nov 2011 19:25:32 +0000 (05:25 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: (675 commits)
Fix QDateEdit calendar pop-up having wrong date
Repaint QProgressBar when minimum or maximum changed
Fix QProgressBar causing timer event spam
Fix memory leak in QCursorData
fix gdb_dwarf_index.prf for applications, take two
Compile fix for Mac OS X 10.7 with 10.6 sdk
Update supported platforms and remove commercial page.
networking: regenerate effective TLD table for cookies
fix gdb_dwarf_index.prf for executables
WINSCW def file update so that qtgui can pick up virtual from qtcore
Add mobile-reduced ts-files for Symbian.
Create cleanup stack in idleDetectorThread
Preventing zero-timer lockups when Symbian's active scheduler used
QNAM: Fix authentication cache when the password is in the URL
Qt Designer: Fix static linking on Mac.
SSL: blacklist intermediate certificates that issued weak certs
Fix memory leak in S60Style
Fix to QtOpenGL crash on Symbian
Give better error message when using unsupported lookbehinds in QRegExp
Clear error due to FRAMEBUFFER_SRGB_CAPABLE_EXT
...
Qt Continuous Integration System [Sat, 26 Nov 2011 19:08:45 +0000 (05:08 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Doc: Fixing typo
Sergio Ahumada [Sat, 26 Nov 2011 18:55:41 +0000 (19:55 +0100)]
Merge remote-tracking branch 'qt-qa-review/master'
Water-Team [Sat, 26 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Qt Continuous Integration System [Fri, 25 Nov 2011 23:25:20 +0000 (09:25 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian-linux crosscompilation case changes
Symbian-linux crosscompilation debug-release align
Qt Continuous Integration System [Fri, 25 Nov 2011 23:03:06 +0000 (09:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
New API to set AVKON flag to inputcontext in Qt/Symbian.
Fixing memory leak in QtGui qt_cleanup
Pasi Pentikainen [Fri, 25 Nov 2011 10:24:17 +0000 (12:24 +0200)]
Merge remote-tracking branch 'flex/master'
Qt Continuous Integration System [Fri, 25 Nov 2011 10:08:07 +0000 (20:08 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (23 commits)
Added missing license header.
Adjust pathes once again.
Fixed a link
Fixed a link
Split behavior and wigglytext examples
Rename files to show up in docs.
Whitespace changes and added depends.
Fix up examples.
Fixed some linking issues.
Removed unecessary files from folders.
Fixes for the manifest and links.
Changed some of the short descriptions for WebView examples.
Removed unecessary duplicate files.
Fix link to WebView examples.
Fix link to ListView and WebView example pages.
Fixed lists to be ordered lists and added curly brackets
Change the links to behavior examples.
Fix warning about unbalanced parantheses.
Fix abstractitemmodel compilation error.
Split ListView and WebView examples.
...
Frederik Gladhorn [Fri, 25 Nov 2011 09:58:00 +0000 (10:58 +0100)]
Set execution bits for .test files.
These files turn out to be scripts.
Pasi Pentikainen [Fri, 25 Nov 2011 09:22:08 +0000 (11:22 +0200)]
Merge remote-tracking branch 'flex/master'
Satyam Bandarapu [Thu, 24 Nov 2011 22:25:38 +0000 (00:25 +0200)]
New API to set AVKON flag to inputcontext in Qt/Symbian.
This API is to pass any AVKON FEP flag to QCoeFepInputContext.
Implemented as an exported private API, which is available only in Qt/Symbian.
If latin keyboard flag is passed to this API and editor is Email/Url,
virtual keyboard launches always with latin characters regardless of input language.
Reviewed by: Sami Merila
Rohan McGovern [Fri, 25 Nov 2011 02:14:23 +0000 (12:14 +1000)]
Added missing license header.
Water-Team [Fri, 25 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Qt Continuous Integration System [Thu, 24 Nov 2011 21:07:05 +0000 (07:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian-linux crosscompilation case changes
Daniel Molkentin [Thu, 24 Nov 2011 17:22:05 +0000 (18:22 +0100)]
Adjust pathes once again.
Reviewed-by: trustme
Kevin Wright [Thu, 24 Nov 2011 17:05:28 +0000 (18:05 +0100)]
Fixed a link
Kevin Wright [Thu, 24 Nov 2011 17:03:27 +0000 (18:03 +0100)]
Fixed a link
Kevin Wright [Thu, 24 Nov 2011 17:01:15 +0000 (18:01 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Kevin Wright [Thu, 24 Nov 2011 17:00:38 +0000 (18:00 +0100)]
Split behavior and wigglytext examples
Casper van Donderen [Thu, 24 Nov 2011 16:51:49 +0000 (17:51 +0100)]
Rename files to show up in docs.
Kevin Wright [Thu, 24 Nov 2011 16:31:36 +0000 (17:31 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Kevin Wright [Thu, 24 Nov 2011 16:31:01 +0000 (17:31 +0100)]
Whitespace changes and added depends.
Daniel Molkentin [Thu, 24 Nov 2011 16:13:34 +0000 (17:13 +0100)]
Fix up examples.
- Remove dependencies from examples
- Remove stray copies of qtc_packaging
- remove .desktop files
- rename examples (to their old name)
Reviewed-By: Casper van Donderen
Kevin Wright [Thu, 24 Nov 2011 16:27:09 +0000 (17:27 +0100)]
Fixed some linking issues.
Kevin Wright [Thu, 24 Nov 2011 16:21:17 +0000 (17:21 +0100)]
Removed unecessary files from folders.
Casper van Donderen [Thu, 24 Nov 2011 16:13:27 +0000 (17:13 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Casper van Donderen [Thu, 24 Nov 2011 16:13:05 +0000 (17:13 +0100)]
Fixes for the manifest and links.
Kevin Wright [Thu, 24 Nov 2011 16:06:18 +0000 (17:06 +0100)]
Changed some of the short descriptions for WebView examples.
Kevin Wright [Thu, 24 Nov 2011 16:03:10 +0000 (17:03 +0100)]
Removed unecessary duplicate files.
Pasi Pentikainen [Thu, 24 Nov 2011 15:47:52 +0000 (17:47 +0200)]
Symbian-linux crosscompilation case changes
Update the cases to match actual files in Symbian, and add EPOCROOT
prefixes to data files in iby.
Reviewed-by: Juha Kukkonen
Task-number: QTBUG-14361
Casper van Donderen [Thu, 24 Nov 2011 15:47:34 +0000 (16:47 +0100)]
Fix link to WebView examples.
Qt Continuous Integration System [Thu, 24 Nov 2011 15:45:21 +0000 (01:45 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian-linux crosscompilation debug-release align
Casper van Donderen [Thu, 24 Nov 2011 15:39:07 +0000 (16:39 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Casper van Donderen [Thu, 24 Nov 2011 15:38:48 +0000 (16:38 +0100)]
Fix link to ListView and WebView example pages.
Kevin Wright [Thu, 24 Nov 2011 15:34:39 +0000 (16:34 +0100)]
Fixed lists to be ordered lists and added curly brackets
Casper van Donderen [Thu, 24 Nov 2011 15:27:33 +0000 (16:27 +0100)]
Change the links to behavior examples.
Kevin Wright [Thu, 24 Nov 2011 15:24:00 +0000 (16:24 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Daniel Molkentin [Thu, 24 Nov 2011 14:13:21 +0000 (15:13 +0100)]
Fix warning about unbalanced parantheses.
Reviewed-By: Robert Loehning
Daniel Molkentin [Thu, 24 Nov 2011 11:14:19 +0000 (12:14 +0100)]
Fix abstractitemmodel compilation error.
Kevin Wright [Thu, 24 Nov 2011 15:23:04 +0000 (16:23 +0100)]
Split ListView and WebView examples.
Casper van Donderen [Thu, 24 Nov 2011 15:11:14 +0000 (16:11 +0100)]
Close the comments on some examples.
Pasi Pentikainen [Thu, 24 Nov 2011 14:44:32 +0000 (16:44 +0200)]
Symbian-linux crosscompilation debug-release align
Change the Symbian Raptor configure options to use debug variant when
using configure-sh on linux crosscompilation, so that it matches with
result of configure.exe on windows.
Reviewed-by: Miikka Heikkinen
Task-number: QTBUG-14361
Casper van Donderen [Thu, 24 Nov 2011 13:36:56 +0000 (14:36 +0100)]
Update documentation for QML examples.
Qt Continuous Integration System [Thu, 24 Nov 2011 09:19:07 +0000 (19:19 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Linux-Symbian parallel cross-compilation configure step
Symbian: don't merge native clipboard, overwrite.
Surviving out of memory in Qt Quick app
Export QtGui functions required by QtMultimediaKit backend
fix bearer crash
Fix alignment of non-wrapped richtext QML Text elements.
Daniel Molkentin [Thu, 24 Nov 2011 09:02:58 +0000 (10:02 +0100)]
Compile fix for Mac OS X.
Reviewed-By; Casper van Donderen
Water-Team [Thu, 24 Nov 2011 00:00:14 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Qt Continuous Integration System [Wed, 23 Nov 2011 19:44:27 +0000 (05:44 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix build error: specifying full path to pro file is required here.
Daniel Molkentin [Wed, 23 Nov 2011 14:24:24 +0000 (15:24 +0100)]
Fix build error: specifying full path to pro file is required here.
Reviewed-By: Oswald Buddenhagen
Qt Continuous Integration System [Wed, 23 Nov 2011 14:34:53 +0000 (00:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix manifest install rule on windows
Qt Continuous Integration System [Wed, 23 Nov 2011 14:18:30 +0000 (00:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Fix Linux-Symbian parallel cross-compilation configure step
Daniel Molkentin [Wed, 23 Nov 2011 12:57:13 +0000 (13:57 +0100)]
Fix manifest install rule on windows
Reviewed-by: Oswald Buddenhagen
Pasi Pentikainen [Tue, 22 Nov 2011 15:08:48 +0000 (17:08 +0200)]
Fix Linux-Symbian parallel cross-compilation configure step
The qtconfig.flm is mostly rewritten to support parallel Raptor
Linux-Symbian cross-compilation.
Reviewed-by: Miikka Heikkinen
Done-with: Samu Sillanpaa
Task-number: QTBUG-14361
Qt Continuous Integration System [Wed, 23 Nov 2011 10:06:53 +0000 (20:06 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
Sequential reading not supported.
DeclarativeDebugServer: Instantiate QPluginLoader on heap
Fix failing unit tests.
qmlplugindump: Fix dumping empty names for generated QMetaObjects.
Fix compile with -qtnamespace
Properly protect access to pixmap reader thread with mutex
Move tga support from Qt3d to Qt.
Move tga support from Qt3d to Qt.
Properly protect access to pixmap reader thread with mutex
qmlplugindump: Add flush to fix output redirection on windows.
Qt Continuous Integration System [Wed, 23 Nov 2011 06:03:17 +0000 (16:03 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
QNetworkProxy documentation: mention usage of "http_proxy" variable
Qt Continuous Integration System [Wed, 23 Nov 2011 01:41:59 +0000 (11:41 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Hide png symbols in a namespace for -qt-libpng
Water-Team [Wed, 23 Nov 2011 00:00:14 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water
Qt Continuous Integration System [Tue, 22 Nov 2011 21:34:44 +0000 (07:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits)
Add note to declarative calculator example
Help: Add \depends to all declarative examples & demos
Declarative Examples: Fall back to local qmlapplicationviewer.
Fix qdoc output for <dependency> tag.
Change installation location of examples.
Add Symbian platform notes.
Fix "make install" for declarative examples
Add C++11 support and QThreadLocalStorage changes to docs.
Update the license in the qmlapplicationviewer.
Examples: Add Copright headers, Remove stray file.
Compile fix.
Fix use of qmlapplicationviewer.
Doc: Create relative pathes in Manifest files.
Doc: Copy manifest files to the places where Creator expects them.
qdoc3: qdoc supports \depends in 4.8
qdoc3: qdoc supports \depends in 4.8
Update qrc files.
Update qmlapplicationviewer template,
cppextensions/qgraphicslayout example corrections
demos/declarative/snake example corrections
...
Daniel Molkentin [Tue, 22 Nov 2011 18:18:37 +0000 (19:18 +0100)]
Add note to declarative calculator example
This example is not meant to be executed without qmlviewer, yet most
of it works. Add a warning for the uninitiated.
Reviewed-by: trustme
Daniel Molkentin [Tue, 22 Nov 2011 18:16:13 +0000 (19:16 +0100)]
Help: Add \depends to all declarative examples & demos
Reviwed-By: trustme
Daniel Molkentin [Tue, 22 Nov 2011 18:13:14 +0000 (19:13 +0100)]
Declarative Examples: Fall back to local qmlapplicationviewer.
Rubberstamped-by: Oswald Buddenhagen
Daniel Molkentin [Tue, 22 Nov 2011 16:05:48 +0000 (17:05 +0100)]
Fix qdoc output for <dependency> tag.
Also prepend relative path if required.
Reviewed-By: trustme
Daniel Teske [Tue, 22 Nov 2011 17:59:31 +0000 (18:59 +0100)]
Hide png symbols in a namespace for -qt-libpng
If qt is compiled with -qt-libpng then the png symbols
prevent a loading of another libpng. With this patch
the png symbols are hidden and thus it is possible
to load another libpng.
Reviewed-by: hjk <qtc-committer@nokia.com>
Qt Continuous Integration System [Tue, 22 Nov 2011 17:19:38 +0000 (03:19 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Webkit: Work around C++11 string literal source incompatibility.
Add spaces for string concatenation to work around C++11 source incompatibility.
Frederik Gladhorn [Tue, 22 Nov 2011 16:14:30 +0000 (17:14 +0100)]
Fix more permissions (no execute bit).
Casper van Donderen [Tue, 22 Nov 2011 16:02:57 +0000 (17:02 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
projects / qt:qt.git / log