qt:qt.git
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 06:26:28 +0000 (16:26 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  add 4.8 changes created/merged by me
  Update changelog for Qt 4.8.0

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 20 Sep 2011 00:33:38 +0000 (10:33 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed automatic plugin path resolving for predefined Qt plugins.
  Resolve a number of compilation issues with INTEGRITY
  Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE

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

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

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

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

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

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

11 years agoResolve a number of compilation issues with INTEGRITY
Rolland Dudemaine [Mon, 19 Sep 2011 15:03:22 +0000 (17:03 +0200)]
Resolve a number of compilation issues with INTEGRITY

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

Merge-request: 2686
Reviewed-by: ossi
11 years agoUpdate changelog for Qt 4.8.0
Liang Qi [Mon, 19 Sep 2011 11:43:52 +0000 (13:43 +0200)]
Update changelog for Qt 4.8.0

For QtConcurrent and QUuid.

11 years agoFix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
Andy Shaw [Mon, 19 Sep 2011 08:52:32 +0000 (10:52 +0200)]
Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE

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

Task-number: QTBUG-21523
Merge-request: 1389
Reviewed-by: ossi
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
Qt Continuous Integration System [Mon, 19 Sep 2011 04:46:03 +0000 (14:46 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

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

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

Conflicts:
dist/changes-4.8.0

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sun, 18 Sep 2011 23:00:11 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Sat, 17 Sep 2011 23:00:12 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Sat, 17 Sep 2011 21:19:29 +0000 (07:19 +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:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

11 years agoMerge remote branch 'qt-mainline/4.8'
aavit [Sat, 17 Sep 2011 19:44:51 +0000 (21:44 +0200)]
Merge remote branch 'qt-mainline/4.8'

11 years agoMerge remote branch 'qt-fire-review/master'
aavit [Sat, 17 Sep 2011 19:43:55 +0000 (21:43 +0200)]
Merge remote branch 'qt-fire-review/master'

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 16 Sep 2011 23:20:17 +0000 (09:20 +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 changes file.
  wtf? .pro.user files? congrats to overriding the hook!
  Fix QNetworkReply::errorString returning an untranslated string
  runonphone: Add a missing argument for QString::arg
  StrictlyEnforceRange with snapOneItem/Row and header behavior change
  Release font engine refcount when done using it in QTextEngine
  Migrate addMarkUp function to QChar.
  update the proxy info before session is opened in QNAM by Aapo Makela
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  QSslCertificate: also check common name for blacklisted certificates
  Fix typo in header guard.
  fix doc typo
  Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
  remove obsolete define
  Fix assert error on Windows with a negative char.
  Doc: Fixed the example of an encoded URL in the class description.
  Added an additional check to workaround an issue on Windows.

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 16 Sep 2011 23:00:14 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge remote branch 'qt-fire-review/master'
aavit [Fri, 16 Sep 2011 19:39:44 +0000 (21:39 +0200)]
Merge remote branch 'qt-fire-review/master'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Fri, 16 Sep 2011 18:53:47 +0000 (04:53 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 16 Sep 2011 16:59:24 +0000 (02:59 +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:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 16 Sep 2011 15:56:19 +0000 (17:56 +0200)]
Update changelog for Qt 4.8

Change recieved from David Faure.

11 years agoQGraphicsWidget::setLayoutDirection doesn't propagate to new children
John Tapsell [Fri, 16 Sep 2011 13:41:41 +0000 (15:41 +0200)]
QGraphicsWidget::setLayoutDirection doesn't propagate to new children

Merge-request: 1360
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 16 Sep 2011 13:05:51 +0000 (15:05 +0200)]
Update changelog for Qt 4.8

Change recieved from Steffen Hansen.

11 years agoPrevent unnecessary graphics item updates when graphics effect changes.
Christophe Oosterlynck [Fri, 16 Sep 2011 13:09:03 +0000 (15:09 +0200)]
Prevent unnecessary graphics item updates when graphics effect changes.

Don't invalidate a QGraphicsItem (neither its cache) when an update is
triggered because of a QGraphicsEffect attached to it.

Autotest for QGraphicsEffect extended with 2 cache invalidation tests

Merge-request: 2681
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years agoUpdated change-log for 4.8
Christian Strømme [Fri, 16 Sep 2011 10:48:25 +0000 (12:48 +0200)]
Updated change-log for 4.8

11 years agoUpdate changes file for 4.8.0
Daniele E. Domenichelli [Thu, 15 Sep 2011 13:42:04 +0000 (14:42 +0100)]
Update changes file for 4.8.0

11 years agoMerge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into maste...
Qt Continuous Integration System [Fri, 16 Sep 2011 12:33:56 +0000 (22:33 +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:
  StrictlyEnforceRange with snapOneItem/Row and header behavior change
  Release font engine refcount when done using it in QTextEngine
  Migrate addMarkUp function to QChar.
  update the proxy info before session is opened in QNAM by Aapo Makela
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  QSslCertificate: also check common name for blacklisted certificates
  Fix typo in header guard.
  fix doc typo
  Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
  remove obsolete define
  Fix assert error on Windows with a negative char.
  Doc: Fixed the example of an encoded URL in the class description.
  Added an additional check to workaround an issue on Windows.

11 years agoUpdate changelog for Qt 4.8
Sinan Tanilkan [Fri, 16 Sep 2011 12:13:36 +0000 (14:13 +0200)]
Update changelog for Qt 4.8

Change recieved from Cédric OCHS.
https://qt.gitorious.org/qt/qt/merge_requests/1157

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Fri, 16 Sep 2011 11:18:17 +0000 (21:18 +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:
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

11 years agoUse more widely supported Unicode character representation
Jiang Jiang [Fri, 16 Sep 2011 11:03:15 +0000 (13:03 +0200)]
Use more widely supported Unicode character representation

11 years agoRelease font engine refcount when done using it in QTextEngine
Jiang Jiang [Fri, 9 Sep 2011 12:31:39 +0000 (14:31 +0200)]
Release font engine refcount when done using it in QTextEngine

5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for
font engines in QTextEngine cache, we need to decrease them when
the QTextEngine is deallocated.

Task-number: QTBUG-21222
Reviewed-by: Eskil
11 years agoMy changes for 4.8.0
Joerg Bornemann [Fri, 16 Sep 2011 10:12:54 +0000 (12:12 +0200)]
My changes for 4.8.0

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Fri, 16 Sep 2011 05:31:08 +0000 (15:31 +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:
  minor docu fixes

11 years agominor docu fixes
Konstantin Ritt [Thu, 15 Sep 2011 23:37:35 +0000 (01:37 +0200)]
minor docu fixes

Merge-request: 2646
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 15 Sep 2011 23:16:24 +0000 (09:16 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  Fix crash in compiled bindings
  Updated WebKit to 64cce10 (qtwebkit-rc1, week36)

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Thu, 15 Sep 2011 23:00:14 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 15 Sep 2011 21:55:52 +0000 (07:55 +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 changes file.
  wtf? .pro.user files? congrats to overriding the hook!
  Fix QNetworkReply::errorString returning an untranslated string
  runonphone: Add a missing argument for QString::arg

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
Qt Continuous Integration System [Thu, 15 Sep 2011 14:55:59 +0000 (00:55 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Updated WebKit to 64cce10 (qtwebkit-rc1, week36)

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 15 Sep 2011 14:10:26 +0000 (00:10 +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:
  Mingw compile error src/gui/accessible/qaccessible_win.cpp

11 years agoFix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
Kalle Viironen [Thu, 15 Sep 2011 13:56:31 +0000 (15:56 +0200)]
Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus

Any QGraphicsTextItems in those tabs which are not the first tab of
QTabWidget, cannot get focus although the tab is current tab of
QTabWidget.But the QGraphicsTextItem in the first tab of QTabWidget can
get focus. i.e. a focus frame (dotted box) appears around the
QGraphicsTextItem. Those QGraphicsTextItems which cannot get focus can
get focus only after the main window is minimized and then maximized.
i.e. After that, a focus frame appears around it.

Task-number: QTBUG-19680

Merge-request: 2676
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
11 years ago Mingw compile error src/gui/accessible/qaccessible_win.cpp
Markku Heikkila [Thu, 15 Sep 2011 10:51:19 +0000 (12:51 +0200)]
 Mingw compile error src/gui/accessible/qaccessible_win.cpp

(*pvarState).lVal = elem.iface ? elem.iface->state(elem.entry) : 0;
at least, gcc-4.4.3 complains the
mismatched types of elem.iface->state(elem.entry) and 0, aslike,

Merge-request: 1377
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
11 years agoMerge remote-tracking branch 'mainline/4.8'
Oswald Buddenhagen [Thu, 15 Sep 2011 10:30:48 +0000 (12:30 +0200)]
Merge remote-tracking branch 'mainline/4.8'

11 years agoUpdated Changelog
Lars Knoll [Thu, 15 Sep 2011 08:53:59 +0000 (10:53 +0200)]
Updated Changelog

11 years agoMy 4.8.0 changes.
Kim Motoyoshi Kalland [Thu, 15 Sep 2011 08:47:59 +0000 (10:47 +0200)]
My 4.8.0 changes.

11 years agoMy 4.8.0 changes
Sami Merila [Thu, 15 Sep 2011 08:37:28 +0000 (11:37 +0300)]
My 4.8.0 changes

Also contains changes from Miikka Heikkinen.

11 years agoMention Lighthouse in the changes file.
Paul Olav Tvete [Wed, 14 Sep 2011 11:31:19 +0000 (13:31 +0200)]
Mention Lighthouse in the changes file.

11 years agoChangelog: add waylandwindowmanager integration changes
Lasse Holmstedt [Thu, 15 Sep 2011 07:48:58 +0000 (09:48 +0200)]
Changelog: add waylandwindowmanager integration changes

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Thu, 15 Sep 2011 07:42:23 +0000 (17:42 +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:
  Fix crash in compiled bindings

11 years agoMy 4.8.0 changes
Eskil Abrahamsen Blomfeldt [Thu, 15 Sep 2011 07:09:18 +0000 (09:09 +0200)]
My 4.8.0 changes

Add the rest of my changes to the change log.

11 years agoUpdate changes file.
Christian Kandeler [Wed, 14 Sep 2011 15:14:53 +0000 (17:14 +0200)]
Update changes file.

11 years agoDo not put cursor at non-stop character positions
Jiang Jiang [Tue, 13 Sep 2011 15:35:08 +0000 (17:35 +0200)]
Do not put cursor at non-stop character positions

When moving cursors, non-stop positions are skipped, however certain
input sequences can still lead us there. In such cases we should
simply ignore those positions in cursorToX.

Task-number: QTBUG-7076
Reviewed-by: Eskil
11 years agoFix crash in compiled bindings
Aaron Kennedy [Wed, 14 Sep 2011 08:11:35 +0000 (18:11 +1000)]
Fix crash in compiled bindings

Task-number: QTBUG-21265

11 years agoMerge remote branch 'origin/4.8' into 4.8-from-4.7
Rohan McGovern [Wed, 14 Sep 2011 07:45:44 +0000 (17:45 +1000)]
Merge remote branch 'origin/4.8' into 4.8-from-4.7

Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Wed, 14 Sep 2011 04:45:58 +0000 (14:45 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (225 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  find qt.conf more reliably
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  qmake vcxproj generator: fix XML conversion for build events
  Fix trailing spaces problem by not adding it to QScriptLine.length
  Fix RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Fix double click and drag not extending word selection.
  Split CFLAGS from pkg-config properly
  Ensure that the proxystyle is used over the style's own functions
  runonphone: Add a missing space between a message and the file name
  Perl check for windows configure.
  QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
  QSettings: use the common appdata dir when bootstrapping qmake on win
  Merge fixes for QDir::operator==
  Replace explicit surrogate handlers by inline methods of QChar class
  ...

11 years agoUpdated WebKit to 64cce10 (qtwebkit-rc1, week36)
Ademar de Souza Reis Jr [Tue, 13 Sep 2011 14:07:16 +0000 (11:07 -0300)]
Updated WebKit to 64cce10 (qtwebkit-rc1, week36)

Changes since last sync:
    [https://webkit.org/b/59927 #59927]: [SH4] AssemblerLabel does not name a type
    [https://webkit.org/b/63259 #63259]: Warnings in JSC's JIT on 32 bit
    [https://webkit.org/b/67254 #67254]: [Qt][DRT] Normalize file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource()
    [https://webkit.org/b/64527 #64527]: [Qt]Update layout test results for newer Qt 4.8.x
    [https://webkit.org/b/67644 #67644]: [Qt][Symbian] REGRESSION[94105] DumpRenderTree.exe doesn't build on Symbian
    [https://webkit.org/b/67784 #67784]: frame-loading-via-document-write.html test cases have extra slash in path
    [https://webkit.org/b/67958 #67958]: (restricted bug)
    [https://webkit.org/b/61805 #61805]: (restricted bug)
    [https://webkit.org/b/64753 #64753]: (restricted bug)
    [https://webkit.org/b/67364 #67364]: (restricted bug)
    [https://webkit.org/b/67488 #67488]: (restricted bug)
    [https://webkit.org/b/67735 #67735]: (restricted bug)
    [https://webkit.org/b/67748 #67748]: (restricted bug)

11 years agowtf? .pro.user files? congrats to overriding the hook!
Oswald Buddenhagen [Tue, 13 Sep 2011 15:27:48 +0000 (17:27 +0200)]
wtf? .pro.user files? congrats to overriding the hook!

11 years agodoc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs
Eskil Abrahamsen Blomfeldt [Tue, 13 Sep 2011 11:16:35 +0000 (13:16 +0200)]
doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs

There's no QImage::Format_A8 format. This is a term used in the
corresponding QFontEngineGlyphCache enum.

Reviewed-by: Jiang Jiang
11 years agoFix QNetworkReply::errorString returning an untranslated string
Giuseppe D'Angelo [Mon, 12 Sep 2011 16:43:21 +0000 (18:43 +0200)]
Fix QNetworkReply::errorString returning an untranslated string

The QHttpNetworkConnectionPrivate::errorDetail is supposed to return a
translated string, which is then set as the QNetworkReply error.
The current code incorrectly uses QT_TRANSLATE_NOOP,
which mark the strings for translation, but does not translate them.
The result is that even with a translator loaded those strings are
written in English.

Fixes QTBUG-18382.

Merge-request: 2671
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agorunonphone: Add a missing argument for QString::arg
Martin Storsjo [Mon, 12 Sep 2011 16:17:53 +0000 (18:17 +0200)]
runonphone: Add a missing argument for QString::arg

Merge-request: 2680
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration
Qt Continuous Integration System [Mon, 12 Sep 2011 09:39:11 +0000 (19:39 +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:
  Migrate addMarkUp function to QChar.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Mon, 12 Sep 2011 03:07:58 +0000 (13:07 +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:
  StrictlyEnforceRange with snapOneItem/Row and header behavior change

11 years agoStrictlyEnforceRange with snapOneItem/Row and header behavior change
Martin Jones [Sun, 11 Sep 2011 23:42:51 +0000 (09:42 +1000)]
StrictlyEnforceRange with snapOneItem/Row and header behavior change

Change cf23188de237009136fa1480ab8fd9e3ca364769 changed the positioning
of a view with StrictlyEnforceRange, snapOneItem/Row, and a header,
such that the view was positioned at the beginning of the header,
rather than on the first item.  This change reverts back to the old
behavior (position on the first item).

Change-Id: I62ad183919bb2ed83d787d1d76421caf9e708599
Task-number: QTTH-1501
Reviewed-by: Michael Brasser
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Sat, 10 Sep 2011 23:18:00 +0000 (09:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  find qt.conf more reliably
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  qmake vcxproj generator: fix XML conversion for build events
  Fix trailing spaces problem by not adding it to QScriptLine.length
  Fix RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Fix double click and drag not extending word selection.
  Split CFLAGS from pkg-config properly
  Ensure that the proxystyle is used over the style's own functions
  runonphone: Add a missing space between a message and the file name
  Perl check for windows configure.
  QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
  QSettings: use the common appdata dir when bootstrapping qmake on win
  Merge fixes for QDir::operator==
  Replace explicit surrogate handlers by inline methods of QChar class
  ...

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

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
Qt Continuous Integration System [Sat, 10 Sep 2011 15:34:49 +0000 (01:34 +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:
  Disable autotest broken by the change to QCache in 7ab0bed
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  Fix trailing spaces problem by not adding it to QScriptLine.length
  Fix RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Make it compile on mac
  Fixed compiling error in qvfb.
  micro optimizations
  fix "comparison between signed and unsigned" warnings
  on windows, don't resolve the gdi32's symbols for each QRawFont instance
  fix typo in the docs
  QRawFont: add missed operator !=
  optimize QGlyphRun's operator == a bit
  QGlyphRun: make operator != inlined
  QGlyphRun: don't detach if the decoration wasn't actually changed
  QPA event loop: Set a timeout != 0 if there are no timers.

11 years agoMerge remote-tracking branch 'qt-fire-review/master'
aavit [Sat, 10 Sep 2011 14:43:04 +0000 (16:43 +0200)]
Merge remote-tracking branch 'qt-fire-review/master'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 10 Sep 2011 06:41:32 +0000 (16:41 +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:
  find qt.conf more reliably

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Sat, 10 Sep 2011 05:37:30 +0000 (15:37 +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: (120 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  Fix trailing spaces problem by not adding it to QScriptLine.length
  fix build for desktop
  Dragging in nested views no longer works as expected
  Fix the build with -qtnamespace configure options
  Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
  Fix implicit height not growing when pre-edit text wraps.
  Removed the unnecessary dependency of the QtHelp module on the QtXml one
  Modified \since command behavior slightly to handle project and version.
  Added an additional check to workaround an issue on Windows.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Update license headers
  ...

11 years agoDisable autotest broken by the change to QCache in 7ab0bed
aavit [Sat, 10 Sep 2011 05:22:10 +0000 (07:22 +0200)]
Disable autotest broken by the change to QCache in 7ab0bed

Reviewed-by: trustme
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Sat, 10 Sep 2011 00:12:14 +0000 (10:12 +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:
  Merge fixes for QDir::operator==
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  Restore Qt4.7 behaviour of QFileInfo::absolute(File)Path
  Fix compile error on MSVC2008
  Fix comparison of absolute, unclean paths in QDir
  Wrap calls to Sequence::push_back

11 years agoMerge branch '4.8-upstream' into master-water
Water-Team [Fri, 9 Sep 2011 23:00:12 +0000 (01:00 +0200)]
Merge branch '4.8-upstream' into master-water

11 years agoMerge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
Qt Continuous Integration System [Fri, 9 Sep 2011 22:53:30 +0000 (08:53 +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:
  Migrate addMarkUp function to QChar.
  update the proxy info before session is opened in QNAM by Aapo Makela
  Dragging in nested views no longer works as expected
  QSslCertificate: block all DigiNotar (intermediate and root) certs
  QSslCertificate: also check common name for blacklisted certificates
  Fix implicit height not growing when pre-edit text wraps.
  Fix typo in header guard.
  fix doc typo
  Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk
  remove obsolete define
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.

11 years agofind qt.conf more reliably
Oswald Buddenhagen [Fri, 9 Sep 2011 16:41:52 +0000 (18:41 +0200)]
find qt.conf more reliably

a qmake invoked with a relative path would not find qt.conf, because it
already changed CWD, which would confuse our copy of
QCoreApplication::applicationFilePath() (see also QTBUG-21381).
we already have the absolute path to the qmake executable in
Option::qmake_abslocation, so just use it.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 9 Sep 2011 13:27:59 +0000 (23:27 +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:
  Release font engine refcount when done using it in QTextEngine

11 years agoRelease font engine refcount when done using it in QTextEngine
Jiang Jiang [Fri, 9 Sep 2011 12:49:15 +0000 (14:49 +0200)]
Release font engine refcount when done using it in QTextEngine

5f2b6dd2a50275bc05ae5d7e9dd8902d6d49d9df increased refcounts for
font engines in QTextEngine cache, we need to decrease them when
the QTextEngine is deallocated.

Task-number: QTBUG-21222
Reviewed-by: Eskil
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
Qt Continuous Integration System [Fri, 9 Sep 2011 12:18:02 +0000 (22:18 +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 vcxproj generator: fix XML conversion for build events

11 years agoGenerate glyphs in un-transformed coordinate system.
Samuel Rødal [Fri, 2 Sep 2011 11:48:26 +0000 (13:48 +0200)]
Generate glyphs in un-transformed coordinate system.

Avoids rounding issues with very large coordinates.

Task-number: QTBUG-21262 - QRasterPaintEngine & QFontEngineFT - fonts corrupted when scrolling to the bottom of long texts
Reviewed-by: Eskil
Signed-off-by: Aleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
11 years agoUse QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
Aleksandar Stojiljkovic [Thu, 8 Sep 2011 09:00:41 +0000 (12:00 +0300)]
Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT

Task-number: QTBUG-21162 - Letters get truncated when font size=72 and set to Italic
Reviewed-by: Eskil
11 years agoReset trailingSpaces in relayout
Jiang Jiang [Fri, 9 Sep 2011 08:52:40 +0000 (10:52 +0200)]
Reset trailingSpaces in relayout

Reviewed-by: TrustMe
11 years agoMerge remote-tracking branch 'mainline/4.7' into 4.7
Casper van Donderen [Fri, 9 Sep 2011 10:19:02 +0000 (12:19 +0200)]
Merge remote-tracking branch 'mainline/4.7' into 4.7

11 years agoPrevent QPixmapCache potentially growing indefinitely.
Samuel Rødal [Fri, 9 Sep 2011 07:51:18 +0000 (09:51 +0200)]
Prevent QPixmapCache potentially growing indefinitely.

QPixmapCache has until now refused to throw out shared pixmaps, i.e.
ones that still have shallow copies lying around. This leads to problems
when someone inserts two shallow copies using different keys, causing
the cache itself containing multiple shallow copies and thus forever
refusing to throw out those entries.

It's rather easy for this to accidentally happen in a user application
since QPixmap::load() or QPixmap(const QString &fileName, ...)
automatically cache the pixmap in the QPixmapCache, thus if the user
then calls QPixmapCache::insert() on the same pixmap or a shallow copy
it is locked in the QPixmapCache forever.

The only reason for not throwing out a pixmap that's shared would be to
prevent re-loading a pixmap from file when a user has a direct reference
to it in his application, but in that case the user is unlikely to
re-load the pixmap from file in any case. Therefore it seems the best
fix is to get rid of this limitation.

Task-number: QTBUG-21359
Reviewed-by: John Brooks
Reviewed-by: Olivier Goffart
11 years agoAllocate 16-byte aligned memory independent of platform for raster pool.
Samuel Rødal [Thu, 8 Sep 2011 11:10:47 +0000 (13:10 +0200)]
Allocate 16-byte aligned memory independent of platform for raster pool.

Fixes crash on MIPS (see original merge request
https://qt.gitorious.org/qt/qt/merge_requests/1366).

Reviewed-by: Olivier Goffart
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
Qt Continuous Integration System [Fri, 9 Sep 2011 06:19:06 +0000 (16:19 +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:
  Fix double click and drag not extending word selection.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 8 Sep 2011 23:15:06 +0000 (09:15 +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:
  Dragging in nested views no longer works as expected
  Fix implicit height not growing when pre-edit text wraps.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.

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

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
aavit [Thu, 8 Sep 2011 19:42:55 +0000 (21:42 +0200)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team

11 years agoMerge remote-tracking branch 'qt-mainline/4.8'
aavit [Thu, 8 Sep 2011 19:42:31 +0000 (21:42 +0200)]
Merge remote-tracking branch 'qt-mainline/4.8'

Conflicts:
tools/qvfb/qvfbshmem.cpp

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 8 Sep 2011 16:27:12 +0000 (02:27 +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:
  Split CFLAGS from pkg-config properly
  Ensure that the proxystyle is used over the style's own functions
  runonphone: Add a missing space between a message and the file name
  Perl check for windows configure.
  QSettings: don't assume XDG_CONFIG_HOME is latin1-encoded
  QSettings: use the common appdata dir when bootstrapping qmake on win
  Replace explicit surrogate handlers by inline methods of QChar class

11 years agoqmake vcxproj generator: fix XML conversion for build events
Joerg Bornemann [Thu, 8 Sep 2011 15:44:05 +0000 (17:44 +0200)]
qmake vcxproj generator: fix XML conversion for build events

Task-number: QTBUG-20419
Reviewed-by: ossi
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
Qt Continuous Integration System [Thu, 8 Sep 2011 15:04:32 +0000 (01:04 +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:
  Implement QAccessibleActionInterface for menu actions.

11 years agoFix trailing spaces problem by not adding it to QScriptLine.length
Jiang Jiang [Thu, 8 Sep 2011 14:31:53 +0000 (16:31 +0200)]
Fix trailing spaces problem by not adding it to QScriptLine.length

It seems to be the only sane way to fix it. Previous attempts to
fix it by compensating the trailing space width all failed in some
cases, one of the trickiest is when we are having embedded LTR text
that has trailing spaces in a RTL paragraph.

In this patch we leave line.length not including the trailing space
length, but saving it to a separated variable, so that we can always
add it back when needed (QTextLine::textLength() for instance).

It fixed all the problems in different alignments of both RTL and
LTR text. And no regression is found yet.

Reviewed-by: Eskil
11 years agoMerge remote-tracking branch 'mainline/4.7' into 4.7
Casper van Donderen [Thu, 8 Sep 2011 12:47:55 +0000 (14:47 +0200)]
Merge remote-tracking branch 'mainline/4.7' into 4.7

11 years agoMigrate addMarkUp function to QChar.
Casper van Donderen [Thu, 8 Sep 2011 12:46:40 +0000 (14:46 +0200)]
Migrate addMarkUp function to QChar.

Reviewed-by: Martin Smith
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
Qt Continuous Integration System [Thu, 8 Sep 2011 10:58:32 +0000 (20:58 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  update the proxy info before session is opened in QNAM by Aapo Makela

11 years agoupdate the proxy info before session is opened in QNAM by Aapo Makela
Kranthi Kuntala [Thu, 8 Sep 2011 10:33:19 +0000 (13:33 +0300)]
update the proxy info before session is opened in QNAM by Aapo Makela

Reviewed-By: Kranthi Kuntala <kranthi.kumar-kuntala@nokia.com>
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
Qt Continuous Integration System [Thu, 8 Sep 2011 10:16:03 +0000 (20:16 +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:
  Fix RTL layout for fonts when non-printable character has an advance
  Fix regression in tst_qrawfont
  Make it compile on mac
  Fixed compiling error in qvfb.
  micro optimizations
  fix "comparison between signed and unsigned" warnings
  on windows, don't resolve the gdi32's symbols for each QRawFont instance
  fix typo in the docs
  QRawFont: add missed operator !=
  optimize QGlyphRun's operator == a bit
  QGlyphRun: make operator != inlined
  QGlyphRun: don't detach if the decoration wasn't actually changed

11 years agoImplement QAccessibleActionInterface for menu actions.
Frederik Gladhorn [Wed, 7 Sep 2011 16:36:51 +0000 (18:36 +0200)]
Implement QAccessibleActionInterface for menu actions.

This allows to open and trigger menu items via actions using
the dedicated action interface.

Reviewed-by: Jan-Arve
11 years agoFix RTL layout for fonts when non-printable character has an advance
John Tapsell [Thu, 8 Sep 2011 08:14:33 +0000 (10:14 +0200)]
Fix RTL layout for fonts when non-printable character has an advance

If a non-printable character has an advance, we would lay out the text
as if the character was part of the output, and then ignore the
character later when the text was rendered. To fix cases such as this,
we take the dontPrint attribute into consideration when adjusting the
advances.

Task-number: QTBUG-21347
Reviewed-by: Eskil
Reviewed-by: Lars