qt:digia-qt.git
7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste... 4.8
Qt Continuous Integration System [Fri, 24 Jun 2011 21:50:54 +0000 (07:50 +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: (28 commits)
  Use numeric virtual keyboard for all number entry modes.
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 24 Jun 2011 18:09:46 +0000 (04:09 +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:
  qsystemlibrary needs no special treatment

7 years agoqsystemlibrary needs no special treatment
Oswald Buddenhagen [Fri, 24 Jun 2011 14:00:19 +0000 (16:00 +0200)]
qsystemlibrary needs no special treatment

this was just a merge artifact

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 24 Jun 2011 09:56:09 +0000 (19: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:
  my changelog for 4.8.0
  QAuthenticator::setUser() parse user name in form user@domain
  tst_qnetworkreply: add a test for http abort.
  Fix a case of SP_MediaSkipForward returning the wrong pixmap.
  fix an incorrect OpenMode flags handling in QBuffer::open()
  move some internal helper functions from qglobal.cpp to qcore_mac*
  make the previous change foolproof
  get rid of extra copying (another one)
  get rid of extra copying
  add a benchmark for QCFString
  Fix errors in qsocketnotifier test

7 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 24 Jun 2011 09:52:41 +0000 (11:52 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp

7 years agoMerge remote-tracking branch 'origin/4.8'
Olivier Goffart [Fri, 24 Jun 2011 09:12:15 +0000 (11:12 +0200)]
Merge remote-tracking branch 'origin/4.8'

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration 4.7
Qt Continuous Integration System [Thu, 23 Jun 2011 21:44:01 +0000 (07:44 +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:
  Use numeric virtual keyboard for all number entry modes.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 23 Jun 2011 13:13:51 +0000 (23:13 +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:
  Add a function that returns the D-Bus local machine ID
  Add an SSE4.2 even simpler version of toLatin1

7 years agomy changelog for 4.8.0
Peter Hartmann [Thu, 23 Jun 2011 12:56:45 +0000 (14:56 +0200)]
my changelog for 4.8.0

7 years agoUse numeric virtual keyboard for all number entry modes.
Miikka Heikkinen [Thu, 23 Jun 2011 12:33:42 +0000 (15:33 +0300)]
Use numeric virtual keyboard for all number entry modes.

Qt::DialableCharactersOnly and Qt::ImhFormattedNumbersOnly now use
numeric mode virtual keyboard as they are supposed to. '*' and '#' keys
can be used to enter the non-digit characters allowed in these modes.

Task-number: QT-5085
Reviewed-by: Sami Merila
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 23 Jun 2011 11:11:35 +0000 (21:11 +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:
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed

7 years agoAdd a function that returns the D-Bus local machine ID
Thiago Macieira [Tue, 21 Jun 2011 19:14:01 +0000 (21:14 +0200)]
Add a function that returns the D-Bus local machine ID

Reviewed-by: Lars Knoll
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 23 Jun 2011 08:57:08 +0000 (18:57 +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:
  Skip boundry neutral characters in bidi itemization
  Update autotest case after toHtml change
  Proper fix for previous deallocation problem
  No need to destroy match pattern again
  Fix fontconfig usage in X11 font database
  Fix empty lines in Qt HTML when displayed in external browsers (again)
  Make it possible to set color of QStaticText with pixel size >= 64

7 years agoQTBUG-17776, reporting terminated threads as not running on Symbian
mread [Wed, 22 Jun 2011 10:39:23 +0000 (11:39 +0100)]
QTBUG-17776, reporting terminated threads as not running on Symbian

On Symbian app shutdown all threads are terminated and their stack
memory is released, but there is no time for notification of exit of
these threads. So any attempt to access stack data in such a thread
from static data destruction will cause a crash.

This was happening with the XmlQuery thread. It was testing if the
thread was still running, and QThread thought it was because there was
no notification. So when the XmlQuery thread was asked to exit, and
QThread::exit tried to access a stack based QEventLoop, there was a
crash.

By adding a test if the thread has been terminated to
QThread::isRunning(), clients can now rely on this to know that it is
safe to call exit() on a thread. The existing code is made safe again.

Task-number: QTBUG-17776
Reviewed-by: Shane Kearns
7 years agoSplitview - Auto-translation rules changed
Sami Merila [Thu, 23 Jun 2011 07:38:02 +0000 (10:38 +0300)]
Splitview - Auto-translation rules changed

When using "splitview" (virtual keyboard with non-fullscreen
editing mode), it is currently auto-translating the cursor to the
center of the screen if possible.

It would be preferable, if the translation would only be minimal,
just enough for cursor to be visible. This makes scrolling of
input widget (i.e. large editor) easier to use, as text flows
naturally (row-by-row) and not in "jumps" like it used to do.

Additionally, limit the translation to the end of input widget
boundary.

Task-number: QTBUG-20034
Reviewed-by: Miikka Heikkinen
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 23 Jun 2011 06:55:52 +0000 (16:55 +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:
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.

7 years agoSupport clipboard function on Symbian
Guoqing Zhang [Thu, 23 Jun 2011 06:41:50 +0000 (09:41 +0300)]
Support clipboard function on Symbian

Task-number: QTBUG-19996
Reviewed-by: Sami Merila
7 years agoAdded qmlshadersplugin to Symbian qt.iby-file.
Marko Niemelä [Thu, 23 Jun 2011 06:40:34 +0000 (09:40 +0300)]
Added qmlshadersplugin to Symbian qt.iby-file.

Task-number: QTBUG-18346
Reviewed-by: Sami Merila
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 23 Jun 2011 02:05:15 +0000 (12:05 +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 autotest build failure in qdatetime

7 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Wed, 22 Jun 2011 22:15:40 +0000 (08:15 +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:
  Fix crash in PropertyChanges.
  Scroll correctly when cursorPosition is changed within onTextChanged.
  Fixing OpenGL module build error on Solaris
  Fix dialog position adjustment regression in Symbian
  SSL readbuffer 16->32 kB
  Fixes to how resize event and layout request are posted.
  Limit the cookies count per domain to 50.
  Add missing freeTexture() from fix for QTBUG-19180
  Last word inputted was duplicated after input method hints changed
  Simplify texture pooling logic in GL graphics system.
  Fixed move a QGraphicsWidget and invalidate its layout at the same time
  Fix infinite recursion when changing geometry on Mac

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 21:43:10 +0000 (07:43 +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: (23 commits)
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  Symbian: Fix QFontInfo::pixelSize()
  Drop-down menu position is altered when Partial VKB is invoked
  Fix SVG icons on softkeys in new Symbian devices
  Fix screen dimensions after orientation change in split screen mode.
  Qmlshadersplugin examples added.
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 22 Jun 2011 18:03:06 +0000 (04: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:
  symbian socket engine: resolve some fixme and todo items

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 17:53:25 +0000 (03:53 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 22 Jun 2011 17:07:49 +0000 (03:07 +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:
  Skip boundry neutral characters in bidi itemization

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 14:34:13 +0000 (00:34 +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 QDeclarativeInspector when starting with ,block
  qmlplugindump: Add -v option.
  qmlplugindump: Fix emitted tooling version.

7 years agoAdd an SSE4.2 even simpler version of toLatin1
Thiago Macieira [Wed, 22 Dec 2010 18:52:48 +0000 (19:52 +0100)]
Add an SSE4.2 even simpler version of toLatin1

Use the new PCMPESTRM instruction (Parallel CoMPare Explicit-length
STRings with result in a Mask) which is added in SSE4.2 for
facilitating string operations. The "compare ranges" mode allows us to
search for characters outside the Latin 1 range and then use the
SSE4.1 PBLENDVB instruction to replace those with question marks.

Unlike previous SSE compare instructions, the PCMPxSTRx family allows
us to operate on unsigned 16-bit values. This saves us another
parallel add.

Reviewed-By: Samuel Rødal
7 years agoSkip boundry neutral characters in bidi itemization
Jiang Jiang [Wed, 22 Jun 2011 12:23:47 +0000 (14:23 +0200)]
Skip boundry neutral characters in bidi itemization

According to UAX #9, bidiItemize should act as if those characters
don't exist. If we don't, dir and status.eor here may become
QChar::DirBN, thus interfere the result of bidiItemize.

Task-number: QTBUG-19949
Reviewed-by: Lars Knoll
7 years agoMerge remote branch 'origin/4.7' into qt-4.8-from-4.7
Jani Hautakangas [Wed, 22 Jun 2011 11:38:32 +0000 (14:38 +0300)]
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 22 Jun 2011 11:08:04 +0000 (21:08 +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: (108 commits)
  Doc: Fixed spelling errors that were blocking the CI system.
  QDeclarativeDebug: Fix cases where multiple packets arrive in one go
  Fix build break in S60 5.0 environment
  Added missing license headers.
  Skip softkeys update if application is not on foreground in Symbian
  Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
  DEF file updates for Symbian
  QTBUG-19883 Adding top level TRAP for QThreads on Symbian
  Added missing license headers.
  Fix js debugging autotest on Windows + Add license header
  Rewrite autotests for js debugging
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Rename qdeclarativescriptdebugging autotest directory
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  ...

7 years agoMerge remote branch 'qt-mainline/4.8'
aavit [Wed, 22 Jun 2011 11:01:36 +0000 (13:01 +0200)]
Merge remote branch 'qt-mainline/4.8'

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 22 Jun 2011 10:44:56 +0000 (20:44 +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:
  trivial: fix typo in comment
  changelog
  docu update for QNX 6.5
  get rid of anacronysm
  massive improvements for the QNX screen driver
  massive improvements for the QNX mouse driver
  massive improvements for the QNX keyboard driver
  disable the Embedded Linux data directory permissions check for QNX
  skip two subtests that are known to fail on QNX
  implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
  implement POSIX IPC based QSystemSemaphore and QSharedMemory backends
  add a configure-time check for an IPC support
  make QProcess really work on QNX
  make the kernel attempt to emulate an instruction with a misaligned access
  use RoundRobin scheduler by default on QNX
  a major refactoring of the mkspecs tree for QNX
  buildfix for qmake

7 years agoWorkaround webkit deadlock on macos x
Shane Kearns [Tue, 21 Jun 2011 13:50:08 +0000 (14:50 +0100)]
Workaround webkit deadlock on macos x

The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can
deadlock on the Mac, as the mac compiler inserts calls to
__cxa_guard_acquire and __cxa_guard_release around initialisation of
local statics.
In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static
Whereas webkit AtomicallyInitializedStatic is a local static variable
in any case.

Problem is triggered because webkit constructs QNetworkConfigurationManager
inside the constructor of a local static - networkStateNotifier
And the generic bearer plugin calls QNetworkInterface::allInterfaces
in the bearer thread, which needs an initialised Q_GLOBAL_STATIC.

Reviewed-by: Laszlo Agocs
7 years agosymbian socket engine: resolve some fixme and todo items
Shane Kearns [Wed, 1 Jun 2011 15:54:33 +0000 (16:54 +0100)]
symbian socket engine: resolve some fixme and todo items

Should be no behaviour changes from this commit, one function is renamed
and otherwise it is comment changes. (stuff we were unsure about when
creating the code initially but have decided to keep)

Multicast is not fully supported by symbian, and out of scope for the
QTBUG-7274 task. So the two stub functions are left with the ### comment
for the benefit of a future implementor.

Task-number: QTBUG-18371
Reviewed-by: Markus Goetz
7 years agotrivial: fix typo in comment
Harald Fernengel [Wed, 22 Jun 2011 09:01:40 +0000 (11:01 +0200)]
trivial: fix typo in comment

7 years agoMerge remote branch 'qt-qml-review/master' into master-qml-staging
Kai Koehne [Wed, 22 Jun 2011 07:52:05 +0000 (09:52 +0200)]
Merge remote branch 'qt-qml-review/master' into master-qml-staging

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 21 Jun 2011 19:58:19 +0000 (05:58 +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:

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Tue, 21 Jun 2011 15:07:16 +0000 (01:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  Fix QDeclarativeInspector when starting with ,block

7 years agoFix QDeclarativeInspector when starting with ,block
Aurindam Jana [Tue, 21 Jun 2011 13:59:44 +0000 (15:59 +0200)]
Fix QDeclarativeInspector when starting with ,block

Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93
Reviewed-by: kkoehne
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Tue, 21 Jun 2011 13:30:14 +0000 (23:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  QDeclarativeDebug: Fix cases where multiple packets arrive in one go
  Fix build break in S60 5.0 environment
  Skip softkeys update if application is not on foreground in Symbian
  Revert "Opening taskswitcher, pushes application softkeys to top of switcher"
  Fix js debugging autotest on Windows + Add license header
  Rewrite autotests for js debugging
  Rename qdeclarativescriptdebugging autotest directory
  Create property cache in case of Component{} root

7 years agochangelog
Ritt Konstantin [Tue, 21 Jun 2011 11:51:17 +0000 (13:51 +0200)]
changelog

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agodocu update for QNX 6.5
Ritt Konstantin [Tue, 21 Jun 2011 11:51:16 +0000 (13:51 +0200)]
docu update for QNX 6.5

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoget rid of anacronysm
Ritt Konstantin [Tue, 21 Jun 2011 11:51:15 +0000 (13:51 +0200)]
get rid of anacronysm

the QNX4 support was dropped-out - the Q_OS_QNX4 ifdef-ed code is a dead cargo;
the Q_OS_QNX6 macro was renamed to Q_OS_QNX

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agomassive improvements for the QNX screen driver
Ritt Konstantin [Tue, 21 Jun 2011 11:51:14 +0000 (13:51 +0200)]
massive improvements for the QNX screen driver

* implement the QWS client-server mode support;
* implement argb8888 (32bpp), rgb888 (24bpp) and rgb565 (16bpp) formats support
(both big- and little-endian);
* make the driver to use the system-configured/supported WxHxD dimensions
rather than a hard-coded WxHx'argb8888' one;
* implement screen blanking (dpms) support;
* proper resources clean-up on errors;
* code cleanups and various minor improvements

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agomassive improvements for the QNX mouse driver
Ritt Konstantin [Tue, 21 Jun 2011 11:51:13 +0000 (13:51 +0200)]
massive improvements for the QNX mouse driver

add support for the input devices with an absolute positioning;
decrease lagging on slow machines by queueing more mouse events than just 10 of them;
fix an issue with losing the button press state between subsequent loops (ie long drag'n'drop)

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agomassive improvements for the QNX keyboard driver
Ritt Konstantin [Tue, 21 Jun 2011 11:51:12 +0000 (13:51 +0200)]
massive improvements for the QNX keyboard driver

update the code to work on recent QNXs (6.4 and newer);
support all keycodes defined in sys/keycodes.h;
support unicodes as well as scancodes

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agodisable the Embedded Linux data directory permissions check for QNX
Ritt Konstantin [Tue, 21 Jun 2011 11:51:11 +0000 (13:51 +0200)]
disable the Embedded Linux data directory permissions check for QNX

so make it posible to store the Embedded Linux data directory
on ACL-less file systems (like various FATs, ETFS and so on)

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoskip two subtests that are known to fail on QNX
Ritt Konstantin [Tue, 21 Jun 2011 11:51:10 +0000 (13:51 +0200)]
skip two subtests that are known to fail on QNX

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoimplement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends
Ritt Konstantin [Tue, 21 Jun 2011 11:51:09 +0000 (13:51 +0200)]
implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoimplement POSIX IPC based QSystemSemaphore and QSharedMemory backends
Ritt Konstantin [Tue, 21 Jun 2011 11:51:08 +0000 (13:51 +0200)]
implement POSIX IPC based QSystemSemaphore and QSharedMemory backends

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoadd a configure-time check for an IPC support
Ritt Konstantin [Tue, 21 Jun 2011 11:51:07 +0000 (13:51 +0200)]
add a configure-time check for an IPC support

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agomake QProcess really work on QNX
Ritt Konstantin [Tue, 21 Jun 2011 11:51:06 +0000 (13:51 +0200)]
make QProcess really work on QNX

a multi-threaded QNX Process can't fork properly so we call spawn() instead

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agomake the kernel attempt to emulate an instruction with a misaligned access
Ritt Konstantin [Tue, 21 Jun 2011 11:51:05 +0000 (13:51 +0200)]
make the kernel attempt to emulate an instruction with a misaligned access

since Qt was not tested with a misaligned access checking turned on,
there are some issues in the QtGui module which leads to a crash with the SIGBUS signal.
disable the misaligned access checking for now...

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agouse RoundRobin scheduler by default on QNX
Ritt Konstantin [Tue, 21 Jun 2011 11:51:04 +0000 (13:51 +0200)]
use RoundRobin scheduler by default on QNX

otherwise drawn intensive apps will hog the cpu
and make the system appear frozen

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoa major refactoring of the mkspecs tree for QNX
Ritt Konstantin [Tue, 21 Jun 2011 11:51:03 +0000 (13:51 +0200)]
a major refactoring of the mkspecs tree for QNX

the common parts were moved into mkspecs/common/qnx/qmake.conf
and the redefinitions only were left in the target qmake.conf files.
this makes a customization process really-really easy now

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agobuildfix for qmake
Ritt Konstantin [Tue, 21 Jun 2011 11:51:02 +0000 (13:51 +0200)]
buildfix for qmake

Merge-request: 1259
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Tue, 21 Jun 2011 11:46:12 +0000 (21:46 +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:
  Update autotest case after toHtml change
  Proper fix for previous deallocation problem
  No need to destroy match pattern again
  Fix fontconfig usage in X11 font database
  Fix empty lines in Qt HTML when displayed in external browsers (again)
  Make it possible to set color of QStaticText with pixel size >= 64

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 21 Jun 2011 11:11:07 +0000 (21:11 +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:
  Adding debug output for not supported gl features
  Compile fix in network for ios
  Make it possible to compile in a screen plugin name in QWS
  Don't redefine EGL defines
  Compile fixes in corelib for ios
  Export IPHONEOS_DEPLOYMENT_TARGET from qmake
  Adding arm armv6 and armv7 as valid archs for mac builds
  reset certain global variables on deletion
  Made tst_QWidget::repaintWhenChildDeleted() pass.

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Tue, 21 Jun 2011 10:32:57 +0000 (20:32 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  qmlplugindump: Add -v option.
  qmlplugindump: Fix emitted tooling version.

7 years agoqmlplugindump: Add -v option.
Christian Kamm [Tue, 21 Jun 2011 09:59:49 +0000 (11:59 +0200)]
qmlplugindump: Add -v option.

Reviewed-by: Kai Koehne
7 years agoqmlplugindump: Fix emitted tooling version.
Christian Kamm [Tue, 21 Jun 2011 08:43:14 +0000 (10:43 +0200)]
qmlplugindump: Fix emitted tooling version.

Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1.

Reviewed-by: Kai Koehne
7 years agoUpdate autotest case after toHtml change
Jiang Jiang [Tue, 21 Jun 2011 09:23:20 +0000 (11:23 +0200)]
Update autotest case after toHtml change

cb760eaef631abd49836ae5c8dc12a61ef5eff0d changed the way we generate
HTML for empty blocks. tst_QTextDocument::toHtml has to be updated
accordingly.

Reviewed-by: Samuel
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 21 Jun 2011 09:32:53 +0000 (19: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:
  Fix autotest build failure in qdatetime

7 years agoFix autotest build failure in qdatetime
Honglei Zhang [Tue, 21 Jun 2011 09:18:34 +0000 (12:18 +0300)]
Fix autotest build failure in qdatetime

The commit 706fc1c894addd6602470b25aba686491c891a14 has unintentional
modification in qdatetime.pro. tst_qdatetime.loc shall not be added
to qdatetime.pro. This commit removes this line from the pro file.

Task-number: QTBUG-6859
Reviewed-by: Trust Me
7 years agoQAuthenticator::setUser() parse user name in form user@domain
Martin Petersson [Mon, 20 Jun 2011 11:03:40 +0000 (13:03 +0200)]
QAuthenticator::setUser() parse user name in form user@domain

Task-number: QTBUG-19894
Change-Id: I063dbc66e5f47a83cc1c0aee8913062b4b5e42bc
(cherry picked from commit d3313bc2f095dc15718b2a1ed613489ab1ae0927)

7 years agotst_qnetworkreply: add a test for http abort.
Martin Petersson [Wed, 1 Jun 2011 10:38:34 +0000 (12:38 +0200)]
tst_qnetworkreply: add a test for http abort.

Change-Id: Iec5fe195ff2befe92e759f77768240728bef31bd
(cherry picked from commit 752d807797a0021e412a20b0a8fcc34b4fd8e380)

7 years agoProper fix for previous deallocation problem
Jiang Jiang [Tue, 21 Jun 2011 07:25:19 +0000 (09:25 +0200)]
Proper fix for previous deallocation problem

The match FcPattern should be managed by QFontDatabase instead of
QFontEngineX11FT since the latter only used it once.

Reviewed-by: Samuel
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Tue, 21 Jun 2011 07:05:12 +0000 (17: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:
  QDeclarativeDebug: Fix cases where multiple packets arrive in one go
  Fix js debugging autotest on Windows + Add license header
  Rewrite autotests for js debugging
  Rename qdeclarativescriptdebugging autotest directory
  Create property cache in case of Component{} root

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml...
Kai Koehne [Tue, 21 Jun 2011 06:50:56 +0000 (08:50 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml-staging

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Tue, 21 Jun 2011 05:07:23 +0000 (15:07 +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:
  Fix crash in PropertyChanges.
  Scroll correctly when cursorPosition is changed within onTextChanged.

7 years agoFix crash in PropertyChanges.
Michael Brasser [Tue, 21 Jun 2011 02:18:49 +0000 (12:18 +1000)]
Fix crash in PropertyChanges.

Don't crash when adding an optimized binding to an object not associated
with a QDeclarativeEngine.

Change-Id: I4501e21e959380fedfafdc8bc477b330cffbce1b
Task-number: QTBUG-19914
Reviewed-by: Aaron Kennedy
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 20 Jun 2011 23:31:19 +0000 (09:31 +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: (82 commits)
  Doc: Fixed spelling errors that were blocking the CI system.
  Added missing license headers.
  Added missing license headers.
  Doc: Added missing license headers for documentation and examples.
  qdoc: Fixed code to match comments in QML files. Fixed API types.
  Doc: Speculative attempt to fix build breakage.
  Doc: Fixed file name of a header file to use lower case characters.
  Doc: Speculative attempt to fix build breakage.
  Doc: Fixed file name of a header file to use lower case characters.
  Doc: Fixed links.
  Doc: Added a snippet to show how to test the Qt version.
  Added an additional check to workaround an issue on Windows.
  Doc: Fixed a scope test for maemo5 and made an error a warning instead.
  converted to unix txt file
  try to resolve CRLR problems
  "TAB character in non-leading whitespace" fixed
  * fixed trailing- and whitespaces
  * "How To Learn Qt" is almost complete. Last section is missing * Several external and internal (Qt) web links added
  Undo accidental breakage.
  Doc: Added some more information about visited links in rich text.
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review
David Boddie [Mon, 20 Jun 2011 17:03:03 +0000 (19:03 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-review

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 20 Jun 2011 16:32:54 +0000 (02:32 +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 build break in S60 5.0 environment
  Skip softkeys update if application is not on foreground in Symbian
  Revert "Opening taskswitcher, pushes application softkeys to top of switcher"

7 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 20 Jun 2011 14:30:54 +0000 (00:30 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (45 commits)
  Fixing OpenGL module build error on Solaris
  Fix dialog position adjustment regression in Symbian
  SSL readbuffer 16->32 kB
  Limit the cookies count per domain to 50.
  Add missing freeTexture() from fix for QTBUG-19180
  Last word inputted was duplicated after input method hints changed
  Simplify texture pooling logic in GL graphics system.
  Update internal state before emitting configurationChanged() signals.
  Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
  Fixed qmlshadersplugin on windows VC2008 toolchain.
  Reset input context in Symbian when another window is opened.
  KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
  Close context menus during orientation change.
  Have -small-screen enabled in certain examples on Symbian always.
  Update Japanese translations.
  Revert some of "Make QMLViewer startup animation stop after a while"
  Fix for winscw QtGui.def
  Add private method for flushing the pixmap cache.
  QDeclarative: Fix QPerformanceTimer on Symbian
  Fix QTreeWidget autotest cases on Symbian/VGA
  ...

7 years agoNo need to destroy match pattern again
Jiang Jiang [Mon, 20 Jun 2011 12:52:00 +0000 (14:52 +0200)]
No need to destroy match pattern again

It is already freed in QFontEngineX11FT constructor.

Reviewed-by: Eskil
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Mon, 20 Jun 2011 12:29:01 +0000 (22:29 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (1968 commits)
  Doc: Fixed spelling errors that were blocking the CI system.
  Added missing license headers.
  DEF file updates for Symbian
  QTBUG-19883 Adding top level TRAP for QThreads on Symbian
  Added missing license headers.
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  Revert "Fix compilation of lrelease on Windows"
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  Also test http proxy in the QTcpServer benchmark
  Symbian QFileSystemWatcher: fix potential crash
  Enable QTcpServer benchmark on symbian
  Fix building the OpenVG graphicssystem on Linux with static libs
  fix build on windows 7
  Fix compilation of lrelease on Windows
  ...

7 years agoDoc: Fixed spelling errors that were blocking the CI system.
David Boddie [Mon, 20 Jun 2011 12:33:53 +0000 (14:33 +0200)]
Doc: Fixed spelling errors that were blocking the CI system.

7 years agoFix fontconfig usage in X11 font database
Jiang Jiang [Mon, 20 Jun 2011 11:47:01 +0000 (13:47 +0200)]
Fix fontconfig usage in X11 font database

We should do FcConfigSubstitute(0, pattern, FcMatchFont) on a
FcPattern for query because the family list in it will contain
almost all the families after FcConfigSubstitute(0, pattern,
FcMatchPattern), then the test in <match target="font"> will
almost always succeed. In general, FcMatchFont substitute
should only be done on the FcPattern that we got after
FcFontMatch() or FcFontRenderPrepare().

Based on the suggestion of fontconfig author Behdad Esfahbod,
this patch reorganized the tryPatternLoad logic so that it only
does the QFontEngine creation part, FcPattern *match is retrieved
outside of that function. In this way, the match pattern we got
can be either from FcFontMatch() or after FcFontRenderPrepare()
on one of the fonts we got from qt_fontSetForPattern(). Then we
don't need to duplicate the pattern and add all criterias back
with qt_addPatternProps(). It not only simplified the code a lot
but also fix the way we apply FcMatchFont substitution. This
substitution will either be done by FcFontMatch() or
FcFontRenderPrepare, both implicitly.

Task-number: QTBUG-2148, QTBUG-19947
Reviewed-by: Eskil
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml...
Kai Koehne [Mon, 20 Jun 2011 11:56:36 +0000 (13:56 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-qml-staging

7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Mon, 20 Jun 2011 11:53:18 +0000 (21:53 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QDeclarativeDebug: Fix cases where multiple packets arrive in one go

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Laszlo Agocs [Mon, 20 Jun 2011 11:37:37 +0000 (13:37 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

7 years agoQDeclarativeDebug: Fix cases where multiple packets arrive in one go
Kai Koehne [Mon, 20 Jun 2011 09:52:18 +0000 (11:52 +0200)]
QDeclarativeDebug: Fix cases where multiple packets arrive in one go

Make sure no packets get 'lost' when they're arriving in one go through
the TCP/IP socket.

Reviewed-by: Christiaan Janssen
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 20 Jun 2011 09:14:22 +0000 (19:14 +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: (23 commits)
  Fix build break in S60 5.0 environment
  Skip softkeys update if application is not on foreground in Symbian
  Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread"
  Fix alignment value not handled in ODF
  Silence a compiler warning about unhandled enum in switch
  Silence the "array out of bounds" warning in GCC 4.6.
  Silence the callgrind warnings in our source code when using gcc 4.6
  Create a function that merges the SSE common code
  Improve toLatin1 x86 SIMD by using a new SSE4.1 instruction
  Revert "Fix compilation of lrelease on Windows"
  QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread
  Also test http proxy in the QTcpServer benchmark
  Symbian QFileSystemWatcher: fix potential crash
  Enable QTcpServer benchmark on symbian
  Fix compilation of lrelease on Windows
  Allow selecting fonts with irregular style names
  Fix missing empty lines in Qt HTML when displayed in compliant browsers
  Protect against deleted windows
  When asking for relations, don't crash on children that don't return an interface.
  Remove more inconsistencies with invisible.
  ...

7 years agoFix empty lines in Qt HTML when displayed in external browsers (again)
Eskil Abrahamsen Blomfeldt [Mon, 20 Jun 2011 08:40:01 +0000 (10:40 +0200)]
Fix empty lines in Qt HTML when displayed in external browsers (again)

This redoes f541c78e1bc5b293466b40e6f10496199a4a5d73 in a way which
should be more compliant with different browsers. In particular,
Outlook didn't support the CSS trick in the last fix, so we need the
somewhat larger patch which adds an extra line break node to the tree
and then ignores it when re-importing the document.

Task-number: QTBUG-3669
Reviewed-by: Simon Hausmann
7 years agoMake it possible to set color of QStaticText with pixel size >= 64
Eskil Abrahamsen Blomfeldt [Mon, 20 Jun 2011 08:01:55 +0000 (10:01 +0200)]
Make it possible to set color of QStaticText with pixel size >= 64

Adding the fallback to QPainterPath for large QStaticTexts created a
regression where all text would be painted in black regardless of the
color you set on it. The color in QStaticTextItem is sometimes invalid,
in which case the current painter color should be used. In either case,
the color is already set on the current pen when entering
drawStaticTextItem() so we can just use that.

Task-number: QTBUG-19950
Reviewed-by: Jiang Jiang
7 years agoFix build break in S60 5.0 environment
Miikka Heikkinen [Mon, 20 Jun 2011 08:18:08 +0000 (11:18 +0300)]
Fix build break in S60 5.0 environment

Task-number: QTBUG-19225
Reviewed-by: Sami Merila
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
Qt Continuous Integration System [Mon, 20 Jun 2011 07:55:02 +0000 (17:55 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  Fix js debugging autotest on Windows + Add license header
  Rewrite autotests for js debugging
  Rename qdeclarativescriptdebugging autotest directory

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
Sami Lempinen [Mon, 20 Jun 2011 07:14:01 +0000 (10:14 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team

7 years agoDisable antialiasing for tiled image drawing.
Laszlo Agocs [Mon, 20 Jun 2011 07:08:32 +0000 (09:08 +0200)]
Disable antialiasing for tiled image drawing.

Task-number: QTBUG-19821
Reviewed-by: Jani Hautakangas
7 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Mon, 20 Jun 2011 06:19:34 +0000 (16:19 +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:
  Adding debug output for not supported gl features
  Compile fix in network for ios
  Make it possible to compile in a screen plugin name in QWS
  Don't redefine EGL defines
  Compile fixes in corelib for ios
  Export IPHONEOS_DEPLOYMENT_TARGET from qmake
  Adding arm armv6 and armv7 as valid archs for mac builds
  reset certain global variables on deletion
  Made tst_QWidget::repaintWhenChildDeleted() pass.

7 years agoAdding debug output for not supported gl features
Ian [Wed, 8 Jun 2011 11:21:59 +0000 (13:21 +0200)]
Adding debug output for not supported gl features

in the gl2 paintengine

Reviewed-by: Samuel
7 years agoCompile fix in network for ios
Ian [Wed, 8 Jun 2011 10:43:39 +0000 (12:43 +0200)]
Compile fix in network for ios

Reviewed-by: Jørgen Lind
7 years agoMake it possible to compile in a screen plugin name in QWS
Ian [Wed, 8 Jun 2011 10:41:11 +0000 (12:41 +0200)]
Make it possible to compile in a screen plugin name in QWS

Reviewed-by: Jørgen Lind
7 years agoDon't redefine EGL defines
Ian [Wed, 8 Jun 2011 10:40:17 +0000 (12:40 +0200)]
Don't redefine EGL defines

Reviewed-by: Jørgen Lind
7 years agoCompile fixes in corelib for ios
Ian [Wed, 8 Jun 2011 10:38:20 +0000 (12:38 +0200)]
Compile fixes in corelib for ios

Reviewed-by: Jørgen Lind
7 years agoExport IPHONEOS_DEPLOYMENT_TARGET from qmake
Ian [Wed, 8 Jun 2011 10:36:28 +0000 (12:36 +0200)]
Export IPHONEOS_DEPLOYMENT_TARGET from qmake

Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
7 years agoAdding arm armv6 and armv7 as valid archs for mac builds
Ian [Wed, 8 Jun 2011 10:34:42 +0000 (12:34 +0200)]
Adding arm armv6 and armv7 as valid archs for mac builds

Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
7 years agoreset certain global variables on deletion
Lars Knoll [Tue, 7 Jun 2011 13:06:53 +0000 (15:06 +0200)]
reset certain global variables on deletion

qt_button_down needs to be reset to 0 if it
points to the widget being deleted.

Reviewed-by: Samuel
7 years agoMade tst_QWidget::repaintWhenChildDeleted() pass.
Samuel Rødal [Mon, 6 Jun 2011 10:37:55 +0000 (12:37 +0200)]
Made tst_QWidget::repaintWhenChildDeleted() pass.

Implement some missing functionality in QWidget::destroy().
(cherry picked from commit 0273bc5d22cd1fa08854b023f9b6c318fc75f3fa)

7 years agoScroll correctly when cursorPosition is changed within onTextChanged.
Andrew den Exter [Mon, 20 Jun 2011 02:18:57 +0000 (12:18 +1000)]
Scroll correctly when cursorPosition is changed within onTextChanged.

Emit textChanged() before adjusting size and scroll positions otherwise
the calculations will be based on the cursor position before it's moved
in handler and because the cursor position won't ultimately have changed
there won't be a follow up cursorPositionChanged() signal to trigger a
second set of calculation.

Change-Id: I1af7cf320baf984388d90562233c5686dcf44d20
Task-number: QTBUG-19912
Reviewed-by: Martin Jones