qt:qt.git
11 years agoFix QDateTime::toString for Qt::ISODate
Jens Georg [Wed, 13 Apr 2011 08:14:43 +0000 (10:14 +0200)]
Fix QDateTime::toString for Qt::ISODate

Fixes QTBUG-18290 and the "missing Z" from QTBUG-9698

Merge-request: 1149
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
11 years agoQNetworkConfigurationManager: Fix network polling.
Martin Petersson [Wed, 27 Apr 2011 10:36:53 +0000 (12:36 +0200)]
QNetworkConfigurationManager: Fix network polling.

startPolling() is called by each engine, so before it would start
multiple singleshot timers. So I moved the timer to the class
and check if it has already been started before it is activated
again. So that we just use one timer.

Task-number: QTBUG-17219
Reviewed-by: Iiro Kause
Reviewed-by: Kranthi Kuntala
11 years agoFix compile warning on Windows
Martin Petersson [Tue, 26 Apr 2011 10:03:17 +0000 (12:03 +0200)]
Fix compile warning on Windows

Reviewed-by: Prasanth Ullattil
11 years agoMerge remote-tracking branch 'earth-team/master' into earth-staging-master
Olivier Goffart [Wed, 20 Apr 2011 10:52:58 +0000 (12:52 +0200)]
Merge remote-tracking branch 'earth-team/master' into earth-staging-master

11 years agoQNetworkCookie: do not access date string out of bounds
Peter Hartmann [Tue, 19 Apr 2011 09:38:06 +0000 (11:38 +0200)]
QNetworkCookie: do not access date string out of bounds

11 years agoFix compile error with QT_NO_OPENSSL
Shane Kearns [Tue, 19 Apr 2011 13:37:05 +0000 (14:37 +0100)]
Fix compile error with QT_NO_OPENSSL

11 years agoFix qfile autotest hanging in CI system
Shane Kearns [Tue, 19 Apr 2011 11:15:21 +0000 (12:15 +0100)]
Fix qfile autotest hanging in CI system

The test machine is configured to pop up dialogs in case of CRT
assertion failures. The CRT has a debug assert whenever an invalid
file handle is used, while the test is expecting to get the EBADF
return code.
Due to some behaviour change in windows 7 (maybe SP1), we need to
call _CrtSetReportMode in addition to setting an error handler.

Reviewed-By: mread
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 19 Apr 2011 08:56:03 +0000 (18:56 +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:
  Make sure #ifdef'd tests still have main() function
  Long live QRawFont!

11 years agoMake sure #ifdef'd tests still have main() function
Eskil Abrahamsen Blomfeldt [Mon, 18 Apr 2011 07:51:13 +0000 (09:51 +0200)]
Make sure #ifdef'd tests still have main() function

Otherwise it won't link on QWS

Reviewed-by: TrustMe
11 years agoLong live QRawFont!
Eskil Abrahamsen Blomfeldt [Tue, 22 Mar 2011 09:57:59 +0000 (10:57 +0100)]
Long live QRawFont!

The QGlyphs API was initially attempted with a bastardization of
QFont which was meant to encapsulate a single, physical font
instance (a QFontEngine) where a set of glyph indexes would make
sense. This is not how QFont was intended to be used, and it caused
several issues. At the same time, the requirement for loading a
font from ttf/otf data and be able to access it and use it without
polluting the rest of the process with the font arose. To support
these two APIs we introduce QRawFont, which is an abstraction on
top of a single physical font.

Done-with: Jiang Jiang

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 18 Apr 2011 22:17:02 +0000 (08:17 +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:
  QtDBus: Add unit tests for QDBusAbstractAdaptor
  QtDBus: Add unit tests for QDBusInterface
  QtDBus: Add unit tests for QDBusAbstractInterface
  QtDBus: Register QDBusServer connection name in QDBusConnectionManager
  QtDBus: Skip bus name check for peer-to-peer connection
  QtDBus: Fix minor coding style issues
  QtDBus: Add default constructor to QDBusServer
  QtDBus: Add unit tests for peer-to-peer connection
  QtDBus: Add method QDBusConnection::disconnectFromPeer()
  QtDBus: Add method QDBusConnection::connectToPeer()
  QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections
  QtDBus: Fix bus in peer-to-peer connections should not be used
  QtDBus: Fix empty service name in peer-to-peer connections
  QtDBus: Fix registering objects using path '/' in peer-to-peer connections
  QtDBus: Fix QDBusServer to handle correctly new dbus connections
  QtDBus: Cleaning comments, spacing, etc.

11 years agoQtDBus: Add unit tests for QDBusAbstractAdaptor
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:18 +0000 (11:21 -0500)]
QtDBus: Add unit tests for QDBusAbstractAdaptor

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Add unit tests for QDBusInterface
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:17 +0000 (11:21 -0500)]
QtDBus: Add unit tests for QDBusInterface

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Add unit tests for QDBusAbstractInterface
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:16 +0000 (11:21 -0500)]
QtDBus: Add unit tests for QDBusAbstractInterface

