qt:qt.git
10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Mon, 31 Oct 2011 14:03:00 +0000 (15:03 +0100)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/mainpage.qdoc
doc/src/platforms/supported-platforms.qdoc
doc/src/qt-webpages.qdoc
src/network/access/qnetworkdiskcache.cpp

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Fri, 28 Oct 2011 15:31:56 +0000 (01:31 +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:
  Symbian configuration parameter change for linux building
  Improve patch_capabilities script output.
  Fix QtSql autotest server addresses
  Update SQLite version number in legal document
  Update SQLite version mentioned in licence document
  Symbian Linuxification building case changes
  Fix FTP example to handle failure to open network session
  Use QBasicAtomicInt as a static variable
  FTP - fix interoperability issues with SIZE command
  QS60StyleAnimation exception safety
  Catch potential throw in ~QSymbianControl
  Fixed access to null threadData in ~QObjectPrivate
  Fix the build for makefile build system of Symbian
  Symbian - fix compile error when default configured

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 28 Oct 2011 10:32:43 +0000 (20:32 +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:
  Symbian - disable memory mapping in QNetworkDiskCache

10 years agoSymbian - disable memory mapping in QNetworkDiskCache
Shane Kearns [Fri, 28 Oct 2011 10:20:07 +0000 (11:20 +0100)]
Symbian - disable memory mapping in QNetworkDiskCache

The implementation of memory mapped files in Open C requires
munmap to be called from the same thread as mmap. As the
QIODevice can be handed off to another thread, this breaks
application code that works on other operating systems.

Task-number: QT-5309
Reviewed-by: Tadaaki Matsumoto
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Fri, 28 Oct 2011 09:43:24 +0000 (19:43 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"

10 years agoRevert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
Joerg Bornemann [Fri, 28 Oct 2011 09:32:26 +0000 (11:32 +0200)]
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"

This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d.

Adding the define _BIND_TO_CURRENT_VCLIBS_VERSION led to linking problems
for several people. Also, this leads to problems when using the binary
installer for development.

Reviewed-by: Andy Shaw <andy.shaw@digia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Fri, 28 Oct 2011 03:34:36 +0000 (13:34 +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:
  QIODevice - disallow setTextMode when not open

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 21:09:47 +0000 (07:09 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Harfbuzz shaper: kerning adjustment does not need to be modified by RTL

10 years agoHarfbuzz shaper: kerning adjustment does not need to be modified by RTL
John Tapsell [Thu, 27 Oct 2011 18:52:03 +0000 (20:52 +0200)]
Harfbuzz shaper: kerning adjustment does not need to be modified by RTL

Merge-request: 1435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoQIODevice - disallow setTextMode when not open
Shane Kearns [Thu, 20 Oct 2011 15:55:02 +0000 (16:55 +0100)]
QIODevice - disallow setTextMode when not open

Calling setTextMode() before open() would make the device appear to be
already open and cause later errors.
Added a qWarning and documentation update to prevent this API misuse

Task-number: QTBUG-20905
Change-Id: I2e06cd8e79f4afcf27417ac0eae6ebef980a17aa
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
(cherry picked from commit 29c30a20bab4c4ea892b95c08c71bb5f136bb82c)

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 10:35:53 +0000 (20:35 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part
  Doc: adding link to the Qt Quick Components for Symbian page.

10 years agoMerge remote-tracking branch 'upstream/4.7' into 4.7
Sergio Ahumada [Thu, 27 Oct 2011 10:29:33 +0000 (12:29 +0200)]
Merge remote-tracking branch 'upstream/4.7' into 4.7

Conflicts:
src/gui/inputmethod/qcoefepinputcontext_s60.cpp

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Thu, 27 Oct 2011 09:49:24 +0000 (19:49 +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:
  Fix possible crash in glyph cache when deleting and creating contexts

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 27 Oct 2011 05:51:05 +0000 (15:51 +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:
  Adding items to a view with no delegate crashes.

10 years agoAdding items to a view with no delegate crashes.
Martin Jones [Thu, 27 Oct 2011 05:22:45 +0000 (15:22 +1000)]
Adding items to a view with no delegate crashes.

If there is no delegate then clear state and return.

Change-Id: I786b9bc4018706797056fbd1ad25d25663102707
Task-number: QTBUG-22379
Reviewed-by: Andrew den Exter
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 26 Oct 2011 19:51:47 +0000 (05:51 +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:
  Fix security issue on website due to bad JS.
  Doc: adding link to the Qt Quick Components for Symbian page.

10 years agoMerge remote-tracking branch 'qt-doc-review/master'
Casper van Donderen [Wed, 26 Oct 2011 14:16:00 +0000 (16:16 +0200)]
Merge remote-tracking branch 'qt-doc-review/master'

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Wed, 26 Oct 2011 14:02:01 +0000 (00:02 +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

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 26 Oct 2011 12:48:18 +0000 (22:48 +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 configuration parameter change for linux building

10 years agoSymbian configuration parameter change for linux building
Pasi Pentikainen [Tue, 25 Oct 2011 14:50:02 +0000 (17:50 +0300)]
Symbian configuration parameter change for linux building

Symbian configuration changed to use opengl es2 parameter which
works both with configure.exe (symbian windows building) and
configure sh-script (symbian linux building).

Reviewed-by: Miikka Heikkinen
10 years agoUpdate changelog for Qt 4.8
Mark Brand [Wed, 26 Oct 2011 10:59:31 +0000 (12:59 +0200)]
Update changelog for Qt 4.8

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Wed, 26 Oct 2011 09:02:01 +0000 (19:02 +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: (29 commits)
  Fix possible crash in glyph cache when deleting and creating contexts
  Added Lithuanian translation of Qt.
  Remove idc from mingw build.
  Update changelog for Qt 4.8
  Update changelog for Qt 4.8
  Add the ability to enable various SSL bug workarounds.
  Fix performance regression on Mac OS X when creating/destroying QMutex
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch
  Fix bug in QStringToBSTR.
  Fix regression in ListView
  Fixed resource leak when setting QProgressBar style sheet
  Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac
  don't lock the global mutex if there is nothing to protect
  fix possible race conditions
  simplify the code by using QSystemLibrary a bit smarter
  ...

10 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Wed, 26 Oct 2011 08:58:13 +0000 (10:58 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

10 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Wed, 26 Oct 2011 07:52:38 +0000 (17:52 +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:
  Doc: Fix example code
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
  Accepting predicted text using hardware keyboard replaces unwanted part
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Workaround to VideoCore III scissor bug.
  Fix to QGLWidget crash
  Update def files
  Fix crash on exit when overriding signal handlers in states.
  Typo fix
  Add new signals to indicate GPU resource usage.
  symbian - search drives for translation files
  symbian - search drives for translation files
  Cannot flick to the end of a horizontal list view width LayoutMirroring
  Backport more imports directory caching changes.
  Symbian - fix deleteLater not working from RunL
  Fix more test DEPLOYMENT statements for Symbian
  Fix deployment for declarative tests, examples on Symbian
  Fix StrictlyEnforceRange with snapOneItem/Row and header behavior, pt 2
  Backport imports directory caching performance optimization

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 26 Oct 2011 07:43:02 +0000 (17:43 +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 patch_capabilities script output.

10 years agoImprove patch_capabilities script output.
Miikka Heikkinen [Tue, 25 Oct 2011 13:37:45 +0000 (16:37 +0300)]
Improve patch_capabilities script output.

Now prefix any actual patching errors with "ERROR:" so that they will
be obvious also in QtCreator builds.

Task-number: QTBUG-22267
Reviewed-by: Sami Merila
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 25 Oct 2011 15:20:20 +0000 (01:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix QtSql autotest server addresses

10 years agoFix possible crash in glyph cache when deleting and creating contexts
Eskil Abrahamsen Blomfeldt [Tue, 25 Oct 2011 13:58:49 +0000 (15:58 +0200)]
Fix possible crash in glyph cache when deleting and creating contexts

The freeResource(), used in the glyph cache as a notifier of when the
owner context of the cache disappears, is never called if the context
is in a group with other contexts that share its resources. This
implements a second notifier function instead which can be used to
invalidate the glyph cache when its context is destroyed.

Task-number: QTBUG-22324
Reviewed-by: Samuel
10 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Tue, 25 Oct 2011 12:56:51 +0000 (14:56 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Tue, 25 Oct 2011 11:34:02 +0000 (21: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 bug in QStringToBSTR.
  Fix regression in ListView
  Fixed resource leak when setting QProgressBar style sheet
  Fix regression introduced by 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac
  don't lock the global mutex if there is nothing to protect
  fix possible race conditions
  simplify the code by using QSystemLibrary a bit smarter
  use QSystemLibrary::resolve() instead of GetProcAddress() win API calls
  nativewifi bearer plugin: prefer DLL Safe Search mode
  make QElapsedTimer use QSystemLibrary on win
  QTBUG-21058: Fix for possible crashes in QTextControl::setCursorWidth()
  Fix bug in QGraphicsItem::isVisibleTo().
  nano-opts, styling fixes
  don't assume the PATH envvar is latin1-encoded
  Set missing flags in the option when rendering QTreeView drag pixmap
  Fix typo when updating accessible treeview selection.

10 years agoFix QtSql autotest server addresses
Honglei Zhang [Tue, 25 Oct 2011 10:16:30 +0000 (13:16 +0300)]
Fix QtSql autotest server addresses

Fix QtSql autotest server addresses. Old server which are located in
Oslo shall not be used. New servers are located in Brisbane.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 25 Oct 2011 10:13:14 +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:
  Update SQLite version number in legal document

10 years agoUpdate SQLite version number in legal document
Honglei Zhang [Tue, 25 Oct 2011 10:10:06 +0000 (13:10 +0300)]
Update SQLite version number in legal document

SQLite version in Qt 4.8 is upcated to 3.7.7.1.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 25 Oct 2011 01:30:08 +0000 (11:30 +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

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Mon, 24 Oct 2011 23:09:32 +0000 (09:09 +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

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Mon, 24 Oct 2011 23:00:12 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 24 Oct 2011 19:45:23 +0000 (05:45 +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:
  Added Lithuanian translation of Qt.
  Remove idc from mingw build.

10 years agoAdded Lithuanian translation of Qt.
Rimas Kudelis [Mon, 24 Oct 2011 17:34:54 +0000 (19:34 +0200)]
Added Lithuanian translation of Qt.

Merge-request: 2703
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoRemove idc from mingw build.
Markku Heikkila [Mon, 24 Oct 2011 17:28:45 +0000 (19:28 +0200)]
Remove idc from mingw build.

Mingw tool chain does not support com/idl so remove it.

Task-number: QTBUG-22260
Merge-request: 2710
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoUpdate changelog for Qt 4.8
miniak [Mon, 24 Oct 2011 17:25:51 +0000 (19:25 +0200)]
Update changelog for Qt 4.8

MR #1272: Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
MR #2616: QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_TRANSPARENTBAR)
MR #2526: Fix comctl32 v6 dependency generation in Visual Studio 2005 and higher
MR #2519: fix qFadeEffect windowOpacity issue on Windows
MR #769: qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly

Merge-request: 2708
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 24 Oct 2011 14:06:57 +0000 (00:06 +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

10 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Mon, 24 Oct 2011 13:47:12 +0000 (15:47 +0200)]
Update changelog for Qt 4.8

Change recieved from Aurélien Gâteau

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 24 Oct 2011 08:25:11 +0000 (18:25 +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:
  Update SQLite version mentioned in licence document

10 years agoUpdate SQLite version mentioned in licence document
Honglei Zhang [Mon, 24 Oct 2011 08:20:11 +0000 (11:20 +0300)]
Update SQLite version mentioned in licence document

SQLite version has been updated to 3.7.7.1 since Qt 4.8. The version
number is corrected in licence document for 3rd party components.

Reviewed-by: Trust Me
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sat, 22 Oct 2011 23:09:29 +0000 (09:09 +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:
  Add the ability to enable various SSL bug workarounds.
  Fix performance regression on Mac OS X when creating/destroying QMutex
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 22 Oct 2011 23:00:13 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 22 Oct 2011 02:13:41 +0000 (12:13 +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:
  Add the ability to enable various SSL bug workarounds.
  Fix performance regression on Mac OS X when creating/destroying QMutex

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration
Qt Continuous Integration System [Fri, 21 Oct 2011 21:22:24 +0000 (07:22 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  Doc: Fix example code

10 years agoDoc: Fix example code
Sergio Ahumada [Fri, 21 Oct 2011 21:15:05 +0000 (23:15 +0200)]
Doc: Fix example code

Task-number: QTWEBSITE-281

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Fri, 21 Oct 2011 20:31:35 +0000 (06:31 +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:
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 16:24:40 +0000 (02:24 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch

10 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 14:44:38 +0000 (00:44 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Fix security problem on webpage due to bad JS
  Accepting predicted text using hardware keyboard replaces unwanted part

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Fri, 21 Oct 2011 11:48:39 +0000 (21:48 +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:
  Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504

10 years agoRegression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504
Sami Merila [Fri, 21 Oct 2011 11:40:28 +0000 (14:40 +0300)]
Regression caused by 2be143ebb5246bb2f9b674bb09d23df5b2b6c504

After 2be143ebb5246bb2f9b674bb09d23df5b2b6c504, if user opts to spell
a word him/herself instead of using the suggested word list, the
result is incorrect. The existing preedit string is committed,
then cursor is moved to the beginning and user written word is
added. E.g. user writes 'tadaa' then selects to spell it again and
writes 'radar', in editor there is 'radartadaa'.

Regression is caused due to storing the cursor pointer even in cases
where there is no stored preedit string.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
10 years agoAdd the ability to enable various SSL bug workarounds.
Richard Moore [Wed, 19 Oct 2011 09:40:57 +0000 (11:40 +0200)]
Add the ability to enable various SSL bug workarounds.

There are lots of buggy SSL servers around and to connect to them you
need to disable various features. This commit adds the ability to
disable the SSL ticket extension, the ability to disable the insertion
of empty fragments, and the ability to disable compression.

Task-number: QTBUG-21906

Change-Id: I3e1d0347a46e9030b889bbf15b2aad19b8513b73
Merge-request: 68
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
(cherry picked from commit 78d02e93aca5325fc5be9bfd275862795207abaa)

(commit was cherry-picked from Qt 5 to 4.8 after agreeing with the
author because the merge request was filed against Qt 5.)

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
  Fix security issue on website due to bad JS.

10 years agoMerge remote-tracking branch 'mainline/4.8'
Casper van Donderen [Fri, 21 Oct 2011 10:23:24 +0000 (12:23 +0200)]
Merge remote-tracking branch 'mainline/4.8'

10 years agoFix security issue on website due to bad JS.
Casper van Donderen [Fri, 21 Oct 2011 10:18:54 +0000 (12:18 +0200)]
Fix security issue on website due to bad JS.

Reviewed-by: Trust Me
10 years agoFix security problem on webpage due to bad JS
Casper van Donderen [Fri, 21 Oct 2011 10:14:58 +0000 (12:14 +0200)]
Fix security problem on webpage due to bad JS

Reviewed-by: Trust Me
10 years agoAccepting predicted text using hardware keyboard replaces unwanted part
Sami Merila [Thu, 20 Oct 2011 13:46:12 +0000 (16:46 +0300)]
Accepting predicted text using hardware keyboard replaces unwanted part

Current implementation of Symbian input context assumes that predicted
word replacement happens so that the original typed text is at the end
of the surrounded text. The logic fails, if to-be-predicted text is
in the middle of, or in the beginning of another, already accepted
word.

As a fix, input context need to store the original cursor position,
when reset() was called (this happens when word selection list
appears). Input context is already storing a copy of a preedit string
in this situation.

Then, when word replacement happens, this stored cursor position is
used instead of current cursor position (the native side might
temporarily move the cursor to the end when word selection list opens
or closes) to replace the typed word with one selected from suggested
word list.

Stored cursor position is dismissed immediately after used, or
if cached preedit string is dismissed.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
10 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 21 Oct 2011 09:43:04 +0000 (19:43 +1000)]
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (40 commits)
  Doc: adding link to the Qt Quick Components for Symbian page.
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
  Workaround to VideoCore III scissor bug.
  Fix to QGLWidget crash
  Update def files
  Fix crash on exit when overriding signal handlers in states.
  Typo fix
  Add new signals to indicate GPU resource usage.
  symbian - search drives for translation files
  symbian - search drives for translation files
  Cannot flick to the end of a horizontal list view width LayoutMirroring
  Backport more imports directory caching changes.
  Symbian - fix deleteLater not working from RunL
  Doc updates to installation, platform notes and symbian introduction.
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering
  Fix more test DEPLOYMENT statements for Symbian
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  Fix deployment for declarative tests, examples on Symbian
  symbian - add support for ELangKazakh and ELangEnglish_India
  ...

10 years agoDoc: adding link to the Qt Quick Components for Symbian page.
Jerome Pasion [Wed, 19 Oct 2011 08:43:24 +0000 (10:43 +0200)]
Doc: adding link to the Qt Quick Components for Symbian page.

Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
10 years agoFix performance regression on Mac OS X when creating/destroying QMutex
Bradley T. Hughes [Fri, 21 Oct 2011 07:59:54 +0000 (09:59 +0200)]
Fix performance regression on Mac OS X when creating/destroying QMutex

This reverts commit cf17b743d2fe84ab259b7232ab07b58a1872e18e, which
changed QMutex to use a Mach semaphore_t on Mac OS X. We now use
pthread_mutex_t on Mac OS X as well. Contention performance is mostly
unchanged, but the new constructionQMutex() benchmark added in this
commit shows that creating/destroying a semaphore_t is about 20 times
slower than pthread_mutex_t.

Reviewed-by: Olivier Goffart
Reviewed-by: João Abecasis
10 years agoMerge remote-tracking branch 'qt-fire-review/master'
aavit [Fri, 21 Oct 2011 07:59:50 +0000 (09:59 +0200)]
Merge remote-tracking branch 'qt-fire-review/master'

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Thu, 20 Oct 2011 23:00:13 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 20 Oct 2011 13:57:37 +0000 (23:57 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Accepting predicted text using hardware keyboard replaces unwanted part

10 years agoAccepting predicted text using hardware keyboard replaces unwanted part
Sami Merila [Thu, 20 Oct 2011 13:46:12 +0000 (16:46 +0300)]
Accepting predicted text using hardware keyboard replaces unwanted part

Current implementation of Symbian input context assumes that predicted
word replacement happens so that the original typed text is at the end
of the surrounded text. The logic fails, if to-be-predicted text is
in the middle of, or in the beginning of another, already accepted
word.

As a fix, input context need to store the original cursor position,
when reset() was called (this happens when word selection list
appears). Input context is already storing a copy of a preedit string
in this situation.

Then, when word replacement happens, this stored cursor position is
used instead of current cursor position (the native side might
temporarily move the cursor to the end when word selection list opens
or closes) to replace the typed word with one selected from suggested
word list.

Stored cursor position is dismissed immediately after used, or
if cached preedit string is dismissed.

Task-number: QTBUG-22147
Reviewed-by: Miikka Heikkinen
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 20 Oct 2011 11:15:12 +0000 (21:15 +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 Linuxification building case changes

10 years agoSymbian Linuxification building case changes
Pasi Pentikainen [Wed, 19 Oct 2011 16:14:28 +0000 (19:14 +0300)]
Symbian Linuxification building case changes

Changes the libraries to match the case of files for building
Symbian in linux.

Reviewed-by: Miikka Heikkinen
10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Thu, 20 Oct 2011 08:50:15 +0000 (18:50 +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:
  Symbian - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 20 Oct 2011 00:36:47 +0000 (10:36 +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: (116 commits)
  Update Japanese translations.
  Updated Russian translation
  Update Korean translations to 4.8
  qmake: fix writing of incremental linker option for vcxproj files
  support the obj-c #import statement in the dependency generator
  runonphone timestamps nanosecond formating set to 9 chars, 0 padded
  Put Qt translation files to rom on Symbian.
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8
  Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
  Fixes: libpng symbols exported from QtGui.dll on Windows
  Converting from double to qreal in gui
  Doc updates to installation, platform notes and symbian introduction.
  Fix XML schema validation failure.
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate
  Fix construction races in QtNetwork
  Removing accidental use of double instead of qreal from QLine
  Fix incorrect QFileInfo permissions on windows
  ...

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Thu, 20 Oct 2011 00:25:56 +0000 (10:25 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (110 commits)
  Doc: adding link to the Qt Quick Components for Symbian page.
  Update Japanese translations.
  Updated Russian translation
  Update Korean translations to 4.8
  qmake: fix writing of incremental linker option for vcxproj files
  support the obj-c #import statement in the dependency generator
  runonphone timestamps nanosecond formating set to 9 chars, 0 padded
  Put Qt translation files to rom on Symbian.
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8
  Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
  Fixes: libpng symbols exported from QtGui.dll on Windows
  Converting from double to qreal in gui
  Doc updates to installation, platform notes and symbian introduction.
  Fix XML schema validation failure.
  omit unassigned (and too recent codepoints) from the text Normalization process
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate
  Fix construction races in QtNetwork
  ...

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 20 Oct 2011 00:25:45 +0000 (10:25 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Fix FTP example to handle failure to open network session
  Use QBasicAtomicInt as a static variable

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 19 Oct 2011 19:46:33 +0000 (05:46 +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:
  Workaround to VideoCore III scissor bug.

10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 19 Oct 2011 16:03:14 +0000 (02:03 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4

10 years agoFix FTP example to handle failure to open network session
Shane Kearns [Wed, 19 Oct 2011 13:00:28 +0000 (14:00 +0100)]
Fix FTP example to handle failure to open network session

The example code only dealt with successful opening of the session.
If the session open failed, the application is stuck because the
connect button is disabled.
Moved the session open to be part of connection.
Handled session open failure by puttin the UI back in the default
state where connection button is enabled.

Task-Number: QTBUG-9909
Reviewed-By: Miikka Heikkinen
10 years agoFixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
aavit [Wed, 19 Oct 2011 12:02:24 +0000 (14:02 +0200)]
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4

The PNG Development Group explains that libpng 1.5.4 (only) introduced
a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes
(denial of service) for certain malformed PNGs.
Ref. http://www.libpng.org/pub/png/libpng.html

This commit contains the patch recommended by the PNG Development
Group, ref. http://www.kb.cert.org/vuls/id/477046

Task-number: QTBUG-22168

(cherry picked from commit 55c2ea18c522bd8700f43884124e02b460cdb5e2)

10 years agoFixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4
aavit [Wed, 19 Oct 2011 12:02:24 +0000 (14:02 +0200)]
Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4

The PNG Development Group explains that libpng 1.5.4 (only) introduced
a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes
(denial of service) for certain malformed PNGs.
Ref. http://www.libpng.org/pub/png/libpng.html

Task-number: QTBUG-22168

10 years agoUse QBasicAtomicInt as a static variable
Shane Kearns [Wed, 19 Oct 2011 10:07:40 +0000 (11:07 +0100)]
Use QBasicAtomicInt as a static variable

QAtomicInt has a constructor, so QBasicAtomicInt needs to be used
instead to allow compile time initialisation.

Task-Number: QTBUG-20343
Reviewed-By: Olivier Goffart
10 years agoWorkaround to VideoCore III scissor bug.
Jani Hautakangas [Wed, 19 Oct 2011 06:39:22 +0000 (09:39 +0300)]
Workaround to VideoCore III scissor bug.

Some versions of VideoCore III drivers seem
to pollute and use stencil buffer when using
glScissors. Workaround is to clear stencil buffer
before disabling scissoring.

Task-number: QT-5308
Reviewed-by: Samuel Rødal
10 years agoMerge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Jerome Pasion [Wed, 19 Oct 2011 08:55:43 +0000 (10:55 +0200)]
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

10 years agoDoc: adding link to the Qt Quick Components for Symbian page.
Jerome Pasion [Wed, 19 Oct 2011 08:43:24 +0000 (10:43 +0200)]
Doc: adding link to the Qt Quick Components for Symbian page.

Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 19 Oct 2011 08:02:05 +0000 (18:02 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix to QGLWidget crash

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Tue, 18 Oct 2011 23:40:13 +0000 (09:40 +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: (40 commits)
  Update Japanese translations.
  Updated Russian translation
  Update Korean translations to 4.8
  qmake: fix writing of incremental linker option for vcxproj files
  runonphone timestamps nanosecond formating set to 9 chars, 0 padded
  Put Qt translation files to rom on Symbian.
  Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian
  Converting from double to qreal in gui
  Doc updates to installation, platform notes and symbian introduction.
  Fix XML schema validation failure.
  Fix construction races in QtNetwork
  Removing accidental use of double instead of qreal from QLine
  Fix incorrect QFileInfo permissions on windows
  Converting accidental use of doubles to qreal in declarative
  Copy and Cut are not available for some QML editors
  Ignore CcpuCan calls if input context is being destroyed
  Remove one local variable from QCoeFepInputContext
  Symbian: Fix native dialog with splitscreen VKB focus loss issue
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  ...

10 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Tue, 18 Oct 2011 23:00:33 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 18 Oct 2011 18:37:25 +0000 (04:37 +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:
  FTP - fix interoperability issues with SIZE command
  QS60StyleAnimation exception safety
  Catch potential throw in ~QSymbianControl
  Fixed access to null threadData in ~QObjectPrivate
  Fix the build for makefile build system of Symbian

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Tue, 18 Oct 2011 17:20:55 +0000 (03:20 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  qmake: fix writing of incremental linker option for vcxproj files

10 years agoFTP - fix interoperability issues with SIZE command
Shane Kearns [Tue, 18 Oct 2011 15:18:06 +0000 (16:18 +0100)]
FTP - fix interoperability issues with SIZE command

Certain FTP servers refuse the SIZE command in ASCII mode (proftpd)
or refuse the SIZE command in ASCII mode for large files.
This is a security feature, as the SIZE command requires reading
the whole file and counting line ends which can cause denial of
services. In binary mode, the file size on disc is reported, which
is a relatively quick operation.

Qt had two problems here:
1. when size command fails, the total size was reported as -1,
   whereas the documentation of QFtp::dataTransferProgress states
   it should be reported as 0 (so that QProgressDialog can display
   a wait note rather than progress bar)
2. SIZE command was sent before setting the type of the transfer
   to ASCII / Binary. This is a problem as the size reported by
   the server is incorrect. Also it usually means sending ASCII
   SIZE for Binary transfers, which results in the 550 error on
   FTP servers with DOS protection.

Task-Number: QTTH-1428
Reviewed-By: Peter Hartmann
10 years agoQS60StyleAnimation exception safety
mread [Tue, 18 Oct 2011 12:59:51 +0000 (13:59 +0100)]
QS60StyleAnimation exception safety

QS60StyleAnimation had a number of exception safety problems.
- Exceptions from QS60StyleAnimation/V2 could panic a TRAP harness.
- Pointers could be uninitialised on exception in constructor.
Problems solved by switching to QScopedPointer and simplifying the code.

Task-number: QTBUG-4871 incidental finding
Reviewed-by: Sami Merila
10 years agoCatch potential throw in ~QSymbianControl
mread [Tue, 18 Oct 2011 12:51:56 +0000 (13:51 +0100)]
Catch potential throw in ~QSymbianControl

The call to topData() in ~QSymbianControl can create the required
object if it does not already exist. This can then throw an exception
if it fails, which is not allowed to escape the destructor. So it is
caught and ignored.

Task-number: QTBUG-4871 incidental finding
Reviewed-by: Shane Kearns
10 years agoFixed access to null threadData in ~QObjectPrivate
mread [Tue, 18 Oct 2011 12:45:28 +0000 (13:45 +0100)]
Fixed access to null threadData in ~QObjectPrivate

If a class derived from QObjectPrivate throws an exception in its
constructor, ~QObjectPrivate will be invoked with threadData being
null. This change tests for null before accessing threadData.

Task-number: QTBUG-4871 incidental finding
Reviewed-by: Shane Kearns
10 years agoFix the build for makefile build system of Symbian
Liang Qi [Tue, 18 Oct 2011 12:32:43 +0000 (14:32 +0200)]
Fix the build for makefile build system of Symbian

All includes for private headers should have private directory info.

Reviewed-by: Shane Kearns
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 18 Oct 2011 12:34:52 +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:
  Symbian - fix compile error when default configured

10 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 18 Oct 2011 11:33:50 +0000 (21: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:
  Update Japanese translations.
  Updated Russian translation
  Update Korean translations to 4.8

10 years agoFix to QGLWidget crash
Jani Hautakangas [Tue, 18 Oct 2011 10:04:21 +0000 (13:04 +0300)]
Fix to QGLWidget crash

QGLWidget crashed due to regression
caused by fix to QTTH-1553. Crash only
occurred if application was locked to
landscape mode but started when device
was in portrait mode.

Task-number: QTTH-1597
Reviewed-by: Laszlo Agocs
10 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Tue, 18 Oct 2011 10:08:02 +0000 (20:08 +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:
  Update def files

10 years agoSymbian - fix compile error when default configured
Shane Kearns [Mon, 17 Oct 2011 14:57:31 +0000 (15:57 +0100)]
Symbian - fix compile error when default configured

New code assumed building with OpenGL/OpenVG, which is the
production configuration, but not the default configuration

Reviewed-By: Jani Hautakangas
Task-Number: QTBUG-21996

10 years agoUpdate def files
Jani Hautakangas [Tue, 18 Oct 2011 09:52:30 +0000 (12:52 +0300)]
Update def files

Reviewed-by: TRUSTME
10 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 18 Oct 2011 06:53:40 +0000 (16:53 +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 - Change working directory of applications in ROM
  QtGui def file update
  Show SaxBookmarks as maximized in Symbian
  support the obj-c #import statement in the dependency generator
  Early construction of status pane and softkeys for Symbian boosted apps
  Maximized dialogs are incorrectly positioned after layout switch
  Doc updates to installation, platform notes and symbian introduction.
  Update 4.8.0 changelog
  Changelog: update changes-4.8.0 for Richard
  Add briefs for the new 4.8 examples.
  Add briefs to the new 4.8 demos.
  Add a brief to all demos and examples for manifest

10 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Tue, 18 Oct 2011 06:51:38 +0000 (09:51 +0300)]
Merge remote-tracking branch 'qt/4.8'