qt:qt.git
6 years agoDeactivating an inactive item should do (almost) nothing. 2706
Andreas Aardal Hanssen [Fri, 21 Oct 2011 08:12:57 +0000 (10:12 +0200)]
Deactivating an inactive item should do (almost) nothing.

The bug fixed by this task causes the last panel, which can be
any panel depending on the situation, to gain input focus when
an already-inactive item is deactivated by calling setActive(false).
This is obviously wrong.

It's also wrong that setActive(isActive()) is a noop when the
item is already inactive. It's essential that the explicit- and
wantsActive flags are set correctly, so that calling setActive(false)
on an item that's part of an inactive scene (f.ex.) hinders that
item in gaining automatic activation when the scene is activated.

Task-number: QTBUG-12966
Reviewed-by: James Perrett <jamperre@cisco.com>
6 years agoEnsure subfocus is not reset to 0 when hiding a panel. 2705
Andreas Aardal Hanssen [Fri, 21 Oct 2011 06:33:40 +0000 (08:33 +0200)]
Ensure subfocus is not reset to 0 when hiding a panel.

When hiding any widget that is not a panel, it is correct to clear
subfocus. In case clearFocus() has been called, the result is that
focusItem() / focusWidget() points to 0, which is correct. Upon
reactivation, nothing gains input focus. When changing focus, the
following setSubFocus() call will ensure subfocus points to the new
widget.

When hiding a panel, however, it's essential that subfocus within
that panel is not cleared, otherwise, when re-showing the panel,
nothing will have focus, whereas the expected behavior is that focus
is restored to the last item that had focus, i.e., the focusItem()
a.k.a. subfocus widget.

Task-number: QTBUG-22256
Reviewed-by: James PerrettĀ <jamperre@cisco.com>
6 years agoSymbian - Change working directory of applications in ROM
Shane Kearns [Mon, 17 Oct 2011 14:47:42 +0000 (15:47 +0100)]
Symbian - Change working directory of applications in ROM

Working directory (as opposed to applicationDirPath) was
on the Z drive before, change it to be the same.

Task-Number: QTBUG-22024
Reviewed-By: mread
6 years agoQtGui def file update
mread [Fri, 14 Oct 2011 12:33:17 +0000 (13:33 +0100)]
QtGui def file update

For the addition of QApplicationPrivate::symbianHandleLiteModeStartup.
Two other unfrozen functions also added.

Task-number: QT-4933
Reviewed-by: TrustMe
6 years agoEarly construction of status pane and softkeys for Symbian boosted apps
mread [Fri, 14 Oct 2011 10:12:45 +0000 (11:12 +0100)]
Early construction of status pane and softkeys for Symbian boosted apps

QtAppBooster can partially start apps and hide them in the background
before they are requested by the user. This gives an apparently faster
start for these apps.

Qt is now detecting these app starts and bringing the construction of
the status pane and softkeys forward so that they happen in the
background. This cuts their construction time off the time between the
user clicking on the app and it being ready to use. On a Nokia E7, this
gain was measured at an average of 127ms.

Task-number: QT-4933
Reviewed-by: Sami Merila
6 years agoShow SaxBookmarks as maximized in Symbian
Sami Merila [Fri, 14 Oct 2011 10:58:16 +0000 (13:58 +0300)]
Show SaxBookmarks as maximized in Symbian

Previously, SaxBookmarks was always shown as fullscreen app to allow
filedialog to show up properly(QFileDialog requires a lot screen space).
However, lately Qt for symbian was changed to use native file dialogs
as a default. Therefore, the example app can nowadays shown as
maximized.

Task-number: QTBUG-21776
Reviewed-by: TrustMe
6 years agoMaximized dialogs are incorrectly positioned after layout switch
Sami Merila [Fri, 14 Oct 2011 09:56:53 +0000 (12:56 +0300)]
Maximized dialogs are incorrectly positioned after layout switch