Also fix xml in tests/auto/qdbusabstractinterface/com.trolltech.QtDBus.Pinger.xml

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Register QDBusServer connection name in QDBusConnectionManager
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:15 +0000 (11:21 -0500)]
QtDBus: Register QDBusServer connection name in QDBusConnectionManager

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Skip bus name check for peer-to-peer connection
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:14 +0000 (11:21 -0500)]
QtDBus: Skip bus name check for peer-to-peer connection

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Fix minor coding style issues
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:13 +0000 (11:21 -0500)]
QtDBus: Fix minor coding style issues

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Add default constructor to QDBusServer
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:12 +0000 (11:21 -0500)]
QtDBus: Add default constructor to QDBusServer

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Add unit tests for peer-to-peer connection
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:11 +0000 (11:21 -0500)]
QtDBus: Add unit tests for peer-to-peer connection

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Add method QDBusConnection::disconnectFromPeer()
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:10 +0000 (11:21 -0500)]
QtDBus: Add method QDBusConnection::disconnectFromPeer()

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Add method QDBusConnection::connectToPeer()
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:10 +0000 (11:21 -0500)]
QtDBus: Add method QDBusConnection::connectToPeer()

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:09 +0000 (11:21 -0500)]
QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Fix bus in peer-to-peer connections should not be used
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:08 +0000 (11:21 -0500)]
QtDBus: Fix bus in peer-to-peer connections should not be used

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Fix empty service name in peer-to-peer connections
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:07 +0000 (11:21 -0500)]
QtDBus: Fix empty service name in peer-to-peer connections

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Fix registering objects using path '/' in peer-to-peer connections
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:06 +0000 (11:21 -0500)]
QtDBus: Fix registering objects using path '/' in peer-to-peer connections

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Fix QDBusServer to handle correctly new dbus connections
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:05 +0000 (11:21 -0500)]
QtDBus: Fix QDBusServer to handle correctly new dbus connections

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoQtDBus: Cleaning comments, spacing, etc.
Daniele E. Domenichelli [Mon, 18 Apr 2011 16:21:04 +0000 (11:21 -0500)]
QtDBus: Cleaning comments, spacing, etc.

