qt:qt.git
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
David Boddie [Tue, 3 May 2011 17:22:25 +0000 (19:22 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

Conflicts:
examples/webkit/webkit.pro

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Fri, 22 Apr 2011 16:14:11 +0000 (02:14 +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:
  Document section behavior when not ordered by section
  Fix TextInput cursor position unchanged when selection length is 0.
  Fix TextInput echoMode clearing inputMethodHints set by the user.
  Elide has unexpected effect on Text's implicitWidth

11 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Fri, 22 Apr 2011 16:04:19 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Thu, 21 Apr 2011 16:42:52 +0000 (02:42 +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:
  remove exec bit ... again ...
  Add Korean translation
  QDeclarativeDebug: Fix typo in warning
  QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
  Fix Symbian/Linux compilation breakage in plugins/qmltooling
  Build break fix for simulated QS60Style
  fix unititialized value use when timestamping qconfig.h
  Drift correction and better accuracy for repeating timers in Symbian
  Make QMLViewer startup animation stop after a while
  Fix excessive scrolling in TextInput with mid string pre-edit text.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 13:18:20 +0000 (23:18 +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:
  Document section behavior when not ordered by section
  Fix TextInput cursor position unchanged when selection length is 0.
  Fix TextInput echoMode clearing inputMethodHints set by the user.
  Elide has unexpected effect on Text's implicitWidth

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 12:33:24 +0000 (22:33 +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:
  Use binary search to speed up findChildFrame()

11 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Olivier Goffart [Thu, 21 Apr 2011 11:12:18 +0000 (13:12 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h

11 years agoMerge remote-tracking branch 'mainline/master'
Oswald Buddenhagen [Thu, 21 Apr 2011 09:45:03 +0000 (11:45 +0200)]
Merge remote-tracking branch 'mainline/master'

11 years agoUse binary search to speed up findChildFrame()
Steffen Hansen [Wed, 20 Apr 2011 10:45:42 +0000 (12:45 +0200)]
Use binary search to speed up findChildFrame()

Merge-request: 2595
Reviewed-by: mae
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 07:40:12 +0000 (17:40 +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:
  Build break fix for simulated QS60Style
  Drift correction and better accuracy for repeating timers in Symbian

11 years agoDocument section behavior when not ordered by section
Martin Jones [Thu, 21 Apr 2011 06:17:46 +0000 (16:17 +1000)]
Document section behavior when not ordered by section

Change-Id: Id0345d477c253a5dd54306b06dae1df971ec76fc
Task-number: QTBUG-17757
Reviewed-by: Bea Lam
11 years agoFix TextInput cursor position unchanged when selection length is 0.
Andrew den Exter [Tue, 19 Apr 2011 05:11:36 +0000 (15:11 +1000)]
Fix TextInput cursor position unchanged when selection length is 0.

Move the cursor position to the start position when both the new and
old selections are empty as would happen if either was non-empty.

Change-Id: I493e52c551b47e009fd13b3e95856ff012ee5d95
Task-number: QTBUG-18768
Reviewed-by: Martin Jones
11 years agoFix TextInput echoMode clearing inputMethodHints set by the user.
Andrew den Exter [Tue, 19 Apr 2011 04:00:48 +0000 (14:00 +1000)]
Fix TextInput echoMode clearing inputMethodHints set by the user.

Changing to the Normal echo mode from another mode clears the
NoPredictiveText and NoAutoUppercase flags, irrespective of who
originally set them.  Add separate accessors for the property value
so echo mode can overwrite the authoritive value without losing the
value set in QML.

Change-Id: I6a9563057bb17796b17ac7c2a3c564bb5e886c4d
Task-number: QTBUG-18735
Reviewed-by: Martin Jones
11 years agoElide has unexpected effect on Text's implicitWidth
Martin Jones [Thu, 21 Apr 2011 04:15:38 +0000 (14:15 +1000)]
Elide has unexpected effect on Text's implicitWidth

The elided string was used to calculate the implicitWidth rather than
the full string.

Change-Id: I51b8800b47d4e32f4d5eef07c71df10e2df905b7
Task-number: QTBUG-18627
Reviewed-by: Michael Brasser
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 21 Apr 2011 03:54:51 +0000 (13:54 +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:
  QDeclarativeDebug: Fix typo in warning

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 22:16:08 +0000 (08:16 +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:
  remove exec bit ... again ...
  Add Korean translation
  fix unititialized value use when timestamping qconfig.h

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Wed, 20 Apr 2011 19:12:17 +0000 (05:12 +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: (69 commits)
  Fix compilation with symbian-armcc
  Updated Russian translation
  Ukrainian translation updated
  Fix wrong merge of 3aa39b0164ce4bb9e
  Symbol table is very limited in numeric input mode
  Fix build of Qt/DirectFB without graphics view support.
  Add new QSysInfo::symbianVersion() enums
  QDesktopServices::openUrl() doesn't handle URL encodings correctly
  Build fix for transition effect support on S60 5.0.
  Make EGL surface transparency working on Symbian.
  QmlDebug: Fix license headers in new ost plugin
  Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
  Resolve unqualified attached properties correctly
  Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
  QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
  QDeclarativeDebug: Don't crash when connection is closed
  Splitview flag should also be updated to inputcontext
  QGraphicsView with vertical scrollbar flickers when splitview opens
  Splitview: opening a context menu should not re-position of focusItem
  Trigger fullscreen transition effects properly on app exit.
  ...

11 years agoremove exec bit ... again ...
Oswald Buddenhagen [Wed, 20 Apr 2011 16:54:28 +0000 (18:54 +0200)]
remove exec bit ... again ...

11 years agoAdd Korean translation
Park Shinjo [Wed, 20 Apr 2011 16:44:59 +0000 (18:44 +0200)]
Add Korean translation

Merge-request: 1021
Reviewed-by: ossi
11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Wed, 20 Apr 2011 16:04:48 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Wed, 20 Apr 2011 14:09:31 +0000 (00:09 +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: (198 commits)
  QNetworkCookie: do not access date string out of bounds
  Fix compile error with QT_NO_OPENSSL
  Fix qfile autotest hanging in CI system
  Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"
  QSslConfiguration: fix equals operator
  HTTP+SSL: use default SSL configuration, and avoid setting it explctly
  QLocale: Fixed double to currency string conversion on Mac.
  QNativeWifiEngine: Fix problem with wifi polling on Windows
  Applying the QTBUG-17986 fix to Symbian
  Added support for libICU for collation and toLower/toUpper.
  Fix regression with Qt::AutoConnection
  Revert "HTTP caching internals: fix logic for PreferNetwork and PreferCache"
  Implement support for sockets started before the event loop
  QUdpSocket autotest updates
  tst_qnetworkreply: skip ioGetFromBuiltinHttp test.
  tst_qtcpserver: Add a mapped v4 addr test
  QHostInfo autotest fixes related to symbian
  QHostInfo symbian backend finalisation
  Add autotests for QHostInfo::abortHostLookup
  Updating comment in QHostInfo::localDomainName
  ...

11 years agoQDeclarativeDebug: Fix typo in warning
Kai Koehne [Wed, 20 Apr 2011 14:06:48 +0000 (16:06 +0200)]
QDeclarativeDebug: Fix typo in warning

Add missing space to make the warning align with the others. Fix is needed
to let QtCreator detect the warning programatically.

Reviewed-by: Tom Sutcliffe
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 13:24:42 +0000 (23:24 +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:
  QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
  Fix Symbian/Linux compilation breakage in plugins/qmltooling
  Make QMLViewer startup animation stop after a while
  Fix excessive scrolling in TextInput with mid string pre-edit text.

11 years agoQDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Kai Koehne [Wed, 20 Apr 2011 12:16:03 +0000 (14:16 +0200)]
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false

Trying to read a property marked as non-scriptable results in an
endless loop in QDeclarativePropertyCache::create .

Task-number: QTBUG-18758
Reviewed-by: Aaron Kennedy
11 years agoFix Symbian/Linux compilation breakage in plugins/qmltooling
Kai Koehne [Wed, 20 Apr 2011 12:01:25 +0000 (14:01 +0200)]
Fix Symbian/Linux compilation breakage in plugins/qmltooling

use QIODevice header file instead of (wrongly capitablized) QIODevice.h

Reviewed-by: Tom Sutcliffe
Task-number: QTBUG-18869

11 years agoBuild break fix for simulated QS60Style
Sami Merila [Wed, 20 Apr 2011 11:57:51 +0000 (14:57 +0300)]
Build break fix for simulated QS60Style

Recent changes in QS60Style (to support placeholder background texture)
causes the simulated style not to build. The implementation
for new method placeHolderTexture() is on the Symbian-specific
sourcefile, which is omitted in the simulator builds.

As a fix, move the implementation to the "generic" style source
file qs60style.cpp, since the method does not contain any
Symbian specific code.

Task-number: QTBUG-18863
Reviewed-by: owolff
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 agofix unititialized value use when timestamping qconfig.h
Darryl L. Miles [Wed, 20 Apr 2011 10:39:09 +0000 (12:39 +0200)]
fix unititialized value use when timestamping qconfig.h

we may be creating the forwarding header for a not yet existing file, so
the timestamp may be undefined.

Task-number: QTBUG-15330
Merge-request: 1174
Reviewed-by: ossi
11 years agoDrift correction and better accuracy for repeating timers in Symbian
mread [Wed, 20 Apr 2011 09:02:16 +0000 (10:02 +0100)]
Drift correction and better accuracy for repeating timers in Symbian

Timers on Symbian were always firing at least 2ms late. This was partly
due to a paranoid extra delay in Qt and the kernel being very cautious.

For one shot timers this is not so bad although a bit too much. But for
repeating timers, this can cause significant reductions in firing rate
particularly for short period timers.

The timer active object now corrects timer lateness by up to 4ms per
event. This is enough to compensate for the kernel lateness without
the possibility of wild corrections.

Task-number: QTBUG-18549
Reviewed-by: iain
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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 06:52:51 +0000 (16:52 +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:
  Updated Russian translation
  Ukrainian translation updated

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 20 Apr 2011 02:15:52 +0000 (12:15 +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:
  Symbol table is very limited in numeric input mode

11 years agoMake QMLViewer startup animation stop after a while
Alan Alpert [Tue, 19 Apr 2011 22:08:41 +0000 (08:08 +1000)]
Make QMLViewer startup animation stop after a while

Task-number: QTBUG-18621

11 years agoFix compilation with symbian-armcc
Olivier Goffart [Tue, 19 Apr 2011 18:27:06 +0000 (20:27 +0200)]
Fix compilation with symbian-armcc

the case of the headers matter if you compile on linux

Reviewed-by: Marius Storm-Olsen
11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Tue, 19 Apr 2011 16:03:31 +0000 (02:03 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoUpdated Russian translation
Sergey Belyashov [Tue, 19 Apr 2011 14:12:18 +0000 (16:12 +0200)]
Updated Russian translation

Merge-request: 2596
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
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 agoUkrainian translation updated
Victor Ostashevsky [Tue, 19 Apr 2011 11:43:39 +0000 (13:43 +0200)]
Ukrainian translation updated

Merge-request: 1189
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoFix wrong merge of 3aa39b0164ce4bb9e
Olivier Goffart [Tue, 19 Apr 2011 10:05:48 +0000 (12:05 +0200)]
Fix wrong merge of 3aa39b0164ce4bb9e

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 agoFix excessive scrolling in TextInput with mid string pre-edit text.
Andrew den Exter [Tue, 19 Apr 2011 02:01:17 +0000 (12:01 +1000)]
Fix excessive scrolling in TextInput with mid string pre-edit text.

Don't emit text or cursor position changed signals until all the state
changes from the input method event are made.  Otherwise properties
like horizontal scroll are updated based on invalid intermediate data.

Change-Id: If543dbe58dc571aeda495152d99be95645eea140
Task-number: QTBUG-18789
Reviewed-by: Martin Jones
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 agoMerge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Mon, 18 Apr 2011 16:31:19 +0000 (18:31 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
qmake/generators/makefile.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
src/corelib/global/qnamespace.h
src/gui/text/qtextcontrol.cpp

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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Mon, 18 Apr 2011 13:05:45 +0000 (23:05 +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 build of Qt/DirectFB without graphics view support.

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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Sami Merila [Mon, 18 Apr 2011 10:49:02 +0000 (13:49 +0300)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

11 years agoSymbol table is very limited in numeric input mode
Sami Merila [Mon, 18 Apr 2011 10:46:42 +0000 (13:46 +0300)]
Symbol table is very limited in numeric input mode

Qt uses number mode keymap as a default in input context.
If Special Character Table is not assigned into FEP state,
the default keymap will be used. This will contain only few
symbols ('*', '#', ...).

As a fix, use alpha numeric keymap as a default keymap,
using this will keep the symbol table same irregardless of current
input mode (numbers, characters).

Task-number: QT-4878
Reviewed-by: Miikka Heikkinen
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 agoFix build of Qt/DirectFB without graphics view support.
Denis Oliver Kropp [Mon, 18 Apr 2011 10:24:31 +0000 (12:24 +0200)]
Fix build of Qt/DirectFB without graphics view support.

Merge-request: 1187
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 18 Apr 2011 08:31:32 +0000 (18: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:
  Add new QSysInfo::symbianVersion() enums

11 years agoAdd new QSysInfo::symbianVersion() enums
Miikka Heikkinen [Mon, 18 Apr 2011 07:54:53 +0000 (10:54 +0300)]
Add new QSysInfo::symbianVersion() enums

Add new enums for future Symbian platforms and fix the docs of
existing ones.

Task-number: QT-4593
Reviewed-by: Sami Merila
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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Fri, 15 Apr 2011 18:51:45 +0000 (04:51 +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:
  QDesktopServices::openUrl() doesn't handle URL encodings correctly

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 agoQDesktopServices::openUrl() doesn't handle URL encodings correctly
Carlos Manuel Duclos Vergara [Fri, 15 Apr 2011 14:48:27 +0000 (16:48 +0200)]
QDesktopServices::openUrl() doesn't handle URL encodings correctly

I think this is a problem with the USE_SCHEMEHANDLER version of
handleUrl() in qt/src/gui/util/qdesktopservices_s60.cpp. It calls
url.toString() which removes percent encoding. I think url.toEncoded()
should be used instead.

Task-number: QTBUG-18772
Reviewed-by: joao
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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 15 Apr 2011 13:27:43 +0000 (23:27 +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:
  Build fix for transition effect support on S60 5.0.
  Make EGL surface transparency working on Symbian.
  Splitview flag should also be updated to inputcontext
  QGraphicsView with vertical scrollbar flickers when splitview opens
  Splitview: opening a context menu should not re-position of focusItem
  Trigger fullscreen transition effects properly on app exit.
  Do not use SetSurfaceTransparency() on raster.

11 years agoBuild fix for transition effect support on S60 5.0.
Laszlo Agocs [Fri, 15 Apr 2011 12:51:34 +0000 (14:51 +0200)]
Build fix for transition effect support on S60 5.0.

Task-number: QT-4718
Reviewed-by: TRUSTME
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 agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 15 Apr 2011 07:59:55 +0000 (17:59 +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:
  QmlDebug: Fix license headers in new ost plugin
  Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
  Resolve unqualified attached properties correctly
  Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
  QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
  QDeclarativeDebug: Don't crash when connection is closed
  Fix so concurrent jobs produce the correct model results
  Fix uninitialized variable.

11 years agoMake EGL surface transparency working on Symbian.
Laszlo Agocs [Fri, 15 Apr 2011 07:05:31 +0000 (09:05 +0200)]
Make EGL surface transparency working on Symbian.

When the hardware is capable enough, setting WA_TranslucentBackground
will not lead to falling back to raster, but will continue using
OpenVG or OpenGL based rendering. However this needs an alpha channel
which was not requested previously. This patch corrects it.

Task-number: QT-4729
Reviewed-by: Jani Hautakangas
11 years agoQmlDebug: Fix license headers in new ost plugin
Kai Koehne [Fri, 15 Apr 2011 06:33:28 +0000 (08:33 +0200)]
QmlDebug: Fix license headers in new ost plugin

Reviewed-by: Trust-me
11 years agoFixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Aaron Kennedy [Fri, 15 Apr 2011 06:29:11 +0000 (16:29 +1000)]
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79

Change-Id: I7371d5c2f76254e6746d5a86874a045fc6aec32d

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 agoResolve unqualified attached properties correctly
Aaron Kennedy [Fri, 15 Apr 2011 01:48:06 +0000 (11:48 +1000)]
Resolve unqualified attached properties correctly

When resolving unqualified attached properties, we should use the scope
object, not the context object.  Otherwise they will always resolve to the
root object of the context, regardless of where they are written.

In this example,

QtObject {
    id: root
    QtObject {
        id: me
        property int a: AttachedObject.x
    }
}

the attached object should be loaded on the "me" object, not the "root"
object.

Change-Id: I386f886f62df7b8020c3ff703cdfc891d5739713
Reviewed-by: Martin Jones
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