qt:qt-iphone-clone.git
6 years agotweaked for missing imports when compiling simulator code. 4.7-iphone
Mark Kromis [Wed, 13 Jul 2011 14:02:02 +0000 (10:02 -0400)]
tweaked for missing imports when compiling simulator code.
Noted updates for compiling.

6 years agofixes QTBUG-17247
Mark Kromis [Mon, 11 Jul 2011 15:36:45 +0000 (11:36 -0400)]
fixes QTBUG-17247

6 years agoTweaked for current sdk, adjusted for localization compile.
Mark Kromis [Mon, 11 Jul 2011 00:20:04 +0000 (20:20 -0400)]
Tweaked for current sdk, adjusted for localization compile.

6 years agofixed moved includes
Mark Kromis [Sat, 9 Jul 2011 11:47:17 +0000 (07:47 -0400)]
fixed moved includes

6 years agoMerge commit 'refs/merge-requests/7' of git://gitorious.org/+qt-iphone/qt/qt-iphone...
Mark Kromis [Tue, 29 Mar 2011 08:54:17 +0000 (04:54 -0400)]
Merge commit 'refs/merge-requests/7' of git://gitorious.org/+qt-iphone/qt/qt-iphone-clone into merge-requests/7

6 years agoFix merge conflict for iOS.txt
Mark Kromis [Tue, 29 Mar 2011 08:53:12 +0000 (04:53 -0400)]
Fix merge conflict for iOS.txt

6 years agoMerge commit 'refs/merge-requests/5' of git://gitorious.org/+qt-iphone/qt/qt-iphone...
Mark Kromis [Tue, 29 Mar 2011 08:46:06 +0000 (04:46 -0400)]
Merge commit 'refs/merge-requests/5' of git://gitorious.org/+qt-iphone/qt/qt-iphone-clone into merge-requests/5

6 years agoMerge commit 'refs/merge-requests/4' of git://gitorious.org/+qt-iphone/qt/qt-iphone...
Mark Kromis [Tue, 29 Mar 2011 07:05:12 +0000 (03:05 -0400)]
Merge commit 'refs/merge-requests/4' of git://gitorious.org/+qt-iphone/qt/qt-iphone-clone into merge-requests/4

6 years agoFixed merge conflict for PNG Enable
Mark Kromis [Tue, 29 Mar 2011 06:54:02 +0000 (02:54 -0400)]
Fixed merge conflict for PNG Enable

6 years agoAdded fix for broken QString::toLongLong(), QString::toULongLong() and QString::toDou... 7
dragor [Mon, 28 Mar 2011 22:22:16 +0000 (16:22 -0600)]
Added fix for broken QString::toLongLong(), QString::toULongLong() and QString::toDouble() when running on iOS hardware.

6 years agoIt seems the last commit was not done correctly. As a result, all of the changes... 6
dragor [Mon, 28 Mar 2011 22:11:11 +0000 (16:11 -0600)]
It seems the last commit was not done correctly.  As a result, all of the changes for getting compiling for arm7 were not added.  This now has all the changes.

This also has a fix for when we create we create an OS widget without using a QWidget.  The application won't crash because qt_ios_find_window() can't find the QWidget that goes with the native widget.

6 years agoCreated the necessary configuration for running on the iOS arm7 architectures (iPad). 5
dragor [Mon, 28 Mar 2011 21:24:40 +0000 (15:24 -0600)]
Created the necessary configuration for running on the iOS arm7 architectures (iPad).

6 years agoChanged Platform.h so that the Qt threading classes will be used. This allows the... 4
dragor [Fri, 25 Mar 2011 22:02:55 +0000 (16:02 -0600)]
Changed Platform.h so that the Qt threading classes will be used.  This allows the script module to compile.

6 years agoEnabled PNG support. 3
dragor [Fri, 25 Mar 2011 21:45:26 +0000 (15:45 -0600)]
Enabled PNG support.

Removed redundant -isysroot setting.

6 years agoupdate for better cross-build support
Mark Kromis [Wed, 9 Mar 2011 12:43:32 +0000 (07:43 -0500)]
update for better cross-build support
moved qiosdefines.h to qiosdefines_ios.h
  so it does not auto add to <QtGui>

6 years agoMerge from main stable branch
Mark Kromis [Wed, 9 Feb 2011 11:07:43 +0000 (06:07 -0500)]
Merge from main stable branch