Merge-request: 2343
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 18 Apr 2011 16:08:32 +0000 (02:08 +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: (29 commits)
  Use s/static/Q_GLOBAL_STATIC/g in QScroller
  Alternative fix to the strict-aliasing violation warnings
  Revert "Fix strict-alias breaking warnings with GCC."
  Fix warning about vSize not being used in this function
  Do not try to test UnixFDs with the system API because it may be too old
  L10n: German translations for Qt 4.8
  Compile with namespace support.
  Replace the handcoded math and change the timer buckets again.
  Move the constants up, preparing for refactoring
  Fix strict-alias breaking warnings with GCC.
  Fix compilation if D-Bus 1.4 isn't present.
  Change the number of entries in the first timer bucket.
  Change the error message in the timer ID deallocator.
  Add a benchmark for testing our QtDBus type-validation
  Move the QDBusPerformance test to the tests/benchmark dir
  Use the Qt code for validating types in QtDBus
  Add routines to validate D-Bus signature in QtDBus
  Remove the unused QDBusUnixFileDescriptor::isShared function
  Doc: document the QDBusUnixFileDescriptor class
  Autotest: really ensure that two fds are equal
  ...

11 years agoRevert "QNativeWifiEngine: Fix problem with wifi polling on Windows"
Martin Petersson [Mon, 18 Apr 2011 12:47:55 +0000 (14:47 +0200)]
Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"

This reverts commit 2e7e8a2b805b868eade36cc44fa14bf8ca2f8c2f.

This broke the QNetworkconfigurationManager auto tests.

Reviewed-by: Peter Hartmann
11 years agoUse s/static/Q_GLOBAL_STATIC/g in QScroller
Robert Griebl [Mon, 18 Apr 2011 12:26:46 +0000 (14:26 +0200)]
Use s/static/Q_GLOBAL_STATIC/g in QScroller

Reviewed-by: Harald Fernengel
11 years agoAlternative fix to the strict-aliasing violation warnings
Thiago Macieira [Mon, 18 Apr 2011 11:15:36 +0000 (13:15 +0200)]
Alternative fix to the strict-aliasing violation warnings

The code doesn't actually violate aliasing by doing type-punned
dereferencing. The objects are always accessed as the right type. So
disable the warning and pray that GCC doesn't optimise code out of
existence.

Reviewed-by: Trust Me
11 years agoRevert "Fix strict-alias breaking warnings with GCC."
Thiago Macieira [Mon, 18 Apr 2011 11:02:36 +0000 (13:02 +0200)]
Revert "Fix strict-alias breaking warnings with GCC."

This reverts commit 0d3044b547614cbd313d90021606af1f81fb10de.

I'm not sure if this is good for anything. I can't reproduce the
failures that happen on Mac and Windows, so let's try reverting the
only patch that touches QtDeclarative.

If this works, then we'll have found out that the code is broken and
my patch only revealed the errors.

11 years agoMerge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master...
Qt Continuous Integration System [Mon, 18 Apr 2011 10:53:22 +0000 (20:53 +1000)]
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
  Fix build for Apple gcc
  Add platformNativeInterface assessor to QApplication
  Lighthouse: Add dummy QSessionManager
  Adapt to different uikit resolutions.
  Lighthouse: Make directfb conform with ligthhouse gl context api
  Compile fix for window surface features. (uikit)

11 years agoFix build for Apple gcc
con [Mon, 18 Apr 2011 10:38:54 +0000 (12:38 +0200)]
Fix build for Apple gcc

Reviewed-by: Paul Olav Tvete
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Mon, 18 Apr 2011 06:31:10 +0000 (16:31 +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: (163 commits)
  QLocale: Fixed double to currency string conversion on Mac.
  Fix qstringbuilder4 test on mac
  Compile on Mac.
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  Use the qt_static_metacall in QueuedConnection
  Fix crash after merge of the native symbian thread branch.
  Fix bad merge
  Re-apply part of ba8e5eedf5f40091eb67dd391a7dcaf9299db2f5
  Removed useless comment
  SSL code: introduce new error value for blacklisted certificates
  Disable DEF files by default for symbian-gcce.
  HTTP caching internals: fix logic for PreferNetwork and PreferCache
  Added a consistency check for number of missing symbols in elf2e32.
  Updated def file after symbol removal.
  QLocalSocket: fix abort on Windows.
  QStringBuilder: add operator += for QString and QByteArray
  Dummy commit to trigger pulse.
  Fix QMetaObject::indexOfSlot
  Fix compilation
  Documentation for the initilize_list constructor
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Mon, 18 Apr 2011 01:25:04 +0000 (11:25 +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:
  Remove autotest code related to old Qt versions
  Fix missing equality and inequality operator docs for QPointer.

11 years agoRemove autotest code related to old Qt versions
Jason McDonald [Mon, 11 Apr 2011 02:43:28 +0000 (12:43 +1000)]
Remove autotest code related to old Qt versions

Reviewed-by: Rohan McGovern
11 years agoFix missing equality and inequality operator docs for QPointer.
Jason McDonald [Wed, 6 Apr 2011 07:18:09 +0000 (17:18 +1000)]
Fix missing equality and inequality operator docs for QPointer.

Task-number: QTBUG-18565
Reviewed-by: Rohan McGovern
11 years agoMerge remote-tracking branch 'origin/master' into HEAD
Thiago Macieira [Sun, 17 Apr 2011 14:37:43 +0000 (16:37 +0200)]
Merge remote-tracking branch 'origin/master' into HEAD

11 years agoFix warning about vSize not being used in this function
Thiago Macieira [Sun, 17 Apr 2011 14:34:22 +0000 (16:34 +0200)]
Fix warning about vSize not being used in this function

11 years agoDo not try to test UnixFDs with the system API because it may be too old
Thiago Macieira [Sun, 17 Apr 2011 13:58:33 +0000 (15:58 +0200)]
Do not try to test UnixFDs with the system API because it may be too old

11 years agoAdd platformNativeInterface assessor to QApplication
Jørgen Lind [Fri, 15 Apr 2011 15:52:34 +0000 (17:52 +0200)]
Add platformNativeInterface assessor to QApplication

11 years agoLighthouse: Add dummy QSessionManager
Jørgen Lind [Fri, 15 Apr 2011 14:51:36 +0000 (16:51 +0200)]
Lighthouse: Add dummy QSessionManager

11 years agoAdapt to different uikit resolutions.
con [Fri, 15 Apr 2011 14:27:18 +0000 (16:27 +0200)]
Adapt to different uikit resolutions.

11 years agoLighthouse: Make directfb conform with ligthhouse gl context api
Jørgen Lind [Fri, 15 Apr 2011 10:16:43 +0000 (12:16 +0200)]
Lighthouse: Make directfb conform with ligthhouse gl context api

11 years agoMerge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master...
Qt Continuous Integration System [Fri, 15 Apr 2011 09:21:53 +0000 (19:21 +1000)]
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (94 commits)
  Lighthouse: Fix license headers
  Remove hasOpenGL. This changes breaks binary compatibillity
  Lighthouse: Fix license headers
  Compile fix for shared context change.
  Some virtual keyboard text input for uikit.
  Wayland: Conform with the api change in the frame callback
  Fix configure for Lighthouse
  Remove DefaultSharedContext from Lighthouse API.
  Make readEvents() non-blocking
  Wayland: Show what backend is being used
  Wayland: Tell what backend we use for xcomposite glx
  Wayland: compile fix after making the event handling
  Make the xcomposite the default gl integration backend
  Make sure the global listener gets registered even when using drm.
  Wayland: Rename XPixmap GL integrations to Readback
  Adapt drag distance for uikit.
  Prevented crash due to dangling pointer in QWaylandInputDevice.
  Fixed logical error in XCB backend.
  Set the _NET_WM_WINDOW_TYPE property in the XCB backend.
  Added _NET_WM_PID in XCB backend.
  ...

11 years agoCompile fix for window surface features. (uikit)
con [Fri, 15 Apr 2011 08:04:56 +0000 (10:04 +0200)]
Compile fix for window surface features. (uikit)

11 years agoQSslConfiguration: fix equals operator
Peter Hartmann [Fri, 15 Apr 2011 08:19:55 +0000 (10:19 +0200)]
QSslConfiguration: fix equals operator

11 years agoLighthouse: Fix license headers
Jørgen Lind [Fri, 15 Apr 2011 05:47:54 +0000 (07:47 +0200)]
Lighthouse: Fix license headers

11 years agoRemove hasOpenGL. This changes breaks binary compatibillity
Jørgen Lind [Thu, 14 Apr 2011 13:48:36 +0000 (15:48 +0200)]
Remove hasOpenGL. This changes breaks binary compatibillity

so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications

11 years agoL10n: German translations for Qt 4.8
Friedemann Kleint [Thu, 14 Apr 2011 11:45:32 +0000 (13:45 +0200)]
L10n: German translations for Qt 4.8

11 years agoHTTP+SSL: use default SSL configuration, and avoid setting it explctly
Peter Hartmann [Thu, 14 Apr 2011 09:24:05 +0000 (11:24 +0200)]
HTTP+SSL: use default SSL configuration, and avoid setting it explctly

do not use a null configuration, but a default configuration in
QNetworkRequest by default. In addition, setting an SSL configuration
explicitly will cause the on-demand loading of root certs to be
disabled (because it could be that the user has set the CA certificates
explicitly).

Reviewed-by: Markus Goetz
11 years agoMerge remote-tracking branch 'mainline/master'
Oswald Buddenhagen [Thu, 14 Apr 2011 11:32:46 +0000 (13:32 +0200)]
Merge remote-tracking branch 'mainline/master'

11 years agoQLocale: Fixed double to currency string conversion on Mac.
Denis Dzyubenko [Thu, 14 Apr 2011 11:08:53 +0000 (13:08 +0200)]
QLocale: Fixed double to currency string conversion on Mac.

This also fixes the autotest failure on mac with macDefaultLocale test.

Reviewed-by: trustme
(cherry picked from commit 78d47f520b2c4acdf782d39311063f5d44376913)

11 years agoQLocale: Fixed double to currency string conversion on Mac.
Denis Dzyubenko [Thu, 14 Apr 2011 11:08:53 +0000 (13:08 +0200)]
QLocale: Fixed double to currency string conversion on Mac.

This also fixes the autotest failure on mac with macDefaultLocale test.

Reviewed-by: trustme
11 years agoCompile with namespace support.
Thiago Macieira [Thu, 14 Apr 2011 10:48:25 +0000 (12:48 +0200)]
Compile with namespace support.

11 years agoMerge remote-tracking branch 'origin/master' into lighthouse-master
Jørgen Lind [Thu, 14 Apr 2011 10:23:42 +0000 (12:23 +0200)]
Merge remote-tracking branch 'origin/master' into lighthouse-master

11 years agoLighthouse: Fix license headers
Jørgen Lind [Thu, 14 Apr 2011 10:21:25 +0000 (12:21 +0200)]
Lighthouse: Fix license headers

11 years agoCompile fix for shared context change.
con [Thu, 14 Apr 2011 10:18:36 +0000 (12:18 +0200)]
Compile fix for shared context change.

11 years agoFix qstringbuilder4 test on mac
Olivier Goffart [Thu, 14 Apr 2011 09:26:28 +0000 (11:26 +0200)]
Fix qstringbuilder4 test on mac

The behaviour is different with or without QT_FAST_OPERATOR_PLUS
And since on old gcc it is not defined, then the test fails.

With the normal operator+, the bytearray will first be converted to
a QString, and loose everything that is after \0, but now, with
QStringBuilder, we do not do QString conversion anymore, so no data
is lost.

We do not want to specify the behaviour here, so we remove the test.

Reviewed-by: Joao
11 years agoReplace the handcoded math and change the timer buckets again.
Thiago Macieira [Wed, 26 Jan 2011 14:09:47 +0000 (15:09 +0100)]
Replace the handcoded math and change the timer buckets again.

Reduce from 8 to 6 buckets and increase the step between each
bucket. This way, the second bucket is now of 224 timers, which should
be enough for 99.9% of the applications.

Also change the hardcoded math to calculations using enum values. This
helps in changing the timer buckets again in the future.

Also fix the last bucket not to have a timer ID of 16777216, as that
is not valid.

Reviewed-by: Olivier Goffart
11 years agoMove the constants up, preparing for refactoring
Thiago Macieira [Wed, 26 Jan 2011 13:57:34 +0000 (14:57 +0100)]
Move the constants up, preparing for refactoring

11 years agoQNativeWifiEngine: Fix problem with wifi polling on Windows
Martin Petersson [Thu, 14 Apr 2011 09:04:10 +0000 (11:04 +0200)]
QNativeWifiEngine: Fix problem with wifi polling on Windows

On some Windows machines the wifi detection in
QNativeWifiEngine::available does not work as WlanOpenHandle still
succeed altough there is no WLAN card. So instead we can detect this
using the WlanEnumInterfaces in requestUpdate() instead.

Task-number: QTBUG-17219
Reviewed-by: Xizhi Zhu
11 years agoFix strict-alias breaking warnings with GCC.
Thiago Macieira [Thu, 25 Nov 2010 21:40:34 +0000 (22:40 +0100)]
Fix strict-alias breaking warnings with GCC.

GCC doesn't like any kind of reinterpret_cast or C-style cast with
pointers. So instead do the work with static_cast<>, which it seems to
like.

Also took the opportunity to change the generic payload type to void*,
so the alignment works as expected. I wonder how we haven't had
serious crashes so far on ARM...

Reviewed-by: Samuel Rødal
11 years agoFix compilation if D-Bus 1.4 isn't present.
Thiago Macieira [Thu, 14 Apr 2011 08:51:09 +0000 (10:51 +0200)]
Fix compilation if D-Bus 1.4 isn't present.

11 years agoSome virtual keyboard text input for uikit.
con [Thu, 14 Apr 2011 08:34:43 +0000 (10:34 +0200)]
Some virtual keyboard text input for uikit.

It is very limited as is. But it handles Qt's RequestSoftwareInputPanel
and CloseSoftwareInputPanel events.

11 years agoWayland: Conform with the api change in the frame callback
Jørgen Lind [Wed, 13 Apr 2011 13:04:53 +0000 (15:04 +0200)]
Wayland: Conform with the api change in the frame callback

11 years agoFix configure for Lighthouse
Jørgen Lind [Wed, 13 Apr 2011 12:02:01 +0000 (14:02 +0200)]
Fix configure for Lighthouse

Dont assume that we are QWS :)

11 years agoChange the number of entries in the first timer bucket.
Thiago Macieira [Mon, 13 Dec 2010 16:22:33 +0000 (17:22 +0100)]
Change the number of entries in the first timer bucket.

8 timers are too few for common applications. 32 is more likely
to reach >90% of the applications. This way, we avoid a memory
allocation.

Reviewed-by: Olivier Goffart
11 years agoChange the error message in the timer ID deallocator.
Thiago Macieira [Fri, 28 Jan 2011 10:14:46 +0000 (11:14 +0100)]
Change the error message in the timer ID deallocator.

This is really an internal error since the upper layers of the
event dispatcher should have already caught a timer ID that
isn't valid.

Reviewed-By: Olivier Goffart
11 years agoAdd a benchmark for testing our QtDBus type-validation
Thiago Macieira [Wed, 23 Feb 2011 16:02:23 +0000 (17:02 +0100)]
Add a benchmark for testing our QtDBus type-validation

Our code is much faster than libdbus-1, even when built in debug mode.

11 years agoMove the QDBusPerformance test to the tests/benchmark dir
Thiago Macieira [Wed, 23 Feb 2011 15:59:54 +0000 (16:59 +0100)]
Move the QDBusPerformance test to the tests/benchmark dir

11 years agoUse the Qt code for validating types in QtDBus
Thiago Macieira [Mon, 21 Feb 2011 19:15:31 +0000 (20:15 +0100)]
Use the Qt code for validating types in QtDBus

11 years agoAdd routines to validate D-Bus signature in QtDBus
Thiago Macieira [Mon, 21 Feb 2011 19:01:03 +0000 (20:01 +0100)]
Add routines to validate D-Bus signature in QtDBus

11 years agoRemove the unused QDBusUnixFileDescriptor::isShared function
Thiago Macieira [Wed, 13 Apr 2011 12:52:49 +0000 (14:52 +0200)]
Remove the unused QDBusUnixFileDescriptor::isShared function

11 years agoDoc: document the QDBusUnixFileDescriptor class
Thiago Macieira [Wed, 13 Apr 2011 12:50:03 +0000 (14:50 +0200)]
Doc: document the QDBusUnixFileDescriptor class

11 years agoAutotest: really ensure that two fds are equal
Thiago Macieira [Thu, 17 Feb 2011 16:01:14 +0000 (17:01 +0100)]
Autotest: really ensure that two fds are equal

Instead of checking that they are both valid or both invalid, test
that they point to the same file on the filesystem. So we create a
QTemporaryFile and pass its file descriptor to the remote side and
back. If the two fds point to the same file on disk later (same st_dev
and st_ino), they are equal.

This probably works on non-Unix too, but I can't test and there's no
point anyway.

Task-number: QTBUG-17477

11 years agoAutotest: more file-descriptor passing tests
Thiago Macieira [Wed, 16 Feb 2011 15:57:10 +0000 (16:57 +0100)]
Autotest: more file-descriptor passing tests

Task-number: QTBUG-17477

11 years agoAutotest: Test QDBusUnixFileDescriptor support in arrays
Thiago Macieira [Wed, 16 Feb 2011 14:30:49 +0000 (15:30 +0100)]
Autotest: Test QDBusUnixFileDescriptor support in arrays

Task-number: QTBUG-17477

11 years agoAdd support for Unix file-descriptor passing to QtDBus
Thiago Macieira [Wed, 16 Feb 2011 14:04:57 +0000 (15:04 +0100)]
Add support for Unix file-descriptor passing to QtDBus

Task-number: QTBUG-17477

11 years agoRetrieve the connection capabilities in QDBusConnection
Thiago Macieira [Wed, 16 Feb 2011 11:25:09 +0000 (12:25 +0100)]
Retrieve the connection capabilities in QDBusConnection

Task-number: QTBUG-17477

11 years agoAdd support for D-Bus 1.4 features in QtDBus code
Thiago Macieira [Wed, 16 Feb 2011 11:14:03 +0000 (12:14 +0100)]
Add support for D-Bus 1.4 features in QtDBus code

Task-number: QTBUG-17477

11 years agoAdd QDBusUnixFileDescriptor to the QtDBus metatype system
Thiago Macieira [Tue, 15 Feb 2011 08:53:33 +0000 (09:53 +0100)]
Add QDBusUnixFileDescriptor to the QtDBus metatype system

Task-number: QTBUG-17477

11 years agoAdd the QDBusUnixFileDescriptor class
Thiago Macieira [Tue, 15 Feb 2011 08:49:34 +0000 (09:49 +0100)]
Add the QDBusUnixFileDescriptor class

This class holds one Unix file descriptor. It's implicitly shared, but
it makes a copy of your file descriptor (via dup(2) or dup2(2)).

This class is supposed to work even outside Unix systems, just that it
will never do anything.

Documentation in a later commit.

Task-number: QTBUG-17477

11 years agoDisable the JavaScriptCore JIT in ICC.
Thiago Macieira [Wed, 13 Apr 2011 12:33:55 +0000 (14:33 +0200)]
Disable the JavaScriptCore JIT in ICC.

As of ICC 12.0.2, ICC is known to miscompile some "fastcall" code,
which causes runtime crashes. This fault has been reported to Intel
and a fix is being prepared.

Reviewed-by: Olivier Goffart
11 years agoAutotest: Use the shadow-build trick in all platforms
Thiago Macieira [Tue, 22 Feb 2011 09:45:16 +0000 (10:45 +0100)]
Autotest: Use the shadow-build trick in all platforms

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Wed, 13 Apr 2011 12:28:42 +0000 (22:28 +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:
  Remove a race condition in SIGCHLD handler.
  Fix warnings about && inside ||

11 years agoRemove a race condition in SIGCHLD handler.
Thiago Macieira [Thu, 3 Feb 2011 19:40:47 +0000 (20:40 +0100)]
Remove a race condition in SIGCHLD handler.

If the SIGCHLD is delivered *just* as we're installing our handler,
there's a race condition in the setting of the old handler. So instead
rely on the OS to set it properly before it calls our handler.

Reviewed-by: Olivier Goffart
11 years agoFix warnings about && inside ||
Thiago Macieira [Fri, 8 Apr 2011 23:58:18 +0000 (01:58 +0200)]
Fix warnings about && inside ||

Reviewed-By: Trust Me
11 years agoCompile on Mac.
Olivier Goffart [Wed, 13 Apr 2011 09:33:22 +0000 (11:33 +0200)]
Compile on Mac.

Move the work around for old gcc from qstring.h to qbytearray.h

Since QByteArray now also use the FAST_OPERATOR_PLUS, it also
need to be undefined there. and since qstring.h includes qbytearray.h,
it should be placed into qbytearray.h

11 years agoRemove DefaultSharedContext from Lighthouse API.
Samuel Rødal [Wed, 13 Apr 2011 06:49:52 +0000 (08:49 +0200)]
Remove DefaultSharedContext from Lighthouse API.

QPlatformWindowFormat::setUseDefaultSharedContext was meant as a
convenience, but it adds complexity in the platform plugin
implementation, and can be implemented by the above layers using
QPlatformWindowFormat::setSharedContext.

Reviewed-by: Jørgen Lind
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Wed, 13 Apr 2011 06:23:42 +0000 (16:23 +1000)]
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles
  Make sure removed QTextBlock is invalid
  Cocoa: Fixup wrong code in patch baaa5ae

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Tue, 12 Apr 2011 16:06:35 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoApplying the QTBUG-17986 fix to Symbian
mread [Tue, 12 Apr 2011 14:07:11 +0000 (15:07 +0100)]
Applying the QTBUG-17986 fix to Symbian

This change takes the QTBUG-17986 fix, which deletes QThreadData for
adopted threads that have created QEventLoops, and applies it to
qthread_symbian.cpp, which didn't exist at the time of the original
fix.

One complication is that Symbian uses a separate thread to monitor
adopted thread lifetime, as there is no API to intercept thread exit
to have cleanup code run within the context of the thread. However the
cleanup for the thread involes deleting active objects that were
created in the adopted thread, not the monitor thread. If these active
objects are completed but not run, their cancellation could deadlock.
In particular the wake up active object in the event dispatcher is
typically in this state. We deal with it by detecting the situation
and re-completing/cancelling the active object in the adopted thread
monitor thread, which prevents deadlock and allows correct operation of
the monitor thread. It is possible for this problem to affect other
active objects owned by the event dispatcher. They symptom would be
that finished signals from adopted threads are not sent, or they arrive
much later than they should.

Task-number: QTBUG-18622
Reviewed-by: Shane Kearns
11 years agoAdded support for libICU for collation and toLower/toUpper.
Denis Dzyubenko [Tue, 12 Apr 2011 12:48:13 +0000 (14:48 +0200)]
Added support for libICU for collation and toLower/toUpper.

This patch uses icu to do string collation via QString::localeAwareCompare
function and for QString::toLower/toUpper - which is important e.g. for turkish
locales where uppercased 'i' is not a latin 'I'.

Based on the patch by Harald Fernengel

Reviewed-by: Harald Fernengel
Reviewed-by: Zeno Albisser
11 years agoMerge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network
Shane Kearns [Tue, 12 Apr 2011 12:18:29 +0000 (13:18 +0100)]
Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network

Conflicts:
configure.exe
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def

11 years agoMerge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network into...
Shane Kearns [Tue, 12 Apr 2011 12:01:51 +0000 (13:01 +0100)]
Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine

11 years agoMerge earth-team into origin/master'
Olivier Goffart [Tue, 12 Apr 2011 11:21:56 +0000 (13:21 +0200)]
Merge earth-team into origin/master'

11 years agoFix regression with Qt::AutoConnection
Shane Kearns [Tue, 12 Apr 2011 11:14:15 +0000 (12:14 +0100)]
Fix regression with Qt::AutoConnection

Change df9491b302f6404ad2ccc6dc2eb3377176d994c6 optimised auto connections
by comparing thread ID rather than comparing TLS addresses.
However it was implemented on a branch that didn't have the native
symbian threads. So merging the two branches caused a regression without
merge conflicts.

Reviewed-by: mread
11 years agoRevert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
Markus Goetz [Tue, 12 Apr 2011 10:51:22 +0000 (12:51 +0200)]
Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"

This reverts commit e5d27e7aeac984e46f3aa8de20160cc00fc63155.

Conflicts:

tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp