qt:qt.git
5 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste... v4.8.0
Qt Continuous Integration System [Wed, 7 Dec 2011 21:22:48 +0000 (07:22 +1000)]
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation
  Fix HarfBuzz Thai character SARA AM handling

5 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Wed, 7 Dec 2011 13:45:19 +0000 (14:45 +0100)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/s60main/newallocator_hook.cpp

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 7 Dec 2011 12:48:49 +0000 (22: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:
  Revert "Fix sqlite driver memory eating due to close failure"

5 years agoRevert "Fix sqlite driver memory eating due to close failure"
Sinan Tanilkan [Wed, 7 Dec 2011 12:39:56 +0000 (13:39 +0100)]
Revert "Fix sqlite driver memory eating due to close failure"

Introduced a problem for the SDK (QTBUG-23036).

This reverts commit 9a5fb6bd5f0fb3b37897bf722e4cc1673309623c.

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 6 Dec 2011 19:30:48 +0000 (05:30 +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: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 6 Dec 2011 15:21:31 +0000 (01:21 +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 declarative examples and demos issue on Windows

5 years agoFix declarative examples and demos issue on Windows
Daniel Molkentin [Tue, 6 Dec 2011 13:42:51 +0000 (14:42 +0100)]
Fix declarative examples and demos issue on Windows

On Windows, if the resulting binaries reside in /Delease
and /Debug subdirs. Thus we require the same hack as on
Meego where the binary alone resides in the /bin subdir.

Reviewed-by: Alessandro Portale
5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 6 Dec 2011 00:07:45 +0000 (10: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: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Mon, 5 Dec 2011 19:29:20 +0000 (05:29 +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:

5 years agoSymbian: allow apps to disable GL multisampling
mread [Mon, 5 Dec 2011 13:30:31 +0000 (13:30 +0000)]
Symbian: allow apps to disable GL multisampling

On Symbian, QML apps had no way to disable GL multisampling if the
hardware supported it. This caused some apps to run out of graphics
memory and fail.

This change adds a way for apps to indicate that they don't want
multisampling, by setting an environment variable. For example:
  qputenv("QT_SYMBIAN_DISABLE_GL_MULTISAMPLE", "1");

This non-public API style was used as the use case is platform and
application specific, and not appropriate for public API.

Task-number: ou1cimx1#947771
Reviewed-by: Gareth Stockwell
5 years agoQSqlRelationalTableModel doesn't follow relations on the first column
Honglei Zhang [Mon, 5 Dec 2011 13:05:16 +0000 (15:05 +0200)]
QSqlRelationalTableModel doesn't follow relations on the first column

QSqlRelationalTableModel doesn't follow relations on the first column
of a table. The DisplayRole and the EditRole for indexes on column 0
are always the same. The bug is found in QSqlRelationalTableModel::data.

Task-number: QTBUG-20038
Reviewed-by: Charles Yin
5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 5 Dec 2011 06:06:46 +0000 (16:06 +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:
  Correct client rect calculation for MCL
  Symbian: Fix CBA display on application with multiple windows
  Fix def files
  doc - document symbian behaviour of QFile::link
  Symbian - prefer sessions started by this process to choose proxy
  Freezing Def files in Qt
  Lightmaps demo Symbian fix
  CBA comes on top of option menu
  Fix memory leaks in OpenVG and OpenGL resource pools
  Fix sqlite driver memory eating due to close failure

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Mon, 5 Dec 2011 02:05:39 +0000 (12:05 +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:
  qmlplugindump: Fix missing flush for objects that don't fit a line.
  qmlplugindump: Avoid reporting types as attaching to themselves.

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
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.

5 years agosymbian - don't export qsymbianbearer.qtplugin twice
Shane Kearns [Fri, 2 Dec 2011 14:56:28 +0000 (14:56 +0000)]
symbian - don't export qsymbianbearer.qtplugin twice

The file was being exported using both prj_exports and deployment
lines. As deployment is copying to epoc32 z and c directories, the
prj_exports is not needed.
Moved the prj_exports rules into the S60 5.0 section, where deployment
is not used but rather explicit rules added to the sis file.

Task-number: ou1cimx1#946574
Reviewed-by: mread
5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 2 Dec 2011 12:59:44 +0000 (22:59 +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:
  Correct client rect calculation for MCL

5 years agoCorrect client rect calculation for MCL
mread [Fri, 2 Dec 2011 11:44:56 +0000 (11:44 +0000)]
Correct client rect calculation for MCL

The clientRect calculation was adjusting the rectangle for the status
pane. But this is now taken into account in the rectangle from Avkon,
so we do not need to adjust when the status pane is there.

However Avkon is supplying an inconsistent clientRect depending on
whether we have all Avkon panes disabled (status pane and CBAs).
When enabled, Avkon takes the splitview keyboard off the clientRect
space, when disabled, Avkon ignores the splitview keyboard. Since we
want to ignore the splitview keyboard effect on the clientRect, we
only adjust when the Avkon panes are enabled.

This has been tested with splitview keyboard, orientation change and
debug output of the client rectangle returned in the following
situations:

 - Normal app with status pane and CBA
 - App with CBA but invisible status pane
 - App with status pane and CBA disabled

Task-number: ou1cimx1#938780
Reviewed-by: Miikka Heikkinen
5 years agoqmlplugindump: Fix missing flush for objects that don't fit a line.
Christian Kamm [Fri, 2 Dec 2011 08:30:48 +0000 (09:30 +0100)]
qmlplugindump: Fix missing flush for objects that don't fit a line.

The missing flush could result in script bindings appearing after the
closing brace of an object.

Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from e01219b77b1e889e70437635905d7ff820568e23)

5 years agoqmlplugindump: Avoid reporting types as attaching to themselves.
Christian Kamm [Tue, 29 Nov 2011 07:52:14 +0000 (08:52 +0100)]
qmlplugindump: Avoid reporting types as attaching to themselves.

Task-number: QTCREATORBUG-6625
Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
(backported from 409aecbe1e30aa1319ea72bf830c405827e13d21)

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
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

5 years agoFix QtDemo declarative examples
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
5 years agoCorrect image paths for dynamicscene
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
5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
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

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 1 Dec 2011 13:29:20 +0000 (23:29 +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: Fix CBA display on application with multiple windows

5 years agoSymbian: Fix CBA display on application with multiple windows
Miikka Heikkinen [Thu, 1 Dec 2011 13:01:01 +0000 (15:01 +0200)]
Symbian: Fix CBA display on application with multiple windows

If an application has more than one window and each window has widgets
that can receive focus, sometimes a situation happened when the last
focused window isn't actually the window that contains the current
focused widget, which led to displaying incorrect CBA. Changed
CBA displaying evaluation to be done whenever any control is focused
instead of just windows.

This can add a couple of extra S60->setRecursiveDecorationsVisibility()
calls to some applications, but since that is typically already called
multiple times anyway, it shouldn't be an issue.

Task-number: ou1cimx1#935663
Reviewed-by: Sami Merila
5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
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.

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 1 Dec 2011 07:47:03 +0000 (17:47 +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 def files
  doc - document symbian behaviour of QFile::link
  Symbian - prefer sessions started by this process to choose proxy
  Freezing Def files in Qt
  Lightmaps demo Symbian fix
  CBA comes on top of option menu
  Fix memory leaks in OpenVG and OpenGL resource pools
  Fix sqlite driver memory eating due to close failure

5 years agoFix def files
Jani Hautakangas [Thu, 1 Dec 2011 07:42:00 +0000 (09:42 +0200)]
Fix def files

Reviewed-by: TRUSTME
5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
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

5 years agoFix stack overwrite in QDBusDemarshaller
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
5 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 30 Nov 2011 19:35:57 +0000 (05:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix HarfBuzz Thai character SARA AM handling

5 years agoQt Linguist: Fix crashes
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>
5 years agofixed error generating wrong introspection string in header output file
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
5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
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

5 years agodoc - document symbian behaviour of QFile::link
Shane Kearns [Thu, 24 Nov 2011 16:49:23 +0000 (16:49 +0000)]
doc - document symbian behaviour of QFile::link

Task-number: ou1cimx1#943243
Reviewed-by: mread
5 years agoSymbian - prefer sessions started by this process to choose proxy
Shane Kearns [Thu, 24 Nov 2011 11:40:52 +0000 (11:40 +0000)]
Symbian - prefer sessions started by this process to choose proxy

When WLAN and 3G connections are both active, the proxy for the wrong
connection may have been chosen in the case of plain sockets or
QNetworkAccessManager with an invalid configuration.
When enumarating active connections to choose a proxy, prefer a connection
that was opened by this process.

Task-number: QTBUG-22615
Task-number: ou1cimx1#930701
Reviewed-by: mread
5 years agoBackport 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.

5 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 30 Nov 2011 14:36:08 +0000 (00:36 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Reduce unnecessary QtCore DLL loads during Symbian app thread creation

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
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

5 years agoRemove more "unused variable" warnings
Gabriel de Dietrich [Wed, 30 Nov 2011 14:06:08 +0000 (15:06 +0100)]
Remove more "unused variable" warnings

Reviewed-by: Frederik
5 years agoQTreeView: fix crash when starting a drag with hidden columns.
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
5 years agoFreezing Def files in Qt
Satyam Bandarapu [Mon, 28 Nov 2011 14:25:14 +0000 (16:25 +0200)]
Freezing Def files in Qt

Adding unfrozen exports to def files in Qt

Reviewed-by: mread
5 years agoLightmaps demo Symbian fix
Marko Kenttala [Wed, 30 Nov 2011 07:57:47 +0000 (09:57 +0200)]
Lightmaps demo Symbian fix

Enabling night mode does not work on Symbian devices as it uses
difference composition mode which is not available.

Application changed to use raster graphics engine which supports
difference composition mode.

Task-number: ou1cimx1#932185
Reviewed-by: Murray Read
5 years agoCBA comes on top of option menu
Ari Lehtola [Tue, 29 Nov 2011 08:08:05 +0000 (10:08 +0200)]
CBA comes on top of option menu

Layout has changed so that option menu starts from bottom of screen.
CBA is set behind in this case

Reviewed-by: Miikka Heikkinen
Task-number: ou1cimx1#932398

5 years agoReduce unnecessary QtCore DLL loads during Symbian app thread creation
mread [Wed, 30 Nov 2011 13:18:11 +0000 (13:18 +0000)]
Reduce unnecessary QtCore DLL loads during Symbian app thread creation

The Symbain fast allocator integration in Qt 4.7 loads QtCore.DLL to
check availablility. This load has been causing a crash in the Nokia
Store app when a different version of QtCore 4.7 is installed. The new
DLL is loaded and it's static data tries to initialise before the
allocator is set up.

This change stores the allocator setup function so that extra DLL loads
are not required. Now the same allocator setup function is used for the
lifetime of the app.

Reviewed-by: Shane Kearns
5 years agoFix memory leaks in OpenVG and OpenGL resource pools
Jani Hautakangas [Wed, 30 Nov 2011 12:41:39 +0000 (14:41 +0200)]
Fix memory leaks in OpenVG and OpenGL resource pools

Task-number: QTBUG-22743
Reviewed-by: Murray Read
5 years agoFix sqlite driver memory eating due to close failure
Honglei Zhang [Wed, 30 Nov 2011 11:36:40 +0000 (13:36 +0200)]
Fix sqlite driver memory eating due to close failure

If an ongoing query is not finalized before close function is
called, sqlite driver still tries to close the connection to
sqlite. In this case, sqlite reports an error to sqlite driver
which is not reported to the client. The failure in close causes
connection to sqlite unclosed and memory is not freed. This
fix tries to finalize all queries before close function is called.
The close function should succeed.

Task-number: QTBUG-16967
Reviewed-by: Charles Yin
5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
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

5 years agoQSQLITE 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
5 years agoFix HarfBuzz Thai character SARA AM handling
Jiang Jiang [Wed, 16 Nov 2011 14:27:28 +0000 (15:27 +0100)]
Fix HarfBuzz Thai character SARA AM handling

This patch is contributed by Thanomsub Noppaburana from libthai. It
added a special thai shaping function to handle SARA AM character
for fonts without OpenType rules to support it, like Nokia Pure Text
AS.

With modification to logClusters assignment to make sure that
QTextLine::glyphRuns(int from, int length) returns correct glyphs.

Task-number: QTBUG-21206
Change-Id: I5a78ee1ab2b4c874c7d0df17d4ee6d264ed5a790
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
5 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Wed, 30 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
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

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
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

5 years agoSymbian-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

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
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.
  ...

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
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.

5 years agoFix Symbian def-file
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
5 years agoSet execution bits for more scripts.
Frederik Gladhorn [Tue, 29 Nov 2011 10:58:57 +0000 (11:58 +0100)]
Set execution bits for more scripts.

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
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:

5 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 29 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
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:

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
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

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
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.
  ...

5 years agoSSL: fix build when compiled with -openssl-linked
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)

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
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

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
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.
  ...

5 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sun, 27 Nov 2011 00:00:12 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

5 years agoMerge remote-tracking branch 'upstream/4.8'
Sergio Ahumada [Sat, 26 Nov 2011 23:16:08 +0000 (00:16 +0100)]
Merge remote-tracking branch 'upstream/4.8'

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
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
  ...

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
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

5 years agoMerge remote-tracking branch 'qt-qa-review/master'
Sergio Ahumada [Sat, 26 Nov 2011 18:55:41 +0000 (19:55 +0100)]
Merge remote-tracking branch 'qt-qa-review/master'

5 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 26 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
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

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
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

5 years agoMerge remote-tracking branch 'flex/master'
Pasi Pentikainen [Fri, 25 Nov 2011 10:24:17 +0000 (12:24 +0200)]
Merge remote-tracking branch 'flex/master'

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
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.
  ...

5 years agoSet execution bits for .test files.
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.

5 years agoMerge remote-tracking branch 'flex/master'
Pasi Pentikainen [Fri, 25 Nov 2011 09:22:08 +0000 (11:22 +0200)]
Merge remote-tracking branch 'flex/master'

5 years agoNew API to set AVKON flag to inputcontext in Qt/Symbian.
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

5 years agoAdded missing license header.
Rohan McGovern [Fri, 25 Nov 2011 02:14:23 +0000 (12:14 +1000)]
Added missing license header.

5 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 25 Nov 2011 00:00:13 +0000 (01:00 +0100)]
Merge branch '4.8-upstream' into master-water

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
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

5 years agoAdjust pathes once again.
Daniel Molkentin [Thu, 24 Nov 2011 17:22:05 +0000 (18:22 +0100)]
Adjust pathes once again.

Reviewed-by: trustme
5 years agoFixed a link
Kevin Wright [Thu, 24 Nov 2011 17:05:28 +0000 (18:05 +0100)]
Fixed a link

5 years agoFixed a link
Kevin Wright [Thu, 24 Nov 2011 17:03:27 +0000 (18:03 +0100)]
Fixed a link

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
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

5 years ago Split behavior and wigglytext examples
Kevin Wright [Thu, 24 Nov 2011 17:00:38 +0000 (18:00 +0100)]
 Split behavior and wigglytext examples

5 years agoRename files to show up in docs.
Casper van Donderen [Thu, 24 Nov 2011 16:51:49 +0000 (17:51 +0100)]
Rename files to show up in docs.

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
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

5 years agoWhitespace changes and added depends.
Kevin Wright [Thu, 24 Nov 2011 16:31:01 +0000 (17:31 +0100)]
Whitespace changes and added depends.

5 years agoFix up examples.
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
5 years agoFixed some linking issues.
Kevin Wright [Thu, 24 Nov 2011 16:27:09 +0000 (17:27 +0100)]
Fixed some linking issues.

5 years agoRemoved unecessary files from folders.
Kevin Wright [Thu, 24 Nov 2011 16:21:17 +0000 (17:21 +0100)]
Removed unecessary files from folders.

5 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
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

5 years agoFixes for the manifest and links.
Casper van Donderen [Thu, 24 Nov 2011 16:13:05 +0000 (17:13 +0100)]
Fixes for the manifest and links.

5 years agoChanged some of the short descriptions for WebView examples.
Kevin Wright [Thu, 24 Nov 2011 16:06:18 +0000 (17:06 +0100)]
Changed some of the short descriptions for WebView examples.

5 years agoRemoved unecessary duplicate files.
Kevin Wright [Thu, 24 Nov 2011 16:03:10 +0000 (17:03 +0100)]
Removed unecessary duplicate files.

5 years agoSymbian-linux crosscompilation case changes
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

5 years agoFix link to WebView examples.
Casper van Donderen [Thu, 24 Nov 2011 15:47:34 +0000 (16:47 +0100)]
Fix link to WebView examples.

5 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
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