The native side seems to return StaCon pane height as zero in Belle.
If no StaCon pane height is available, try to fetch Status Pane height
and use that one.

Task-number: QTBUG-22022
Reviewed-by: Miikka Heikkinen
6 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

6 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

6 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Mon, 17 Oct 2011 16:43:15 +0000 (02:43 +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 updates to installation, platform notes and symbian introduction.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
Qt Continuous Integration System [Mon, 17 Oct 2011 10:44:30 +0000 (20:44 +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: (35 commits)
  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
  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
  runonphone - Implement CODA autodetection
  Symbian: Parse ts filenames case-insensitively for localize_deployment
  Do not crash in copy() of pixmaps without an underlying bitmap
  QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8
  symbian - document behaviour of QFile::handle()
  ...

6 years agoUpdate Japanese translations.
Takumi ASAKI [Mon, 17 Oct 2011 09:47:36 +0000 (11:47 +0200)]
Update Japanese translations.

Merge-request: 2700
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoUpdated Russian translation
Sergey Belyashov [Mon, 17 Oct 2011 09:36:15 +0000 (11:36 +0200)]
Updated Russian translation

Merge-request: 1417
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoUpdate Korean translations to 4.8
Park Shinjo [Mon, 17 Oct 2011 09:32:27 +0000 (11:32 +0200)]
Update Korean translations to 4.8

Merge-request: 1416
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 14 Oct 2011 21:35:55 +0000 (07:35 +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:
  support the obj-c #import statement in the dependency generator

6 years agoqmake: fix writing of incremental linker option for vcxproj files
Joerg Bornemann [Fri, 14 Oct 2011 15:18:31 +0000 (17:18 +0200)]
qmake: fix writing of incremental linker option for vcxproj files

6 years agosupport the obj-c #import statement in the dependency generator
Oswald Buddenhagen [Fri, 14 Oct 2011 10:55:28 +0000 (12:55 +0200)]
support the obj-c #import statement in the dependency generator

Task-number: QTBUG-21965
Reviewed-by: joerg
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 14 Oct 2011 09:33:32 +0000 (19:33 +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 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

6 years agoMerge remote-tracking branch 'qt-doc-review/master'
Casper van Donderen [Fri, 14 Oct 2011 09:29:10 +0000 (11:29 +0200)]
Merge remote-tracking branch 'qt-doc-review/master'

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Fri, 14 Oct 2011 06:19:34 +0000 (16:19 +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: (69 commits)
  runonphone timestamps nanosecond formating set to 9 chars, 0 padded
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8
  Fixes: libpng symbols exported from QtGui.dll on Windows
  omit unassigned (and too recent codepoints) from the text Normalization process
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate
  Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
  Ukrainian translation updated
  QHostInfo: fix a race condition under CE
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering
  Build fix for WINCE to qfilesystemengine_win.cpp
  Fixed typo in QSettings documentation.
  Doc updates to "Installing Qt for the Symbian Platform" page.
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  Added Qt Quick Components link to document
  remove dead code
  Added text about -random and -seed options in QTest to changelog
  ...

6 years agoMerge remote-tracking branch 'qt/4.8'
Sami Lempinen [Fri, 14 Oct 2011 06:18:15 +0000 (09:18 +0300)]
Merge remote-tracking branch 'qt/4.8'

6 years agorunonphone timestamps nanosecond formating set to 9 chars, 0 padded
mread [Thu, 13 Oct 2011 13:54:45 +0000 (14:54 +0100)]
runonphone timestamps nanosecond formating set to 9 chars, 0 padded

runonphone was dropping leading zeros after the decimal point in its
timestamp formating. For example [123.000456789] was printed as
[123.456789], which is quite a different number.

The formatting now pads the nanoseconds component with leading zeros to
9 characters. Timestamps are now always displayed with a 9 character
nanoseconds component, with leading and trailing zeros as appropriate.
For example:
[1897.070556640] [Qt Message] QEglContext::swapBuffers

Reviewed-by: Shane Kearns
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 13 Oct 2011 09:58:54 +0000 (19:58 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Add -nn for .cpp MOC preprocessing for INTEGRITY
  Remove commented out code.
  Update Polish translations for 4.8

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 13 Oct 2011 09:20:34 +0000 (19: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:
  Put Qt translation files to rom on Symbian.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Thu, 13 Oct 2011 08:10:19 +0000 (18:10 +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: (213 commits)
  Doc updates to Qt for Symbian installation instructions and platform notes.
  Doc updates to platform notes document.
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Doc updates to platform notes of Qt 4.8 doc.
  Disabled activeqt/webbrowser example from mingw build.
  Don't store the alignment attribute for spacers
  Doc updates to Qt 4.8 platform notes documentation.
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Improve sbsv2 whatlog support.
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Update changes-4.8.0 file
  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.
  ...

6 years agoPut Qt translation files to rom on Symbian.
Pasi Pentikainen [Tue, 27 Sep 2011 14:14:11 +0000 (17:14 +0300)]
Put Qt translation files to rom on Symbian.

Task-Number: QTBUG-4919
Reviewed-by: Honglei Zhang
6 years agoAdd -nn for .cpp MOC preprocessing for INTEGRITY
Rolland Dudemaine [Wed, 12 Oct 2011 18:38:10 +0000 (20:38 +0200)]
Add -nn for .cpp MOC preprocessing for INTEGRITY

qmake generates .gpj project files for INTEGRITY.
Calls to moc on headers or code that do not produce actual output cause
a Note to be generated. This is considered as an error during build by
the Green Hills gbuild build tool.
-nn can be added to not generate that note when no output is generated.
This was already done for headers in util/integrity/qt.bod, but it was
not there yet for .cpp files.

Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoRemove commented out code.
Rolland Dudemaine [Wed, 12 Oct 2011 18:38:09 +0000 (20:38 +0200)]
Remove commented out code.

Merge-request: 2693
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoUpdate Polish translations for 4.8
Jarek Kobus [Wed, 12 Oct 2011 09:17:01 +0000 (11:17 +0200)]
Update Polish translations for 4.8

6 years agoMerge branch 4.7 into qt-4.8-from-4.7
Qt Continuous Integration System [Mon, 10 Oct 2011 16:06:23 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-4.8-from-4.7

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 10 Oct 2011 14:22:08 +0000 (00:22 +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 QDeclarativeEngine::setOfflineStoragePath() for Symbian
  Converting from double to qreal in gui

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Mon, 10 Oct 2011 13:38:02 +0000 (23:38 +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: libpng symbols exported from QtGui.dll on Windows
  omit unassigned (and too recent codepoints) from the text Normalization process
  Fixed broken window surface flush when depth is 24 and bpp is not 32.

6 years agoFix QDeclarativeEngine::setOfflineStoragePath() for Symbian
Miikka Heikkinen [Mon, 10 Oct 2011 13:29:23 +0000 (16:29 +0300)]
Fix QDeclarativeEngine::setOfflineStoragePath() for Symbian

In Symbian, the sqlite database doesn't like mixing native and Qt
separators in the database name, so ensure only native separators are
used when declarative sets the database name.

Task-number: QTBUG-20836
Reviewed-by: Sami Merila
6 years agoMerge remote-tracking branch 'qt-fire-review/master'
aavit [Mon, 10 Oct 2011 12:48:26 +0000 (14:48 +0200)]
Merge remote-tracking branch 'qt-fire-review/master'

6 years agoFixes: libpng symbols exported from QtGui.dll on Windows
aavit [Mon, 10 Oct 2011 12:22:17 +0000 (14:22 +0200)]
Fixes: libpng symbols exported from QtGui.dll on Windows

The upgrade of the bundled libpng to version 1.5 had the side effect
of causing the png functions to be exported from the QtGUi DLL
when built with the MS Visual C++ compiler.

Task-number: QTBUG-21455
Reviewed-by: Kim
6 years agoConverting from double to qreal in gui
mread [Mon, 10 Oct 2011 11:58:12 +0000 (12:58 +0100)]
Converting from double to qreal in gui

There were a number of places in QtGui where doubles were used in
expressions due to the use of floating point constants in the
code. Many of these constants are now constructed as qreal, removing
the use of double operations where unneeded.

These changes have been limited to constants that have exactly the same
value whether double or float, to ensure that precision errors are not
introduced.

This should not affect any of the desktop platforms where qreal is
double. On Symbian, where qreal is float, appropriate autotests have
been run.

Task-number: QTBUG-4894
Reviewed-by: Sami Merila
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 10 Oct 2011 11:50:43 +0000 (21:50 +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:
  Doc updates to installation, platform notes and symbian introduction.

6 years agoDoc updates to installation, platform notes and symbian introduction.
Eero Hyyti [Mon, 10 Oct 2011 11:12:52 +0000 (14:12 +0300)]
Doc updates to installation, platform notes and symbian introduction.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 10 Oct 2011 07:35:05 +0000 (17:35 +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 XML schema validation failure.

6 years agoFix XML schema validation failure.
Juha Kukkonen [Mon, 10 Oct 2011 05:36:14 +0000 (08:36 +0300)]
Fix XML schema validation failure.

Checking constraining facets for double failed if enumeration
restriction had values INF or NaN.

There were two issues that caused validation to fail:
- wrong conversion function was used when constraining facets for
 double are checked, which caused values to be in lower case
- case when both restriction and default value are NaN was not
 handled correctly

Task-number: QTBUG-21375
Reviewed-by: Honglei Zhang
6 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, 7 Oct 2011 12:51:54 +0000 (22:51 +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:
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  symbian - add support for ELangKazakh and ELangEnglish_India
  QAuthenticator::setUser() parse user name in form user@domain
  A patch for 'Fix to QtOpenGL crash'
  Update Korean Translations
  Document updates to Qt for Symbian installation instructions and platform notes.
  Always recreate backing store when TLW transparency changes
  Crash in QDeclarativeCompiler::indexOfProperty
  Fix to QtOpenGL crash
  Incorrect 'break' in switch-case was replaced by 'return'
  QLineControl: selectedTextChanged() signal is omitted in some cases
  QML import path puts Qt dirs in correct Symbian order
  Avoid runtime warning about interlace handling from libpng 1.5
  symbian bearer: fix tst_qnetworksession test failures
  Refactor dangerous multiple inheritance
  Fix RConnection handle leak in symbian bearer plugin
  Prevent crash when cache is changed on the fly
  Add missing checks for httpReply in QNetworkHttpBackend.

6 years agoMerge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Liang Qi [Fri, 7 Oct 2011 12:21:59 +0000 (14:21 +0200)]
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/getting-started/installation.qdoc
doc/src/platforms/platform-notes.qdoc
src/corelib/tools/qlocale_symbian.cpp
src/gui/kernel/qwidget_p.h
src/network/access/qnetworkaccesshttpbackend.cpp
src/opengl/qgl.cpp
src/plugins/bearer/symbian/qnetworksession_impl.cpp

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 7 Oct 2011 12:07:42 +0000 (22:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
  omit unassigned (and too recent codepoints) from the text Normalization process
  Fixed broken window surface flush when depth is 24 and bpp is not 32.

6 years agoomit unassigned (and too recent codepoints) from the text Normalization process
Konstantin Ritt [Fri, 7 Oct 2011 11:56:35 +0000 (13:56 +0200)]
omit unassigned (and too recent codepoints) from the text Normalization process

> handle any code points that were not defined in the earlier version
> as if they were unassigned: such code points will not decompose or compose,
> and their Canonical_Combining_Class value will be zero.
see http://www.unicode.org/reports/tr15/#Guaranteeing_Process_Stability for details

we should respect that the QChar::Unicode_Unassigned == 0
and thus less than any other QChar::UnicodeVersion value

Merge-request: 952
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 7 Oct 2011 05:53:25 +0000 (15:53 +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:
  purge "Translation Rules for Plurals"
  add -list-languages option to lupdate

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Fri, 7 Oct 2011 00:13:18 +0000 (10:13 +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 "Installing Qt for the Symbian Platform" page.

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 6 Oct 2011 19:18:44 +0000 (05:18 +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 construction races in QtNetwork
  Removing accidental use of double instead of qreal from QLine

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Thu, 6 Oct 2011 18:28:42 +0000 (04:28 +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:
  Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
  QHostInfo: fix a race condition under CE

6 years agopurge "Translation Rules for Plurals"
Oswald Buddenhagen [Thu, 6 Oct 2011 17:08:39 +0000 (19:08 +0200)]
purge "Translation Rules for Plurals"

the page had only exemplary character and was thus utterly incomplete.
document the new "lupdate -list-languages" instead.

6 years agoadd -list-languages option to lupdate
Oswald Buddenhagen [Thu, 6 Oct 2011 14:56:16 +0000 (16:56 +0200)]
add -list-languages option to lupdate

6 years agoFix construction races in QtNetwork
Shane Kearns [Thu, 6 Oct 2011 14:40:34 +0000 (15:40 +0100)]
Fix construction races in QtNetwork

When two threads construct a QNetworkAccessManager at exactly the
same time on an SMP system, there are construction races for some
Q_GLOBAL_STATIC data. This is normal and expected - the losing
thread deletes its instance as part of the Q_GLOBAL_STATIC macro.

However, for two of the classes, destruction of the loser had
side effects. For QNetworkConfigurationMangerPrivate, there was
a crash because of uninitialised variable on the losing side.

For QNetworkAccessBackendFactoryData, a guard mechanism intended
to prevent the data being reconstructed by destructors of other
global static classes was being set by the loser.
To fix this, the bool is changed to a QAtomicInt. In the normal
case, it will have value 0->1 on startup and 1->0 on shutdown.
In the race case, it will have values 0->1->2->1 on startup and
1->0 on shutdown.

Task-Number: QTBUG-20343
Reviewed-By: mread
6 years agoRemoving accidental use of double instead of qreal from QLine
mread [Thu, 6 Oct 2011 14:07:29 +0000 (15:07 +0100)]
Removing accidental use of double instead of qreal from QLine

QLine contained a number of places where conversions and calculations
were done as double where qreal should have been used instead. This
is caused by the use of raw floating point literals. The fix is to
construct the literals as qreal. The angle conversions are simplified
to reduce the risk of a growing loss of precision from this change.

On Symbian, where qreal is float, this gives a 5-10% performance
improvement to the affected functions, as tested by a new benchmark
test. The auto tests pass, these contain precision tests which indicates
that there is no significant loss of precision with this change.

On Windows, where qreal is double, this has no significant effect on
performance.

Task-number: QTBUG-4894
Reviewed-by: Shane Kearns
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Thu, 6 Oct 2011 13:13:06 +0000 (23: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:
  Fix incorrect QFileInfo permissions on windows

6 years agoFix incorrect QFileInfo permissions on windows
Shane Kearns [Thu, 6 Oct 2011 12:46:30 +0000 (13:46 +0100)]
Fix incorrect QFileInfo permissions on windows

Requesting the write permission marked the read permission as known
without having retrieved it. A subsequent request for read permission
would return false.

Task-Number: QTBUG-20714
Reviewed-By: mread
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 12:48:34 +0000 (22:48 +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:
  Ukrainian translation updated

6 years agoFix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
miniak [Thu, 6 Oct 2011 10:42:17 +0000 (12:42 +0200)]
Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)

Merge-request: 1272
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
6 years agoUkrainian translation updated
Victor Ostashevsky [Thu, 6 Oct 2011 10:22:12 +0000 (12:22 +0200)]
Ukrainian translation updated

Merge-request: 1415
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoQHostInfo: fix a race condition under CE
Konstantin Ritt [Thu, 6 Oct 2011 10:09:14 +0000 (12:09 +0200)]
QHostInfo: fix a race condition under CE

Merge-request: 1339
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 06:13:29 +0000 (16:13 +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:
  Do not let QGLContext get out of sync when doing mixed VG-GL rendering

6 years agoDo not let QGLContext get out of sync when doing mixed VG-GL rendering
Laszlo Agocs [Thu, 6 Oct 2011 05:26:48 +0000 (08:26 +0300)]
Do not let QGLContext get out of sync when doing mixed VG-GL rendering

The default graphics system is openvg, this means that apps using
QGLWidget (despite the official recommendation), without explicitly
setting opengl as the graphics system will use both the openvg and
opengl modules to perform rendering. This presents some problems
because QtOpenGL's comes with its own wrapper over QEglContext,
and making a foreign QEglContext (e.g. from VG) current will cause
its state to get out of sync, resulting in various drawing issues
due to skipped makeCurrent and similar calls.

The patch works this around by querying the current context from
EGL in QGLContext::currentContext() and returning null if the
EGLContext does not match. This somewhat ugly workaround ensures
that at least QGLContext::currentContext() will not lie: It will
not return a valid pointer when the underlying QEglContext's
underlying EGLContext is not actually the current context. This
will allow e.g. QGLPaintDevice::beginPaint to correctly recognize
the need for making the GL widget's context current and thus
avoid various rendering issues in certain games.

Task-number: QTTH-1553
Reviewed-by: Jani Hautakangas
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 6 Oct 2011 01:11:41 +0000 (11:11 +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:
  Build fix for WINCE to qfilesystemengine_win.cpp
  Fixed typo in QSettings documentation.
  remove dead code

6 years agoBuild fix for WINCE to qfilesystemengine_win.cpp
jaanttil [Wed, 5 Oct 2011 19:28:19 +0000 (21:28 +0200)]
Build fix for WINCE to qfilesystemengine_win.cpp

Merge-request: 2662
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoFixed typo in QSettings documentation.
Sam Protsenko [Wed, 5 Oct 2011 17:42:21 +0000 (19:42 +0200)]
Fixed typo in QSettings documentation.

Merge-request: 1411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 5 Oct 2011 16:23:20 +0000 (02:23 +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:
  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

6 years agoConverting accidental use of doubles to qreal in declarative
mread [Wed, 5 Oct 2011 15:40:26 +0000 (16:40 +0100)]
Converting accidental use of doubles to qreal in declarative

Declarative had a number of places where double operations were used
instead of qreal, due to the use of double literals. These are now
constructed as qreal literals so that qreal operations are used.

This makes no difference where qreal is double. But on Symbian, qreal
is float, and this give a performance boost for floating point intensive
code.

Task-number: QTBUG-4894
Reviewed-by: Martin Jones
6 years agoCopy and Cut are not available for some QML editors
Sami Merila [Wed, 5 Oct 2011 12:06:31 +0000 (15:06 +0300)]
Copy and Cut are not available for some QML editors

Copy and Cut actions do not appear in fullscreen VKB menu when a QML
TextEdit or TextInput element is focused and has selected text.
This happens because input method queries for cursor and anchor
position in QCoeFepInputContext::CcpuCanCut() return zero in this case.
It is probably related to focus changes when the options menu pops up.

When menu pops up from native keyboard, window containing the QML
elements is set as non-active, therefore it loses focus widget, which
in turn causes queries about cursor and anchor positions to return zero.

As a workaround, when there is no microfocus available, ask the
"selectedText" property directly from QML elements.

Task-number: QTBUG-21568
Reviewed-by: Miikka Heikkinen
6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Wed, 5 Oct 2011 11:21:23 +0000 (21:21 +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:
  Remove one local variable from QCoeFepInputContext

6 years agoIgnore CcpuCan calls if input context is being destroyed
Sami Merila [Wed, 5 Oct 2011 11:14:50 +0000 (14:14 +0300)]
Ignore CcpuCan calls if input context is being destroyed

If input context is being destroyed while its ability to paste/copy/cut is
inquired from native side, just return false. This makes application exit
somewhat faster.

Reviewed-by: Miikka Heikkinen
6 years agoRemove one local variable from QCoeFepInputContext
Sami Merila [Wed, 5 Oct 2011 11:08:42 +0000 (14:08 +0300)]
Remove one local variable from QCoeFepInputContext

Remove hasText variable as it is not used anywhere.

Reviewed-by: Miikka Heikkinen
6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 5 Oct 2011 09:43:18 +0000 (19:43 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication

6 years agoDoc updates to "Installing Qt for the Symbian Platform" page.
Eero Hyyti [Wed, 5 Oct 2011 09:29:53 +0000 (12:29 +0300)]
Doc updates to "Installing Qt for the Symbian Platform" page.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 4 Oct 2011 20:19:05 +0000 (06:19 +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:
  Added Qt Quick Components link to document

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 4 Oct 2011 17:44:12 +0000 (03:44 +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 native dialog with splitscreen VKB focus loss issue

6 years agoCreate auto test for http HEAD request
Shane Kearns [Mon, 3 Oct 2011 15:29:43 +0000 (16:29 +0100)]
Create auto test for http HEAD request

This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
6 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
6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 4 Oct 2011 13:53:37 +0000 (23:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  add integrity gbuild to the project file for convenience
  don't build activeqt examples on mingw
  QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
  Updated Russian translation
  Ukrainian translation updated for 4.8
  retreving -> retrieving
  Removed duplicate Spectrum Analyzer entry from demos doc page.
  Removed obsolete QWS_ALPHA_CURSOR feature.
  Removed duplicate link from QFinalState documentation.
  Clarified keypad navigation specific event documentation.
  docs: Typo and link fixes.
  Use the right callback in QObject::disconnect()

6 years agoSymbian: Fix native dialog with splitscreen VKB focus loss issue
Miikka Heikkinen [Tue, 4 Oct 2011 12:16:00 +0000 (15:16 +0300)]
Symbian: Fix native dialog with splitscreen VKB focus loss issue

If a native input dialog that utilized splitscreen VKB was opened while
focus was on QML TextEdit element, the focus would not be restored to
QML TextEdit element after native dialog was closed. This happened
because the KSplitViewCloseEvent came after FocusChanged, as the focus
changes are ignored while splitview VKB is open.

Task-number: QTBUG-21733
Reviewed-by: Sami Merila
6 years agoAdded Qt Quick Components link to document
Eero Hyyti [Tue, 4 Oct 2011 12:29:57 +0000 (15:29 +0300)]
Added Qt Quick Components link to document

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Tue, 4 Oct 2011 12:25:09 +0000 (22: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:
  Create auto test for http HEAD request
  QNAM - fix poor performance of HEAD request with authentication
  runonphone - Implement CODA autodetection

6 years agoCreate auto test for http HEAD request
Shane Kearns [Mon, 3 Oct 2011 15:29:43 +0000 (16:29 +0100)]
Create auto test for http HEAD request

This is in order to have a regression test for QT-5304.
However the test is also checking basic functionality of head
requests too.

Task-Number: QT-5304
Reviewed-By: Martin Petersson
6 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
6 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
6 years agoremove dead code
Oswald Buddenhagen [Tue, 4 Oct 2011 09:30:37 +0000 (11:30 +0200)]
remove dead code

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Tue, 4 Oct 2011 08:25:11 +0000 (18:25 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QDeclarativeDebug: Fix autotest breakage in qdeclarativedebugjs
  Fix assert
  Compile fix for Symbian
  Debugger: Fix autotest breakage
  Debugger: Rename qdeclarativedebug* to qdeclarativeenginedebug*
  Rename QDeclarativeEngineDebugServer to ~Service
  Fix aliasing bug when compiled with gcc 4.6
  Debugger: Move QT_DECLARATIVE_DEBUG handling out of qdeclarative.h
  FocusScope's focusItem must always be a descendent
  QDeclarativeDebugJs: Disable unstable autotest
  Add qdeclarativedebugjs autotests to declarative.pro
  tests: Use CONFIG option instead of QDeclarativeDebugHelper class

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 4 Oct 2011 02:06:31 +0000 (12:06 +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:
  QNetworkRequest autotest: adapt to new cookie parsing (re. commas)
  Remove support for multiple cookies in one Set-Cookie header to follow RFC6265.

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr... v4.8.0-rc1
Qt Continuous Integration System [Mon, 3 Oct 2011 15:05:20 +0000 (01:05 +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 QFontEngineFT

6 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
Qt Continuous Integration System [Mon, 3 Oct 2011 12:21:30 +0000 (22:21 +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: (28 commits)
  Symbian: Parse ts filenames case-insensitively for localize_deployment
  Do not crash in copy() of pixmaps without an underlying bitmap
  QTBUG-9113 - reinstating tst_qobjectrace tests for Symbian on Qt 4.8
  Doc updates to Qt for Symbian installation instructions and platform notes.
  Doc updates to platform notes document.
  Fix accessible menu not returning child name.
  Fix broken qglthreads autotest build on Solaris.
  Doc updates to platform notes of Qt 4.8 doc.
  Disabled activeqt/webbrowser example from mingw build.
  Don't store the alignment attribute for spacers
  Doc updates to Qt 4.8 platform notes documentation.
  Update changelog for Qt-4.8.0: add QtWebKit notes
  Update changelog for Qt 4.8
  Fix broken Solaris build (getpwnam_r usage)
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Update changes-4.8.0 file
  Only limit cursor position when line is wrapped
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)
  Update changelog for Qt 4.8
  ...

6 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'

6 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 3 Oct 2011 09:22:58 +0000 (19:22 +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:
  Added text about -random and -seed options in QTest to changelog
  Add another part of the source code to the snippet.
  Update changes-4.8.0
  Update translation sources.
  Update the changelog for qdoc in 4.8

6 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Mon, 3 Oct 2011 06:02:23 +0000 (16: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:
  symbian - add support for ELangKazakh and ELangEnglish_India

6 years agoAdded text about -random and -seed options in QTest to changelog
Magne Zachrisen [Fri, 30 Sep 2011 12:30:18 +0000 (14:30 +0200)]
Added text about -random and -seed options in QTest to changelog

6 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
6 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
6 years agoMerge remote-tracking branch 'mainline/4.8'
Casper van Donderen [Fri, 30 Sep 2011 08:55:26 +0000 (10:55 +0200)]
Merge remote-tracking branch 'mainline/4.8'

6 years agoAdd another part of the source code to the snippet.
Casper van Donderen [Fri, 30 Sep 2011 07:56:46 +0000 (09:56 +0200)]
Add another part of the source code to the snippet.

Fixes: QTBUG-21765

6 years agoadd integrity gbuild to the project file for convenience
Oswald Buddenhagen [Thu, 29 Sep 2011 19:19:51 +0000 (21:19 +0200)]
add integrity gbuild to the project file for convenience

6 years agodon't build activeqt examples on mingw
Oswald Buddenhagen [Thu, 29 Sep 2011 16:09:08 +0000 (18:09 +0200)]
don't build activeqt examples on mingw

amends 0c70be512bfc40e8a2a09f60a66b7ecb114e748e

6 years agoQNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.
shkim [Thu, 29 Sep 2011 14:14:05 +0000 (16:14 +0200)]
QNetworkAccessBackend::start() is used although QT_NO_BEARERMANAGEMENT is defined.

Merge-request: 2690
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoUpdated Russian translation
Sergey Belyashov [Thu, 29 Sep 2011 14:09:01 +0000 (16:09 +0200)]
Updated Russian translation

Merge-request: 1406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 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