qt:qt.git
11 years agoQNAM - fix poor performance of HEAD request with authentication
Shane Kearns [Mon, 3 Oct 2011 15:27:34 +0000 (16:27 +0100)]
QNAM - fix poor performance of HEAD request with authentication

QHttpNetworkReply was waiting for a body to be sent for 401 and 407
responses, whereas with a HTTP HEAD request, there will be no body.

This delayed the authentication signal until after the http channel
is closed by the server after a timeout. For example with the server
used for autotesting, the authentication signal is delayed 15 seconds.

When the server has a very long timeout, the authentication signal may
not be emitted at all.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
11 years agorunonphone - Implement CODA autodetection
Shane Kearns [Thu, 22 Sep 2011 14:57:31 +0000 (15:57 +0100)]
runonphone - Implement CODA autodetection

If runonphone is executed without specifying the debug agent, then
it will attempt to autodetect it by sending a CODA ping to the USB
port.
If there is a reply within 1 second, then CODA mode is used.
If not, then TRK mode is used.

TRK drops unrecognised messages, so the CODA ping is ignored and
initialisation starts normally when the TRK ping is sent.

Autodetect can be skipped by using the --coda or --trk arguments on
the command line to force use of a specific debug agent.

Reviewed-By: mread
11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Mon, 3 Oct 2011 12:07:49 +0000 (15:07 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoSymbian: Parse ts filenames case-insensitively for localize_deployment
Miikka Heikkinen [Fri, 30 Sep 2011 11:01:37 +0000 (14:01 +0300)]
Symbian: Parse ts filenames case-insensitively for localize_deployment

A lot of platform applications have all-lowercase translation files
due to file naming policies. This makes no difference for runtime
translation, so removed unnecessary case sensitivity when parsing ts
filenames for localization deployment.

Task-number: QT-5305
Reviewed-by: Sami Merila
11 years agoDo not crash in copy() of pixmaps without an underlying bitmap
Laszlo Agocs [Fri, 30 Sep 2011 09:52:17 +0000 (12:52 +0300)]
Do not crash in copy() of pixmaps without an underlying bitmap

If CFbsBitmap::Create() fails for some reason (e.g. due to lack of
memory), we may end up with a QVolatileImage for which the underlying
bitmap pointer is null, resulting in the QImage wrapper being null
too. The copyFrom() function was not checking for this situation and
started to copy data blindly to the null QImage's bits(), which is
a null pointer. This is now fixed so no copying occurs in such a
scenario.

Task-number: QTTH-1446
Reviewed-by: Sami Merila
11 years agoQTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8
mread [Thu, 29 Sep 2011 13:54:27 +0000 (14:54 +0100)]
QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8

tst_qobjectrace had some of its tests disabled for Symbian builds
because they were not working with Symbian's event dispatcher.

Retesting with Qt 4.8, which has a new event dispatcher, shows that
they are now working. The tests are re-enabled again. They ran
successfully on E7, N8 and emulator many times without crashing.

Task-number: QTBUG-9113
Reviewed-by: Shane Kearns
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 28 Sep 2011 15:26:38 +0000 (01:26 +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:
  Doc updates to Qt for Symbian installation instructions and platform notes.
  Doc updates to platform notes document.
  Doc updates to platform notes of Qt 4.8 doc.
  Doc updates to Qt 4.8 platform notes documentation.

11 years agosymbian - document behaviour of QFile::handle()
Shane Kearns [Wed, 28 Sep 2011 10:39:53 +0000 (11:39 +0100)]
symbian - document behaviour of QFile::handle()

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team
Sami Merila [Wed, 28 Sep 2011 12:49:27 +0000 (15:49 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team

11 years agoNew focusitem is not connected to the translate slot in splitview
Sami Merila [Wed, 28 Sep 2011 12:48:36 +0000 (15:48 +0300)]
New focusitem is not connected to the translate slot in splitview

If user changes focus from one item to a new one while the splitview
keyboard is open, the newly focused item is not connected to the
translate() slot. Thus, the item will not be kept "automatically"
visible above the keyboard when cursor position changes.

QCoeFepInputContext now holds a pointer to the last focus item and
disconnects the previous focus item from slot when new focus item
is set. Ensuring the visibility of the focus item needs to be done
asynchronously after reset() has been called from graphics scene,
to ensure that new focus item has been set.

The translation rules have been tweaked to support translation to
both directions (up|down). Previous implementation worked properly
only for upwards translation (new cursor position was assumed to
be lower than the existing one).

Task-number: QTBUG-21611
Reviewed-by: Miikka Heikkinen
11 years agoAdded new private exports to DEF files
mread [Wed, 28 Sep 2011 12:32:20 +0000 (13:32 +0100)]
Added new private exports to DEF files

This change lists new private exports in the Symbian def files for:
- QCoreApplicationPrivate::rebuildInstallLibraryPaths
- QFactoryLoader::updateDir

There are also some QFutureWatcherBase exports added to the winscw DEF
file which appear to have not been added before.

Task-number: QTBUG-20098
Reviewed-by: Shane Kearns
11 years agoNew plugin detection for Symbian
mread [Wed, 28 Sep 2011 10:05:02 +0000 (11:05 +0100)]
New plugin detection for Symbian

Symbian can have very long running apps, which expect to pick up new
plugins without a restart. This change makes the plugin factory, which
is used for many internal plugin types, detect plugin changes and
update its list of plugins.

This uses the QNotifyChangeEvent class to watch for plugin directory
changes, including when they do not already exist, including on
removable drives with no media currently present. When a change is
detected, it triggers a rebuild of the plugin library paths, then
rescans for plugins only on the drive that changed.

An alternative implementation could have made use of watching software
installer P&S keys for notification of change. However these are not
triggered by memory card insertion or removal, so file system watchers
are used.

Task-number: QTBUG-20098
Reviewed-by: Shane Kearns
11 years agoAdded Symbian private API to update libraryPaths
mread [Wed, 28 Sep 2011 10:01:44 +0000 (11:01 +0100)]
Added Symbian private API to update libraryPaths

Library paths on Symbian can change as memory cards are inserted or
removed. Potentially there is a \resource\qt\plugins on a card which
should be added to the library path.

Since some Symbian Qt applications are expected to be very long running,
they would not see an updated library path without this abililty to
update the path.

The update algorithm strips out existing instances of
\resource\qt\plugins, places new ones where the first
\resource\qt\plugins was, and leaves the rest of the library path
unchanged.

Task-number: QTBUG-20098
Reviewed-by: Shane Kearns
11 years agoMaking QNotifyChangeEvent, Symbian file watcher, more widely usable
mread [Tue, 27 Sep 2011 16:08:07 +0000 (17:08 +0100)]
Making QNotifyChangeEvent, Symbian file watcher, more widely usable

QNotifyChangeEvent was being used by QSymbianFileSystemWatcherEngine,
but it also helps in the implementation of new plugin watching for
QTBUG-20098. So it has been generalised to work with an interface and
any class that implements that interface.

The Qt file system watchers could not be used in QTBUG-20098, as they
will not watch for currently non-existing directories.

Task-number: QTBUG-20098
Reviewed-by: Shane Kearns
11 years agoFix building against older Symbian^3 environments
Miikka Heikkinen [Wed, 28 Sep 2011 07:23:28 +0000 (10:23 +0300)]
Fix building against older Symbian^3 environments

R_AVKON_DISCREET_POPUP_TEXT_COPIED is missing from some older Symbian^3
environments, so define it explicitly. Also do not attempt to show
the popup unless running against newer versions.

Reviewed-by: Sami Merila
11 years agoFix QTextBrowser autotest to use "file" scheme in URLs.
Miikka Heikkinen [Wed, 28 Sep 2011 07:08:55 +0000 (10:08 +0300)]
Fix QTextBrowser autotest to use "file" scheme in URLs.

A security fix to QUrl that causes it to no longer interpret URLs
without scheme as local files broke QTextBrowser test case. Added the
necessary "file" schemes to URLs used in the test.

Also added a mention about necessity of using "file" scheme to
QTextBrowser documentation.

Task-number: QT-5286
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Tue, 27 Sep 2011 12:19:18 +0000 (22:19 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Disabled activeqt/webbrowser example from mingw build.

11 years agoDoc updates to Qt for Symbian installation instructions and platform notes.
Eero Hyyti [Tue, 27 Sep 2011 12:11:36 +0000 (15:11 +0300)]
Doc updates to Qt for Symbian installation instructions and platform notes.

11 years agoDoc updates to platform notes document.
Eero Hyyti [Tue, 27 Sep 2011 06:38:54 +0000 (09:38 +0300)]
Doc updates to platform notes document.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Eero Hyyti [Tue, 27 Sep 2011 05:49:10 +0000 (08:49 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Tue, 27 Sep 2011 00:20:24 +0000 (10:20 +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:
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 26 Sep 2011 18:36:02 +0000 (04:36 +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:
  Improve sbsv2 whatlog support.
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  symbian: Implement QNetworkConfiguration::purpose()
  symbian bearer: fix tst_qnetworksession test failures
  Fix the incorrect sizeHint given by QLabel on Symbian

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 26 Sep 2011 12:24:57 +0000 (22:24 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix broken qglthreads autotest build on Solaris.
  Don't store the alignment attribute for spacers

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex
Aapo Haapanen [Mon, 26 Sep 2011 11:47:50 +0000 (14:47 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex

11 years agoFix QXmlQuery autotest failure.
Juha Kukkonen [Mon, 26 Sep 2011 05:25:50 +0000 (08:25 +0300)]
Fix QXmlQuery autotest failure.

Changed XQuery functions fn:doc() and fn:doc-available() to work with
URLs without scheme when accessing files.

Task-number: QT-4962
Reviewed-by: Honglei Zhang
11 years agoLower case as default in password entry in Symbian port.
Jarkko T. Toivonen [Mon, 26 Sep 2011 09:51:48 +0000 (12:51 +0300)]
Lower case as default in password entry in Symbian port.

The text case "Abc" is removed from the permitted cases because
passwords are rarely sentences but random characters.

Task-number: QTBUG-10312
Reviewed-by: Shane Kearns
11 years agoFix plugin implicit loading when calling QPluginLoader::instance().
Miikka Heikkinen [Mon, 26 Sep 2011 07:46:53 +0000 (10:46 +0300)]
Fix plugin implicit loading when calling QPluginLoader::instance().

QPluginLoader::instance() didn't increase loading refcount if another
QPluginLoader had already loaded the plugin. This meant that if the
another QPluginLoader subsequently unloaded the plugin, the instance
would be destroyed even if the second loader still wanted to use it.

Also improved the tst_QPluginLoader::deleteinstanceOnUnload() test case
to test more combinations of deletion order and explicit/implicit
loading.

Task-number: QT-5259
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Sat, 24 Sep 2011 06:34:16 +0000 (16:34 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Fix accessible menu not returning child name.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 23 Sep 2011 18:34:47 +0000 (04:34 +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:
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8

11 years agoSymbian - perform some FS initialisation previously done by open c
Shane Kearns [Fri, 23 Sep 2011 14:53:59 +0000 (15:53 +0100)]
Symbian - perform some FS initialisation previously done by open c

When using Qt 4.6 and 4.7, the working directory is set to the same
drive the application is installed on by the open c library.
The default working directory in symbian is always the private
directory on the system drive, but we told people to rely on the
open c behaviour.

Open C also creates the private path on both the system and
installation drives when the application is started.

This behaviour is also replicated now in Qt 4.8 for backward
compatibility of apps that may rely on it.

Similar code to create the private path on the installation drive
in QCoreApplication::applicationDirPath() has been removed, as the
new code in this patch is always executed first.

Task-Number: QTBUG-21527
Reviewed-By: mread
11 years agosymbian - Document behaviour of QDir::rootPath / homePath
Shane Kearns [Fri, 23 Sep 2011 11:01:08 +0000 (12:01 +0100)]
symbian - Document behaviour of QDir::rootPath / homePath

The root path was intentionally changed to reflect the real
drive root, while home path continues to reflect the user
data directory.

Task-Number: QTBUG-21527
Reviewed-By: Miikka Heikkinen
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 23 Sep 2011 17:08:09 +0000 (03:08 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Fix accessible menu not returning child name.

11 years agoFix accessible menu not returning child name.
Frederik Gladhorn [Fri, 23 Sep 2011 12:23:52 +0000 (14:23 +0200)]
Fix accessible menu not returning child name.

When accessible name is set, QAccessibleMenu would always return
the menu's name, not that of the child action.

Task-Number: QTBUG-21578
Reviewed-by: Jan-Arve
11 years agoFix broken qglthreads autotest build on Solaris.
Iikka Eklund [Fri, 23 Sep 2011 15:13:39 +0000 (17:13 +0200)]
Fix broken qglthreads autotest build on Solaris.

qglthreads autotest can not find usleep() function when
compiling on Solaris platform. Added qplatformdefs.h include
to fix compilation.

Task-number: QTBUG-21594

Merge-request: 1394
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoDoc updates to platform notes of Qt 4.8 doc.
Eero Hyyti [Fri, 23 Sep 2011 12:45:01 +0000 (15:45 +0300)]
Doc updates to platform notes of Qt 4.8 doc.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex
Aapo Haapanen [Fri, 23 Sep 2011 12:23:59 +0000 (15:23 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex

Conflicts:
src/xmlpatterns/api/qxmlquery.cpp

11 years agoFix for QTBUG-18050: QXmlQuery crash
Aapo Haapanen [Thu, 22 Sep 2011 12:50:50 +0000 (15:50 +0300)]
Fix for QTBUG-18050: QXmlQuery crash

If QXmlQuery has a previous focus and an invalid xml is given
in setFocus, the old focus must be cleared. Otherwise the query
may be left in an inconsistent state.

Task-number: QTBUG-18050
Reviewed-by: Miikka Heikkinen
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Fri, 23 Sep 2011 12:12:38 +0000 (22:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (84 commits)
  Disabled activeqt/webbrowser example from mingw build.
  Fix broken Solaris build (getpwnam_r usage)
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  Update changelog for Qt 4.8
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Update changelog for Qt 4.8
  Prevent unnecessary graphics item updates when graphics effect changes.
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  runonphone: Implement traceswitch support for coda
  ...

11 years agoDisabled activeqt/webbrowser example from mingw build.
Simo Fält [Fri, 23 Sep 2011 11:56:23 +0000 (14:56 +0300)]
Disabled activeqt/webbrowser example from mingw build.

11 years agoDon't store the alignment attribute for spacers
Jarek Kobus [Fri, 23 Sep 2011 10:19:02 +0000 (12:19 +0200)]
Don't store the alignment attribute for spacers

And for QLayoutWidget as it is not allowed and will create
a code which doesn't compile

Reviewed-by: con <qtc-committer@nokia.com>
Task-number: QTBUG-21575

11 years agoDoc updates to Qt 4.8 platform notes documentation.
Eero Hyyti [Fri, 23 Sep 2011 09:34:34 +0000 (12:34 +0300)]
Doc updates to Qt 4.8 platform notes documentation.

11 years agoUpdate changelog for Qt-4.8.0: add QtWebKit notes
Ademar de Souza Reis Jr [Thu, 22 Sep 2011 17:35:31 +0000 (14:35 -0300)]
Update changelog for Qt-4.8.0: add QtWebKit notes

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 23 Sep 2011 08:18:34 +0000 (10:18 +0200)]
Update changelog for Qt 4.8

Change recieved from James Perrett

11 years agoThe cursor can get offscreen in splitscreen landscape mode
Sami Merila [Fri, 23 Sep 2011 07:51:53 +0000 (10:51 +0300)]
The cursor can get offscreen in splitscreen landscape mode

When input context is making the translation, it doesn't check if
the translation is happening to the correct direction (i.e. upwards
or downwards).

As a fix, check if the cursor is still visible after making the
translation. If it isn't apply the translation to the other direction.

Task-number: QTBUG-21543
Reviewed-by: Miikka Heikkinen
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 22 Sep 2011 23:18:37 +0000 (09:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 22 Sep 2011 18:44:55 +0000 (04: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:
  Fix broken Solaris build (getpwnam_r usage)

11 years agoFix broken Solaris build (getpwnam_r usage)
Iikka Eklund [Thu, 22 Sep 2011 13:11:42 +0000 (15:11 +0200)]
Fix broken Solaris build (getpwnam_r usage)

Added ifdef inside qt_tildeExpansion function to use correct
version of getpwnam_r depending on _C_POSIX_SOURCE version
on Solaris platform.

Task-number: QTBUG-21451
Merge-request: 1380
Reviewed-by: ossi
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 22 Sep 2011 14:40:42 +0000 (00:40 +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:
  Improve sbsv2 whatlog support.
  Modified SymSQL documentation in sql-driver.qdoc according review comments
  Added correct licence headers to symsql source files
  Documentation modifications for SymbianSQL added into sql-driver.qdoc
  Release Symbian SQL driver
  Fixed a typo found by static checker
  Added SQL driver plugin implementation for Symbian.
  Symbian: Fix qmdiarea autotest regressions
  Fix memory leaks in schema validation
  Symbian: Added copy-paste functionality to FEP input context
  Fix the incorrect sizeHint given by QLabel on Symbian

11 years agoImprove sbsv2 whatlog support.
Miikka Heikkinen [Thu, 22 Sep 2011 13:21:58 +0000 (16:21 +0300)]
Improve sbsv2 whatlog support.

All builds will now add anything generated via QMAKE_EXTRA_COMPILERS
to whatlog. In addition, platform builds will now add to whatlog
the exported mkspecs and qmake_clean.flm that were missing.

Task-number: QTBUG-21591
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Thu, 22 Sep 2011 13:03:40 +0000 (23:03 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)

11 years agofix for QTBUG-18050: QXmlQuery crash
Aapo Haapanen [Thu, 22 Sep 2011 12:50:50 +0000 (15:50 +0300)]
fix for QTBUG-18050: QXmlQuery crash

11 years agoSentences should end with a period! (Poor man's rebuild trigger.)
Andreas Kling [Thu, 22 Sep 2011 12:48:44 +0000 (14:48 +0200)]
Sentences should end with a period! (Poor man's rebuild trigger.)

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 22 Sep 2011 09:21:28 +0000 (19:21 +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: (95 commits)
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Update changelog for Qt 4.8
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Make sure cursor position doesn't exceed line end
  Allow shared EGL contexts for xcb and xlib platforms
  Allow generic EGL platform contexts to be shared
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  4.8 Changes: OpenGL Framebuffer Format
  stop tslib plugin having same file name as linux input plugin
  Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  ...

11 years agoUpdate changes-4.8.0 file
aavit [Thu, 22 Sep 2011 09:04:53 +0000 (11:04 +0200)]
Update changes-4.8.0 file

11 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Thu, 22 Sep 2011 09:02:18 +0000 (11:02 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
dist/changes-4.8.0

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex
Pasi Pentikainen [Thu, 22 Sep 2011 08:14:33 +0000 (11:14 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-flex

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Wed, 21 Sep 2011 23:17:05 +0000 (09:17 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Update changelog for Qt 4.8

11 years agoModified SymSQL documentation in sql-driver.qdoc according review comments
Timo Kauppinen [Mon, 5 Sep 2011 12:13:16 +0000 (15:13 +0300)]
Modified SymSQL documentation in sql-driver.qdoc according review comments

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoAdded correct licence headers to symsql source files
Timo Kauppinen [Fri, 2 Sep 2011 12:51:32 +0000 (15:51 +0300)]
Added correct licence headers to symsql source files

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoDocumentation modifications for SymbianSQL added into sql-driver.qdoc
Timo Kauppinen [Fri, 19 Aug 2011 06:51:45 +0000 (09:51 +0300)]
Documentation modifications for SymbianSQL added into sql-driver.qdoc

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoRelease Symbian SQL driver
Honglei Zhang [Mon, 4 Jul 2011 10:17:35 +0000 (13:17 +0300)]
Release Symbian SQL driver

Symbian SQL driver provides service of secure databases. SQL databases
are stored in Symbian SQL server's private data cage. The API ensures
only authorised clients can access the database. The Symbian SQL driver
enables Qt application to use Symbian secure databases.

Task-number: QT-4860
Reviewed-by: Trust Me
11 years agoFixed a typo found by static checker
Timo Kauppinen [Mon, 23 May 2011 12:32:27 +0000 (15:32 +0300)]
Fixed a typo found by static checker

Task-number: QT-4860
Reviewd-by: Honglei Zhang
11 years agoAdded SQL driver plugin implementation for Symbian.
Timo Kauppinen [Wed, 13 Apr 2011 07:18:15 +0000 (10:18 +0300)]
Added SQL driver plugin implementation for Symbian.

The Symbian SQL driver enables the usage of native Symbian SQL server from Qt code. Symbian SQL driver also supports the usage of Symbian platform security capabilities.

Task-number: QT-4860
Reviewed-by: Honglei Zhang
11 years agoOnly limit cursor position when line is wrapped
Jiang Jiang [Tue, 20 Sep 2011 11:42:35 +0000 (13:42 +0200)]
Only limit cursor position when line is wrapped

Reviewed-by: Eskil
11 years agoMerge remote-tracking branch 'qtwebkit-integration/4.8'
Andreas Kling [Wed, 21 Sep 2011 10:51:09 +0000 (12:51 +0200)]
Merge remote-tracking branch 'qtwebkit-integration/4.8'

11 years agoSymbian: Fix qmdiarea autotest regressions
Miikka Heikkinen [Wed, 21 Sep 2011 10:16:34 +0000 (13:16 +0300)]
Symbian: Fix qmdiarea autotest regressions

Some cases in qmdiarea test passed on 4.7 but failed on 4.8.
A closer examination reveals that the cases are in any case
invalid in Symbian and should be skipped like in WinCE and
Mac.

Task-number: QT-5254
Reviewed-by: Sami Merila
11 years agoMerge branch 'SchemaMemLeak'
Honglei Zhang [Wed, 21 Sep 2011 10:04:35 +0000 (13:04 +0300)]
Merge branch 'SchemaMemLeak'

11 years agoFix memory leaks in schema validation
Honglei Zhang [Wed, 21 Sep 2011 08:53:30 +0000 (11:53 +0300)]
Fix memory leaks in schema validation

Bug fix for QTBUG-12550. QExplicitlySharedDataPointer is excessively
used in XmlPatterns code. This forumate cyclic loops in some situation.
This fix replace the shared data pointer with normal C++ pointer to
break the loop.

Task-number: QTBUG-12550
Reviewed-by: Tomi Vihria
11 years agoSymbian: Added copy-paste functionality to FEP input context
Miikka Heikkinen [Tue, 20 Sep 2011 11:36:24 +0000 (14:36 +0300)]
Symbian: Added copy-paste functionality to FEP input context

The support for copy-paste functionality in FEP was initially submitted
as merge request #1151, though that only provided support for
basic Qt edit widgets. I modified the code so that QML edit elements
are also supported, as well as any other editor that provides the
required "copy", "cut", and "paste" slots, and "canPaste" property.
A number of other minor fixes were also done to the original merge
request, as well as the removal of S60 version plugin elements.

Task-number: QTBUG-20921
Reviewed-by: Sami Merila
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 20 Sep 2011 23:16:13 +0000 (09:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits)
  add 4.8 changes created/merged by me
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  runonphone: Include USB serial ports on OS X for CODA, too
  Update changelog for Qt 4.8.0
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  runonphone: Implement traceswitch support for coda
  Fix missing clean up stack panic for a new thread in Symbian
  Regression in QS60Style when drawing webview scrollbars
  Cleanup qwidget_s60.cpp
  Fix panic when global QSettings instance needs flusing at app exit
  Fix uninitialised variable in temporary files
  More accurately determine bearer type for symbian GPRS/3G
  Add documentation for Symbian QSettings locations and security
  Update QDesktopServices openUrl() documentation on Symbian OS
  Mark binaries as SMPSAFE in Symbian
  Fix "sbs -c tools2 --what" output for Qt.
  Update environment.prf
  QS60Style: Make spinboxes and lineedits slightly taller
  runonphone: Add a missing space between a message and the file name
  ...

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 20:26:26 +0000 (06:26 +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:
  Update changelog for Qt 4.8

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 20 Sep 2011 16:13:34 +0000 (02:13 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  symbian: Implement QNetworkConfiguration::purpose()

11 years agosymbian: Implement QNetworkConfiguration::purpose()
Shane Kearns [Tue, 20 Sep 2011 14:53:38 +0000 (15:53 +0100)]
symbian: Implement QNetworkConfiguration::purpose()

QNetworkConfiguration::purpose() will now return translated values
for the system SNAPs rather than always UnknownPurpose.
e.g. the "Internet" SNAP returns PublicPurpose, and the WAP/MMS SNAPs
return ServiceSpecificPurpose.
IAPs inherit the purpose of the service network that contains them,
unless the same IAP is present in more than one with conflicting
purposes, in which case UnknownPurpose is returned.

Task-Number: QTBUG-19166
Reviewed-By: mread
11 years agoWorkaround MSVC2010 problems when linking QtWebKit
Ademar de Souza Reis Jr [Tue, 20 Sep 2011 14:12:04 +0000 (11:12 -0300)]
Workaround MSVC2010 problems when linking QtWebKit

Include MSVC2010 in the list of compilers where incremental
build is disabled (INCREMENTAL:NO).

Change suggested by Simo Falt <simo.falt@nokia.com>

11 years agodos2unix on a webkit source file (fix support for Visual Studio)
Ademar de Souza Reis Jr [Mon, 19 Sep 2011 13:43:14 +0000 (10:43 -0300)]
dos2unix on a webkit source file (fix support for Visual Studio)

webkit/Source/WebCore/bindings/js/JSExceptionBase.h had CRLF
terminations, which Visual Studio didn't like for some reason.

Reported by Simo Falt. Patch is also being submited to upstream
(webkit.org)

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Tue, 20 Sep 2011 12:23:53 +0000 (22:23 +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: (31 commits)
  runonphone: Include USB serial ports on OS X for CODA, too
  runonphone: Implement traceswitch support for coda
  Fix missing clean up stack panic for a new thread in Symbian
  Regression in QS60Style when drawing webview scrollbars
  Cleanup qwidget_s60.cpp
  Fix panic when global QSettings instance needs flusing at app exit
  Fix uninitialised variable in temporary files
  More accurately determine bearer type for symbian GPRS/3G
  Add documentation for Symbian QSettings locations and security
  Update QDesktopServices openUrl() documentation on Symbian OS
  Mark binaries as SMPSAFE in Symbian
  Fix "sbs -c tools2 --what" output for Qt.
  Update environment.prf
  QS60Style: Make spinboxes and lineedits slightly taller
  runonphone: Add a missing space between a message and the file name
  runonphone: Allow overriding the temporary sis file name
  Fix QIcon auto-tests for Symbian
  Add a cast to moc cpp generator to remove armcc warnings
  Fix qt.conf for Symbian to use $${EPOCROOT}
  Remove few unused variables.
  ...

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Tue, 20 Sep 2011 10:34:39 +0000 (12:34 +0200)]
Update changelog for Qt 4.8

Change recieved from John Brooks

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 20 Sep 2011 10:13:30 +0000 (20:13 +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: (86 commits)
  Fixed automatic plugin path resolving for predefined Qt plugins.
  symbian bearer: fix tst_qnetworksession test failures
  Resolve a number of compilation issues with INTEGRITY
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
  Update changelog for Qt 4.8
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Update changelog for Qt 4.8
  Prevent unnecessary graphics item updates when graphics effect changes.
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  My changes for 4.8.0
  minor docu fixes
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Mingw compile error src/gui/accessible/qaccessible_win.cpp
  Updated Changelog
  My 4.8.0 changes.
  My 4.8.0 changes
  ...

11 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Tue, 20 Sep 2011 09:59:45 +0000 (12:59 +0300)]
Merge remote-tracking branch 'qt/4.8'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 06:26:28 +0000 (16:26 +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:
  add 4.8 changes created/merged by me
  Update changelog for Qt 4.8.0

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 00:33:38 +0000 (10: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:
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 19 Sep 2011 23:18:28 +0000 (09:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  My changes for 4.8.0
  My 4.8.0 changes.
  My 4.8.0 changes
  Mention Lighthouse in the changes file.
  Changelog: add waylandwindowmanager integration changes
  My 4.8.0 changes

11 years agoadd 4.8 changes created/merged by me
Oswald Buddenhagen [Mon, 19 Sep 2011 18:11:04 +0000 (20:11 +0200)]
add 4.8 changes created/merged by me

11 years agoFixed automatic plugin path resolving for predefined Qt plugins.
Janne Anttila [Mon, 19 Sep 2011 17:10:14 +0000 (19:10 +0200)]
Fixed automatic plugin path resolving for predefined Qt plugins.

When Qt is configured for static build, importing static plugins is
supposed to work as described in docs:
http://doc.qt.nokia.com/latest/qtplugin.html#Q_IMPORT_PLUGIN

This commit updates the qmake mapping for predefined Qt plugins, so
that Qt plugins are automatically found when QTPLUGIN keyword is used.

Task-number: QTBUG-18609
Merge-request: 1391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Mon, 19 Sep 2011 16:03:32 +0000 (02:03 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  minor docu fixes
  Mingw compile error src/gui/accessible/qaccessible_win.cpp
  Implement QAccessibleActionInterface for menu actions.
  Do not leak memory

11 years agosymbian bearer: fix tst_qnetworksession test failures
Shane Kearns [Mon, 19 Sep 2011 13:34:04 +0000 (14:34 +0100)]
symbian bearer: fix tst_qnetworksession test failures

Symbian is not reporting the expected KLinkLayerClosed event on the
last RConnection handle. Instead, it reports the event
KConfigDaemonFinishedDeregistrationStop, which indicates the nif
plugin is being destroyed (this is followed by unload events)

To fix, this event is treated the same as a link down event, and
results in the state change to disconnected.

Either there has been a behaviour change in the platform, or the
test was previously run with another user of the API running in the
background (e.g. WLAN wizard, connection monitor) which prevented
the unload.

Task-Number: QTBUG-21382
Reviewed-By: mread
11 years agoResolve a number of compilation issues with INTEGRITY
Rolland Dudemaine [Mon, 19 Sep 2011 15:03:22 +0000 (17:03 +0200)]
Resolve a number of compilation issues with INTEGRITY

First, #ifdef'ed out getpwuid_r() and getpwgid_r() usage since users/groups support is not in in single-process Posix mode.
Also, correct a typo and add missing files to io.pri.
Update documentation to disable libtiff which won't compile until ibtiff itself is updated, and add back -no-exceptions in the sample command line. And add a line to compile host tools.
Add a dummy QT_OPEN_LARGEFILE definition in qplatformdefs.h since there is code that requires it.
Move definition of getGlyph() after the definition of qHash(GlyphAndSubPixelPosition).

Merge-request: 2686
Reviewed-by: ossi
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 19 Sep 2011 12:34:28 +0000 (22:34 +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:
  runonphone: Include USB serial ports on OS X for CODA, too

11 years agorunonphone: Include USB serial ports on OS X for CODA, too
Martin Storsjo [Fri, 9 Sep 2011 09:01:18 +0000 (12:01 +0300)]
runonphone: Include USB serial ports on OS X for CODA, too

The actual devices are already detected in serenum_unix.cpp, but
when used with CODA, the eligible /dev entries apparently need
to be listed here, too.

Reviewed-By: Shane Kearns
Merge-Request: 1373

11 years agoUpdate changelog for Qt 4.8.0
Liang Qi [Mon, 19 Sep 2011 11:43:52 +0000 (13:43 +0200)]
Update changelog for Qt 4.8.0

For QtConcurrent and QUuid.

11 years agoMake sure cursor position doesn't exceed line end
Jiang Jiang [Mon, 19 Sep 2011 11:20:13 +0000 (13:20 +0200)]
Make sure cursor position doesn't exceed line end

If we have trailing spaces at the end of a line, cursor will disappear
because the position we returned exceeds line end, thus the widget
border. By limiting it within line.width we can make sure it always
visible, which is more consistent to the behavior in common platforms.

Reviewed-by: Eskil
11 years agoAllow shared EGL contexts for xcb and xlib platforms
Reuben Dowle [Mon, 19 Sep 2011 11:04:50 +0000 (13:04 +0200)]
Allow shared EGL contexts for xcb and xlib platforms

Merge-request: 1331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoAllow generic EGL platform contexts to be shared
Reuben Dowle [Mon, 19 Sep 2011 11:04:48 +0000 (13:04 +0200)]
Allow generic EGL platform contexts to be shared

Merge-request: 1331
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoFix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
Andy Shaw [Mon, 19 Sep 2011 08:52:32 +0000 (10:52 +0200)]
Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE

This solves a build issue on Solaris as the symbols were missing so
they are now added in the expected way after discussion with the
Nokia developer who approved the patch originally for winscw.

Task-number: QTBUG-21523
Merge-request: 1389
Reviewed-by: ossi
11 years ago4.8 Changes: OpenGL Framebuffer Format
Gerhard Roethlin [Mon, 19 Sep 2011 08:01:21 +0000 (10:01 +0200)]
4.8 Changes: OpenGL Framebuffer Format

Added an entry for the OpenGL Framebuffer Format commit to the 4.8
changelog.

Merge-request: 1387
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agostop tslib plugin having same file name as linux input plugin
Reuben Dowle [Mon, 19 Sep 2011 07:46:50 +0000 (09:46 +0200)]
stop tslib plugin having same file name as linux input plugin

Merge-request: 1330
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
aavit [Mon, 19 Sep 2011 07:44:42 +0000 (09:44 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

11 years agoAvoid unnecessary detach of a QImage in QPixmapDropShadowFilter
David Faure [Mon, 19 Sep 2011 07:23:29 +0000 (09:23 +0200)]
Avoid unnecessary detach of a QImage in QPixmapDropShadowFilter

Merge-request: 1374
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 19 Sep 2011 04:46:03 +0000 (14:46 +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:
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Updated change-log for 4.8
  Update changes file for 4.8.0
  Update changelog for Qt 4.8
  My changes for 4.8.0
  My 4.8.0 changes.
  My 4.8.0 changes
  Mention Lighthouse in the changes file.
  Changelog: add waylandwindowmanager integration changes
  My 4.8.0 changes

11 years agoMerge remote branch 'origin/4.8' into doc-staging-master
Rohan McGovern [Mon, 19 Sep 2011 04:12:35 +0000 (14:12 +1000)]
Merge remote branch 'origin/4.8' into doc-staging-master

Conflicts:
dist/changes-4.8.0