6 years agoinitial OpenGL edits.
Mark Kromis [Wed, 9 Feb 2011 10:53:07 +0000 (05:53 -0500)]
initial OpenGL edits.

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 3 Feb 2011 12:43:24 +0000 (22:43 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  My changes 4.7.2

6 years agoMy changes 4.7.2
Miikka Heikkinen [Thu, 3 Feb 2011 11:06:04 +0000 (13:06 +0200)]
My changes 4.7.2

Reviewed-by: TrustMe
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 3 Feb 2011 00:39:03 +0000 (10:39 +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 QMutex can deadlock when calling tryLock
  Fixed missing text when using static text items in GL 2 engine.
  Prevent recursion when creating window surface.
  Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
  document that QThread::exit will exit future event loops
  Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 2 Feb 2011 15:30:16 +0000 (01:30 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix for QTBUG-17035
  Carefull free the data from XGetWindowProperty on X11.
  Fixes memory leaks in QX11Embed

6 years agoFix for QTBUG-17035
kranthi [Wed, 2 Feb 2011 14:57:45 +0000 (16:57 +0200)]
Fix for QTBUG-17035

Reviewed-by: Aaron McCarthy
Task-number: QTBUG-17035

6 years agoFix QMutex can deadlock when calling tryLock
Olivier Goffart [Wed, 2 Feb 2011 10:31:20 +0000 (11:31 +0100)]
Fix QMutex can deadlock when calling tryLock

in the unix code, if the QMutexPrivate::wait() with a timeout
expires in the same moment that the mutex is released,  wakeup
would be set, but would be then ignored. (reset to false
quickly after)

If we waken up between the timeout and the re-aquisition of
the internal mutex, we consider that the mutex has been locked.

Reviewed-by: brad
Task-number: QTBUG-16115

6 years agoCarefull free the data from XGetWindowProperty on X11.
Denis Dzyubenko [Wed, 2 Feb 2011 11:54:20 +0000 (12:54 +0100)]
Carefull free the data from XGetWindowProperty on X11.

Make sure we free the data correctly in case of error.

Task-number: QTBUG-16616
Patch-by: Juuso Pakarinen
Reviewed-by: Ritt Konstantin
6 years agoFixes memory leaks in QX11Embed
Denis Dzyubenko [Wed, 26 Jan 2011 07:43:34 +0000 (08:43 +0100)]
Fixes memory leaks in QX11Embed

We should XFree the values returned from XGetWindowProperty.

Task-number: QTBUG-16597
Reviewed-by: Ritt Konstantin
6 years agoFixed missing text when using static text items in GL 2 engine.
Samuel Rødal [Tue, 1 Feb 2011 16:57:10 +0000 (17:57 +0100)]
Fixed missing text when using static text items in GL 2 engine.

When the context is destroyed and recreated, we end up with a new glyph
cache, but we only recreate the vertex arrays for the very first static
text item. We need to keep track of the glyph cache in each text item,
so that we can recreate the vertex arrays and re-populate the cache
accordingly. As the pointer might be the same after the glyph cache is
recreated, we need to use serial numbers instead.

We also need to re-create the cache when the context pointer has been
invalidated, so that the static text items also get invalidated, and
the texture glyph cache gets repopulated.

Reviewed-by: Eskil Abrahamsen Blomfeldt
6 years agoPrevent recursion when creating window surface.
Samuel Rødal [Tue, 1 Feb 2011 16:59:54 +0000 (17:59 +0100)]
Prevent recursion when creating window surface.

If we can't access the qt_gl_share_widget() we should just create a
raster window surface. This might happen when creating the share widget
itself leads to creation of a window surface (which isn't really going
to be used anyways).

Reviewed-by: Michael Dominic K
6 years agoFixed es2 configure when both EGL/egl.h and GLES/egl.h are present.
Samuel Rødal [Tue, 1 Feb 2011 16:12:11 +0000 (17:12 +0100)]
Fixed es2 configure when both EGL/egl.h and GLES/egl.h are present.

Change e0c2861976e06658a1d651941310407c15b0bcde fixed es1 configure by
only picking EGL/egl.h if GLES/egl.h is not found. This broke es2
configure on platforms where both EGL/egl.h and GLES/egl.h are present,
by picking GLES/egl.h instead of EGL/egl.h, which implicitly pulled in
the GLES/gl.h header as well, causing inconsistent declarations due to
both GLES2/gl2.h and GLES/gl.h getting included. Instead, we need to
prioritize depending on whether we're using es1 or es2. For es1, we
prefer GLES/egl.h, and for es2, we prefer EGL/egl.h. If only one of the
headers is found we still use it unconditionally, to preserve the
existing behaviour and minimize the risk of breaking other platforms.

Reviewed-by: Ritt Konstantin
Reviewed-by: Marius Storm-Olsen
6 years agodocument that QThread::exit will exit future event loops
Olivier Goffart [Wed, 2 Feb 2011 09:03:51 +0000 (10:03 +0100)]
document that QThread::exit will exit future event loops

Reviewed-by: Brad
6 years agoRevert "Restore Qt 4.6 behaviour: exec() always enters the event loop."
Olivier Goffart [Wed, 2 Feb 2011 08:27:53 +0000 (09:27 +0100)]
Revert "Restore Qt 4.6 behaviour: exec() always enters the event loop."

This reverts commit 2e72a8b19ea6c674fb4777860dac50faa5d387e6.

The behavour in Qt 4.6 was wrong.  And even if it was not documented,
it is too late to change the behaviour back at this point.

The tests for QEventLoop and QCoreApplication have not been reverted

Reviewed-by: Brad
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 1 Feb 2011 17:25:38 +0000 (03:25 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Don't ignore source-text when generating qsTrId translations for QML
  Fix a crash when undoing form layout

6 years agoDon't ignore source-text when generating qsTrId translations for QML
Tor Arne Vestbø [Tue, 1 Feb 2011 14:17:53 +0000 (15:17 +0100)]
Don't ignore source-text when generating qsTrId translations for QML

Reviewed-by: ossi
6 years agoFix a crash when undoing form layout
Jarek Kobus [Tue, 1 Feb 2011 12:15:28 +0000 (13:15 +0100)]
Fix a crash when undoing form layout

In a rare case when breaking a layout might
make widgets overlap, the internal heuristic
failed when recreating an original layout during undo.
Some widgets were removed from the grid.
The patch fixes this heuristic (makes sure
we don't remove other widgets). Creating
a form layout from overlapping widgets works
better now.

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Task-number: QTCREATORBUG-3616

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sun, 30 Jan 2011 03:48:37 +0000 (13:48 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix potential networking crash due to null-pointer dereference
  Revert "Improve timer ID safety by using a serial counter per ID."
  Invalidate QScriptPrograms when engine is destroyed
  Fix alignment issue causing crash in QtScript/JavaScriptCore
  Restore Qt 4.6 behaviour: exec() always enters the event loop.
  Make syncqt not complain about missing header macros.

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Sat, 29 Jan 2011 22:44:11 +0000 (08:44 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix potential networking crash due to null-pointer dereference
  Revert "Improve timer ID safety by using a serial counter per ID."
  Invalidate QScriptPrograms when engine is destroyed
  Fix alignment issue causing crash in QtScript/JavaScriptCore
  Restore Qt 4.6 behaviour: exec() always enters the event loop.
  Make syncqt not complain about missing header macros.

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Sat, 29 Jan 2011 18:31:28 +0000 (04:31 +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:
  Fix generated mif file cleaning in symbian-abld
  Fix typo in qglthreads auto test.
  Orientation control implementation for Symbian
  No longer replace dash and dot in TARGET with underscore in Symbian

6 years agoFix generated mif file cleaning in symbian-abld
Miikka Heikkinen [Fri, 28 Jan 2011 14:32:33 +0000 (16:32 +0200)]
Fix generated mif file cleaning in symbian-abld

Mif file cleaning was incorrectly done at distclean phase.

Task-number: QTBUG-16893
Reviewed-by: axis
6 years agoFix potential networking crash due to null-pointer dereference
Simon Hausmann [Fri, 28 Jan 2011 11:23:08 +0000 (12:23 +0100)]
Fix potential networking crash due to null-pointer dereference

An internal bug report suggests that we unconditionally dereference the backend
pointer in QNetworkReplyImpl when checking for the synchronity of the
originating request. The dereferencing code was introduced in commit
ad1e82323225e996720136e8b2d669166b8d8441. Unfortunately the report does not
detail where/how the crash happened, but it appears plausible that the backend
pointer became null, and the surrounding code that has extra checks suggests
this, too. In an attempt of defensive programming this patch introduces
the missing check in the reported line 112 as well as in other places
where it seems appropriate.

Reviewed-by: Peter Hartmann
6 years agoFix typo in qglthreads auto test.
Jani Hautakangas [Fri, 28 Jan 2011 11:12:47 +0000 (13:12 +0200)]
Fix typo in qglthreads auto test.

Reviewed-by: TRUSTME
6 years agoRevert "Improve timer ID safety by using a serial counter per ID."
Thiago Macieira [Fri, 28 Jan 2011 10:12:50 +0000 (11:12 +0100)]
Revert "Improve timer ID safety by using a serial counter per ID."

This reverts commit 121e2b39043a4ffc6583f250aebb9a3a746076c1. It was
considered too dangerous for 4.7.

6 years agoInvalidate QScriptPrograms when engine is destroyed
Kent Hansen [Fri, 28 Jan 2011 09:10:31 +0000 (10:10 +0100)]
Invalidate QScriptPrograms when engine is destroyed

If the engine is destroyed before the program, the program
must be invalidated; otherwise the program destructor will
access a stale engine pointer, which can cause a crash
(it crashes on Symbian, but "only" gives a Valgrind warning
on Linux for our autotests).

We need to keep track of all associated programs, just like
we already do for values and strings. This fix follows the
exact same pattern, but uses a QSet to keep the patch minimal.

No new tests, but the evaluateProgram() test runs successfully
on Symbian now, and there are no more Valgrind warnings.

Task-number: QTBUG-16987
Reviewed-by: Olivier Goffart
6 years agoFix alignment issue causing crash in QtScript/JavaScriptCore
Kent Hansen [Thu, 27 Jan 2011 15:29:52 +0000 (16:29 +0100)]
Fix alignment issue causing crash in QtScript/JavaScriptCore

When creating a substring, JSC::UStringImpl required that the
base string pointer was 8-byte aligned. However, on platforms
where FastMalloc isn't enabled (such as Symbian), it's possible
that the system malloc() returns a pointer that is only 4-byte
aligned. (On Symbian, this can happen if the argument to malloc()
itself isn't a multiple of 8.)

Cherry-picked http://trac.webkit.org/changeset/54743 from WebKit
trunk, which fixes this issue. (The commit happened shortly after
we rebased QtScript/JSC for 4.7, so it applies cleanly to our copy.)

Task-number: QTBUG-16828
Reviewed-by: Simon Hausmann
6 years agoOrientation control implementation for Symbian
mread [Tue, 25 Jan 2011 14:29:41 +0000 (14:29 +0000)]
Orientation control implementation for Symbian

This used the orientation control QWidget attributes API from
maemo5, and provides a simple implementation for Symbian.

The essense of the implementation is that the latest setting
of one of these QWidget orientation attributes will set the
orientation for the whole app. Testing the attributes will return
only the last attribute set, it will not return the app orientation
state.

A new task, QTBUG-16972, has been created to provide a more
comprehensive implementation in the future. This may provide a more
effective emulation of the maemo5 behaviour, or may incorporate
further reaching concepts for QML rotations.

Task-number: QTBUG-11785
Reviewed-by: Shane Kearns
6 years agoRestore Qt 4.6 behaviour: exec() always enters the event loop.
Thiago Macieira [Thu, 27 Jan 2011 10:49:49 +0000 (11:49 +0100)]
Restore Qt 4.6 behaviour: exec() always enters the event loop.

In Qt 4.6 as well as 4.7's QCoreApplication and QEventLoop, calling
exec() always enters the event loop, even if you had tried to
quit()/exit() it before entering, with one exception (noted in the
unit tests; this difference has been in Qt since at least Qt 4.2).

Add unit tests to ensure all of the three classes have the same
behaviour.

Decide if we want to match the behaviours in Qt 4.8.

Reviewed-by: Bradley T. Hughes
6 years agoNo longer replace dash and dot in TARGET with underscore in Symbian
Miikka Heikkinen [Thu, 27 Jan 2011 10:40:33 +0000 (12:40 +0200)]
No longer replace dash and dot in TARGET with underscore in Symbian

There is no fundamental reason to not have dash or dot in binary names
in Symbian, so do not replace them with underscore.

One thing that doesn't work with a dot in the filename is launching
an application via resources, so automatic resource generation is
suppressed for applications that have a dot in filename portion of
the TARGET value.

Task-number: QTBUG-16888
Reviewed-by: axis
6 years agoMake syncqt not complain about missing header macros.
Thiago Macieira [Thu, 27 Jan 2011 09:01:48 +0000 (10:01 +0100)]
Make syncqt not complain about missing header macros.

qsharedpointer_impl.h contains class definitions that are also
mirrored in qsharedpointer.h (which is there for qdoc3), so we have a
macro to stop processing.

Task-number: QTBUG-16912
Reviewed-by: Olivier Goffart
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 26 Jan 2011 17:49:58 +0000 (03:49 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix: define hotSpot for Gestures on Mac
  Fix warnings in PSQL driver: handle VersionUnknown in switch
  Fix warning in ODBC driver: passing NULL to non-pointer.
  QNAM FTP: switch to binary mode before sending a SIZE command
  Change the D-Bus signal filter to return NOT_YET_HANDLED for signals
  Check if the interpolators have already been deleted.
  Improve timer ID safety by using a serial counter per ID.

6 years agoFix: define hotSpot for Gestures on Mac
Zeno Albisser [Thu, 20 Jan 2011 13:54:06 +0000 (14:54 +0100)]
Fix: define hotSpot for Gestures on Mac

If there is no hotSpot defined for a gesture it cannot be propagated
propperly within GraphicsView.

Task-number: QTBUG-16618
Reviewed-by: Denis Dzyubenko
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 26 Jan 2011 14:19:43 +0000 (00:19 +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:
  QComboBox popup incorrectly opened in Sym^3

6 years agoFix warnings in PSQL driver: handle VersionUnknown in switch
Thiago Macieira [Fri, 21 Jan 2011 22:05:37 +0000 (23:05 +0100)]
Fix warnings in PSQL driver: handle VersionUnknown in switch

6 years agoFix warning in ODBC driver: passing NULL to non-pointer.
Thiago Macieira [Fri, 21 Jan 2011 22:04:33 +0000 (23:04 +0100)]
Fix warning in ODBC driver: passing NULL to non-pointer.

Warning was:
passing NULL to non-pointer argument 7 of 'SQLRETURN SQLGetDiagRecW(SQLSMALLINT, void*, SQLSMALLINT, SQLWCHAR*, SQLINTEGER*, SQLWCHAR*, SQLSMALLINT, SQLSMALLINT*)'

6 years agoQNAM FTP: switch to binary mode before sending a SIZE command
Thiago Macieira [Fri, 14 Jan 2011 19:15:37 +0000 (20:15 +0100)]
QNAM FTP: switch to binary mode before sending a SIZE command

With some servers, SIZE is not allowed in ASCII mode or it may return
different sizes. Since we transfer in binary anyway, better get the
size in binary too.

Reviewed-by: Peter Hartmann
6 years agoChange the D-Bus signal filter to return NOT_YET_HANDLED for signals
Thiago Macieira [Mon, 20 Dec 2010 18:38:11 +0000 (19:38 +0100)]
Change the D-Bus signal filter to return NOT_YET_HANDLED for signals

6 years agoCheck if the interpolators have already been deleted.
Thiago Macieira [Wed, 26 Jan 2011 13:06:11 +0000 (14:06 +0100)]
Check if the interpolators have already been deleted.

During application destruction, the order in which static destructors
is run is undetermined. So avoid a null-pointer dereference.

Task-number: QTBUG-16855
Reviewed-by: Robin Burchell
Patch by task reporter

6 years agoImprove timer ID safety by using a serial counter per ID.
Thiago Macieira [Mon, 13 Dec 2010 14:38:47 +0000 (15:38 +0100)]
Improve timer ID safety by using a serial counter per ID.

The high bits of the counter are not used, so we store a serial
counter there.

This has nothing to do with the serial counter used in
nextFreeTimerId, which is there for ABA protection.

Reviewed-by: Bradley T. Hughes
6 years agoQComboBox popup incorrectly opened in Sym^3
Sami Merila [Wed, 26 Jan 2011 12:27:35 +0000 (14:27 +0200)]
QComboBox popup incorrectly opened in Sym^3

QCombobox popup opens into incorrect position in Sym^3. This is due
to that there is a new layout in use, where softkeys are positioned
at the bottom. The current implementation just checks if native stacon
component is in use and if not, puts the popup to left/right border
of the application area (depending on UI direction).

Task-number: QTBUG-16886
Reviewed-by: Miikka Heikkinen
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 26 Jan 2011 11:07:58 +0000 (21:07 +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:
  Add util/xkbdatagen/README

6 years agoAdd util/xkbdatagen/README
Olivier Goffart [Tue, 25 Jan 2011 17:24:58 +0000 (18:24 +0100)]
Add util/xkbdatagen/README

Reviewed-by: Joao
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 26 Jan 2011 07:38:14 +0000 (17:38 +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:
  Application background is incorrect if app locked to landscape.

6 years agoApplication background is incorrect if app locked to landscape.
Sami Merila [Wed, 26 Jan 2011 07:05:19 +0000 (09:05 +0200)]
Application background is incorrect if app locked to landscape.

If application orientation has been locked to landscape and application
is started out while device orientation is portrait, QS60Style draws
the QPalette::background like device would be in landscape. Style
is incorrectly following device orientation, when it should follow
application orientation.

As a fix, style follows now application orientation. As a bonus,
unnecessary fullscreen QPixmap creation is avoided when rotating the
device.

Task-number: QTBUG-16816
Reviewed-by: Jani Hautakangas
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 26 Jan 2011 00:33:34 +0000 (10:33 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
  Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
  add autotest for digest authentication
  QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
  Improved performance of mapFromGlobal/mapToGlobal on X11
  Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Tue, 25 Jan 2011 22:24:10 +0000 (08:24 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
  Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
  add autotest for digest authentication
  QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
  Improved performance of mapFromGlobal/mapToGlobal on X11
  Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 25 Jan 2011 18:57:28 +0000 (04:57 +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:
  Temporary fix for ambiguous cast from four letter char constant
  Fix QMAKE_POST_LINK in Symbian for targets with special characters.

6 years agoQtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Kent Hansen [Tue, 25 Jan 2011 16:06:16 +0000 (17:06 +0100)]
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap

Cherry-picked from http://trac.webkit.org/changeset/56370

The old allocator caused QML to crash in MCL (TB10.1, week 1).

Task-number: QTBUG-14293
Reviewed-by: Simon Hausmann
6 years agoRevert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
Kent Hansen [Tue, 25 Jan 2011 15:50:22 +0000 (16:50 +0100)]
Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"

This reverts commit 7db489a0de073a2a56fe32d16f1cbe1bebdfd06d.

The change to CollectorHeapIterator.h is not Symbian-specific and
it introduced test failures on all platforms
(tst_QScriptEngineAgent::positionChange_3()).

6 years agoTemporary fix for ambiguous cast from four letter char constant
Eckhart Koppen [Tue, 25 Jan 2011 13:11:33 +0000 (15:11 +0200)]
Temporary fix for ambiguous cast from four letter char constant

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Tue, 25 Jan 2011 14:53:28 +0000 (00:53 +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 cursor position adjustment when removing strings

6 years agoadd autotest for digest authentication
Peter Hartmann [Mon, 24 Jan 2011 13:22:57 +0000 (14:22 +0100)]
add autotest for digest authentication

Reviewed-by: Markus Goetz
Task-number: QTBUG-15070

6 years agoFix cursor position adjustment when removing strings
Jiang Jiang [Mon, 24 Jan 2011 18:09:38 +0000 (19:09 +0100)]
Fix cursor position adjustment when removing strings

Commit 0ba1b4d0 introduced a regression to QTextDocument: it postponed
cursor position adjustment until the move operation is done, but
contentsChanged will be triggered by finishEdit() in this move
operation, thus cursor positions in this signal handler will be in
inconsistent states (normally we should first update cursor position
then trigger contentsChanged). In this case we should also postpone
finishEdit() handling after cursor positions have been adjusted, then
the states expose to applications will be consistent.

Task-number: QTBUG-15857
Reviewed-by: Eskil
6 years agoFix QMAKE_POST_LINK in Symbian for targets with special characters.
Miikka Heikkinen [Tue, 25 Jan 2011 11:49:46 +0000 (13:49 +0200)]
Fix QMAKE_POST_LINK in Symbian for targets with special characters.

Proper fixed targets was not used to generate the dependency for
QMAKE_POST_LINK in symbian-sbsv2, causing post linking to happen
before actual linking.

Task-number: QTBUG-16881
Reviewed-by: axis
6 years agoQtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Kent Hansen [Tue, 25 Jan 2011 10:39:37 +0000 (11:39 +0100)]
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap

Cherry-picked from http://trac.webkit.org/changeset/56370

The old allocator caused QML to crash in MCL (TB10.1, week 1).

Task-number: QTBUG-14293
Reviewed-by: Simon Hausmann
6 years agoImproved performance of mapFromGlobal/mapToGlobal on X11
Denis Dzyubenko [Tue, 25 Jan 2011 09:01:56 +0000 (10:01 +0100)]
Improved performance of mapFromGlobal/mapToGlobal on X11

We don't call XTranslateCoordinates anymore, but use the toplevel window
offset that we already store to convert between screen coordinates and
widget coordinates.

Reviewed-by: João Abecasis
6 years agoMoved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
Denis Dzyubenko [Tue, 25 Jan 2011 09:45:41 +0000 (10:45 +0100)]
Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate

Reviewed-by: João Abecasis
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 25 Jan 2011 03:12:02 +0000 (13:12 +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:
  Avoid possible font name collisions on fbserv

6 years agoAvoid possible font name collisions on fbserv
Alessandro Portale [Mon, 24 Jan 2011 20:43:03 +0000 (21:43 +0100)]
Avoid possible font name collisions on fbserv

QTBUG-6611 implemented the long awaited app font support on Symbian. One
of the problems with the underlying Symbian Api for font loading is that
all fonts go into one system wide font store on fbserv. All fonts are
visible to and accessible by every application. And there is no way to
find out if a font is an app font and whose process' app font it is. If
a font with a certain family name is already loaded on fbserv, no other
application can load its font with the same family name. If two
applications access the same font, bad things can happen (details:
QTBUG-16514).

This patch works around naming collisions on the fbserv. It also
prevents Qt applications from using other Qt applications' app fonts. It
does so by "marking" the name of the temporary ttf file before the file
gets loaded by fbserv. All font name strings in the font's 'name' table
get a marker string appended. The marker is composed by a "Q", the uid3,
and on Symbian^3|PR1&below the pid. The marker length is four characters.
When the QFontDatabase is populated, all own app font names are cleand
from the marker, so that the Qt app can use the original font name. Other
applications' app fonts are detected and filtered out of the own font
database.

Symbian's font Api supports only 24 characters as names for font
families. The name marker reduces the effective characters to 20. The
reduced name length is documented for
QFontDatabase::addApplication[FontFromData] as a note.

Since the app font feature is much safer now, it got re-enabled for
Symbian^1 and below by reverting
25ac59fcf1bb03c9af9a2c967218c96c7c77361a .

Task-number: QTBUG-16514

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 24 Jan 2011 23:21:06 +0000 (09:21 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update of Czech translation for Qt 4.7-stable

6 years agoUpdate of Czech translation for Qt 4.7-stable
Pavel Fric [Mon, 24 Jan 2011 20:11:46 +0000 (21:11 +0100)]
Update of Czech translation for Qt 4.7-stable

Merge-request: 2553
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 24 Jan 2011 19:46:58 +0000 (05:46 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix crash in QtScript/JSC stack allocator on Symbian
  HTTP: fix digest authentication

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 24 Jan 2011 16:33:33 +0000 (02:33 +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:
  Fixed UTF-8 application names in device application menu in Symbian

6 years agoFix crash in QtScript/JSC stack allocator on Symbian
Kent Hansen [Mon, 24 Jan 2011 14:32:11 +0000 (15:32 +0100)]
Fix crash in QtScript/JSC stack allocator on Symbian

The reserved (virtual) size of the chunk is not necessarily a
multiple of the "pool" size (the physical growth increment).
The reserved size is only rounded up to a multiple of the page
size (4K), not the pool size (64K).

This meant that the commit of the _last_ part of the chunk could
(and did) fail, because we tried to commit 64K while only a size
<64K was remaining.

Detect this case and reduce the requested size accordingly.
Also add a call to CRASH() in case Commit() returns an error,
to avoid obscure crashes in JSC at a later point (grow() must
not fail).

Task-number: QTBUG-16685
Reviewed-by: Simon Hausmann
6 years agoHTTP: fix digest authentication
Peter Hartmann [Mon, 24 Jan 2011 13:21:18 +0000 (14:21 +0100)]
HTTP: fix digest authentication

no need to extract the realm from the user; with digest authentication
the realm is an attribute of its own.

Reviewed-by: Markus Goetz
Task-number: QTBUG-15070

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 24 Jan 2011 13:06:08 +0000 (23:06 +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 loop count in animanted gifs sometimes being incorrect

6 years agoFix loop count in animanted gifs sometimes being incorrect
Simon Hausmann [Mon, 24 Jan 2011 12:06:29 +0000 (13:06 +0100)]
Fix loop count in animanted gifs sometimes being incorrect

Applied patch supplied in QT-4426, which also completes
https://bugs.webkit.org/show_bug.cgi?id=36818

Task-number: QT-4426
Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
6 years agoFixed UTF-8 application names in device application menu in Symbian
Miikka Heikkinen [Mon, 24 Jan 2011 10:35:12 +0000 (12:35 +0200)]
Fixed UTF-8 application names in device application menu in Symbian

CHARACTER_SET UTF8 statement was missing from generated .rss file,
causing localized application names containing UTF-8 characters
to be rendered incorrectly.

Task-number: QT-4476
Reviewed-by: axis
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 22:23:08 +0000 (08:23 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Validate arguments to QDBusConnection::connect

6 years agoValidate arguments to QDBusConnection::connect
Thiago Macieira [Fri, 14 Jan 2011 12:29:02 +0000 (13:29 +0100)]
Validate arguments to QDBusConnection::connect

This fixes a crash caused by user code trying to connect to object
paths that aren't valid (if we send this to the bus daemon, we get an
error with the AddMatch call).

Reviewed-by: Trust Me
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 16:59:19 +0000 (02:59 +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:
  make the test a bit stricter
  ignore the warning from auto-detach in destructor
  get rid of extra calls to handle()
  simplify QSharedMemory::detach()
  avoid extra calculations
  fix error reporting on detach()
  fix error reporting
  Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.

6 years agomake the test a bit stricter
Ritt Konstantin [Fri, 21 Jan 2011 15:29:10 +0000 (15:29 +0000)]
make the test a bit stricter

don't say we passed the test if we didn't

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoignore the warning from auto-detach in destructor
Ritt Konstantin [Fri, 21 Jan 2011 15:29:05 +0000 (15:29 +0000)]
ignore the warning from auto-detach in destructor

we locked shm few line ago and didn't unlock it, so we expecting for this warning

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoget rid of extra calls to handle()
Ritt Konstantin [Fri, 21 Jan 2011 15:29:01 +0000 (15:29 +0000)]
get rid of extra calls to handle()

in create(), handle() is called a few lines early;
in attach(), QSharedMemory::attach() calls handle() as a preparation step;
in detach(), well, if we're here, unix_key is valid anyways...

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agosimplify QSharedMemory::detach()
Ritt Konstantin [Fri, 21 Jan 2011 15:28:57 +0000 (15:28 +0000)]
simplify QSharedMemory::detach()

de-init members in the QSharedMemoryPrivate::detach() like in code for symbian.
this gains a lightly better control in case of errors on detach()

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoavoid extra calculations
Ritt Konstantin [Fri, 21 Jan 2011 15:28:53 +0000 (15:28 +0000)]
avoid extra calculations

QSystemSemaphore::setKey() sets the fileName member to makeKeyFileName()'s result;
no need to call it again

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agofix error reporting on detach()
Ritt Konstantin [Fri, 21 Jan 2011 15:28:49 +0000 (15:28 +0000)]
fix error reporting on detach()

before, we returned too early :)

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agofix error reporting
Ritt Konstantin [Fri, 21 Jan 2011 15:28:44 +0000 (15:28 +0000)]
fix error reporting

that was mistakenly broken by 570e7b38487455d394b5b74a59edc639f3dc416f

Merge-request: 1018
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoMake QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.
Miikka Heikkinen [Fri, 21 Jan 2011 14:29:27 +0000 (16:29 +0200)]
Make QMAKE_EXTENSION_SHLIB and friends work in all Symbian mkspecs.

Reviewed-by: axis
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 13:13:57 +0000 (23:13 +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:
  Fix to pen state handling in OpenVG paint engine.

6 years agoFix to pen state handling in OpenVG paint engine.
Jani Hautakangas [Fri, 21 Jan 2011 12:37:46 +0000 (13:37 +0100)]
Fix to pen state handling in OpenVG paint engine.

Shape should not be filled using pen if pen brush
type is NoBrush. OpenVG paint engine didn't check
NoBrush case when applying pen.

Task-number: QTBUG-15870
Reviewed-by: Gunnar
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 21 Jan 2011 08:47:34 +0000 (18:47 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  BorderImage fails for .sci source containing a URL
  positionViewAtIndex can fail when positioned near end of list.

6 years agoBorderImage fails for .sci source containing a URL
Martin Jones [Fri, 21 Jan 2011 05:38:15 +0000 (15:38 +1000)]
BorderImage fails for .sci source containing a URL

Task-number: QTBUG-16769
Reviewed-by: Bea Lam
6 years agopositionViewAtIndex can fail when positioned near end of list.
Martin Jones [Fri, 21 Jan 2011 05:03:35 +0000 (15:03 +1000)]
positionViewAtIndex can fail when positioned near end of list.

We positioned the view beyond the bounds, which in some cases resulted
in only one item being created.  Combined with a bug in the bounds
fixup very many items were created.

Task-number: QT-4441
Reviewed-by: Michael Brasser