Commit Graph

725 Commits

Author SHA1 Message Date
David Boddie
b5a989dc11 Doc: Fixed qdoc warnings. 2011-05-23 14:24:09 +02:00
David Boddie
badc27b38d Doc: Made an additional change for clarity.
Task-number: QT-4891
2011-05-23 14:24:09 +02:00
David Boddie
e29f44dc24 Doc: Noted that the example will not work as expected with a mouse.
Task-number: QT-4891
2011-05-23 14:24:09 +02:00
David Boddie
9c3a1d290a Doc: Fixed qdoc warnings. 2011-05-23 14:24:09 +02:00
David Boddie
7ff15bc4f5 Doc: Applying a pending change from previous merges. 2011-05-23 14:24:09 +02:00
David Boddie
a31fae0835 Doc: Fixed qdoc warning. 2011-05-23 14:24:08 +02:00
David Boddie
234b36698e Doc: Fixed qdoc warnings. 2011-05-23 14:24:08 +02:00
David Boddie
4d7d6d70e5 Doc: Applied pending fixes to API documentation. 2011-05-23 14:24:08 +02:00
David Boddie
ba441e84f8 Doc: Various fixes to documentation, some based on changes in master. 2011-05-23 14:24:08 +02:00
David Boddie
411746989c Doc: Added missing project and desktop files. 2011-05-23 14:24:07 +02:00
David Boddie
9235701d72 Doc: Documented the value returned when no field can be found.
Task-number: QTBUG-19115
2011-05-23 14:24:07 +02:00
David Boddie
0cbcc61ef3 Squashed commit of changes from the 4.8-temp branch. 2011-05-23 14:24:07 +02:00
David Boddie
0748751c9f Squashed commit of the changes from the mobile-examples repository
(4.7-generated-declarative branch).
2011-05-23 14:24:07 +02:00
Qt Continuous Integration System
60cea67af0 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Enablers for TextInput
2011-05-23 21:47:55 +10:00
Eskil Abrahamsen Blomfeldt
5feefb0c03 Enablers for TextInput
In order to use the scene graph text node in TextInput, we
need enablers. Most of this is to enable selections,
which in turn means we need to be able to extract a certain
set of glyphs from a QTextLine.
2011-05-23 13:38:22 +02:00
Qt Continuous Integration System
4050f12526 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Track Wayland changes
2011-05-23 21:07:48 +10:00
Paul Olav Tvete
6e99936502 Track Wayland changes
The wl_display_get_xxxx_visual() functions have been removed, and
are replaced by a compositor event.

Reviewed-by: Samuel
2011-05-23 12:59:29 +02:00
Qt Continuous Integration System
7ef7ac972f Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Add task numbers for disabled autotests
2011-05-23 17:26:39 +10:00
Jason McDonald
44be214a78 Add task numbers for disabled autotests
Change-Id: I830cdbf60ad1edf554b19cd7e6fdbd459f3e160f
Reviewed-by: Trust Me
2011-05-23 17:19:55 +10:00
Qt Continuous Integration System
0e7af4386b Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add qmltestcase.prf for QtQuickTest
2011-05-21 23:57:00 +10:00
Charles Yin
035d6b9188 add qmltestcase.prf for QtQuickTest
so that 'CONFIG += qmltestcase' works
2011-05-21 23:51:48 +10:00
Qt Continuous Integration System
d3b376865e Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
2011-05-20 22:04:01 +10:00
Simon Hausmann
4f2138ecfb Fix inconsistency between Qt and ICU in Shift-JIS codec with regards to ASCII range
Qt's Shift-JIS codec maps the characters 0x5c and 0x7e to unicode yen (0x5a)
and unicode overline (0x203e). ICU and (as it turns out) Symbian's native
Shift-JIS codec preserve 0x5c and 0x7e when converting to Unicode.

Qt's behaviour creates a problem when loading japanese web sites that are
encoded in Shift-JIS. When they reference external JavaScript files, those tend
to inherit the current page encoding (unless the character set is explicitly
specified). Consequently JavaScript tends to contain regular expressions (as a
built-in feature of the language), which in turn uses backslashes for escape
sequences. Therefore it is crucial that the encodings used to decode the script
preserve the ASCII range, i.e. do not convert 0x5c (ascii backslash) to
something else.

This patch corrects the behaviour of Qt's Shift-JIS codec to leave all
characters < 0x80 unaltered in the process of conversion to and from
Unicode.

Task: QTBUG-19335

Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
(cherry picked from commit 8e321cd869da7ff1cf0168da41aa0246b44867cc)
2011-05-20 13:55:12 +02:00
Qt Continuous Integration System
49cf3e27e2 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  add test case for ipv6 url parsing
2011-05-20 20:36:27 +10:00
shiroki
80d094f072 add test case for ipv6 url parsing
Reviewed-by: Thiago
(cherry picked from commit fd043eb78212de5935bc101624818070e1b4fb1b)
2011-05-20 11:49:55 +02:00
Qt Continuous Integration System
4bd181fb5a Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tst_qhostinfo: Fix IPv6 lookup detection on Windows.
  Fix incorrect hardware address on systems without getifaddrs()
  Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
2011-05-20 19:18:56 +10:00
Martin Petersson
df2d6753ac tst_qhostinfo: Fix IPv6 lookup detection on Windows.
Moved the QTcpServer test to init winsock before we use getaddrinfo.

Reviewed-by: Shane Kearns
(cherry picked from commit 0ccf01368adcabbb25958a55976083f72116a2d5)
2011-05-20 10:52:52 +02:00
Craig Scott
0ebe0414d2 Fix incorrect hardware address on systems without getifaddrs()
On unix systems for which QT_NO_GETIFADDRS is defined, the way that the
hardware address field is extracted from the result of a call to
qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct
is taken rather than the appropriate member within that struct, sa_data,
resulting in a memory offset and subsequently the hardware address has
garbage in the first two of six fields. This commit modifies the code
to pass the sa_data member instead of the address of the struct as a
whole.

Task-number: QTBUG-19165
Merge-request: 2614
Reviewed-by: Martin Petersson
(cherry picked from commit 004ad12669ef696eeba70fd57d1eb0c67c806d1d)
2011-05-20 10:46:47 +02:00
Martin Petersson
5a19d52ae7 Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
Task-number: QTBUG-18426
Reviewed-by: Peter Hartmann
(cherry picked from commit ebc134db484eee31491836b619aad1ee86e3070e)
2011-05-20 10:44:12 +02:00
Qt Continuous Integration System
acc98b9b36 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Designer: Extend container extension.
2011-05-20 18:21:33 +10:00
Friedemann Kleint
e00b8105bf Designer: Extend container extension.
Make it possible to disable adding/removing pages by
adding respective bool virtual functions.

Useful for implementing containers with fixed, single
children like QScrollArea, QDockWidget, which require
a container extension to work properly in Qt Designer.
Previously, the problem was that the add/remove
page context menu actions were enabled for them,
leading to crashes und undesired behaviour.

Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2011-05-20 10:10:32 +02:00
Qt Continuous Integration System
240e35ddeb Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Allow arthur tests to use private headers.
2011-05-20 12:18:56 +10:00
Jason McDonald
66498850f2 Allow arthur tests to use private headers.
The tests include qapplication_p.h, therefore the .pro files need to
specify
    QT += core-private gui-private

Change-Id: Icd6d7ba31f79b8c7b15e0327dd5ce44c7f486221
Reviewed-by: Rohan McGovern
2011-05-20 12:04:07 +10:00
Qt Continuous Integration System
ff08e8c009 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove mention of qt3support in makeselftest
  Remove Qt3Support test data from lancelot test
  Remove Qt3Support code from algorithms autotest
  Don't link qt3support lib in QMessageBox autotest
2011-05-20 11:39:07 +10:00
Jason McDonald
f5e39ca541 Remove mention of qt3support in makeselftest
Change-Id: Ie081d3a543ff30e3e58e154cbfea57a29bb24210
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:39:20 +10:00
Qt Continuous Integration System
61fbcd95f0 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Remove Qt3Support code from QVariant autotest.
  Remove obsolete test data
  Remove Qt3Support code from QMenuBar test, part 2.
2011-05-20 10:37:23 +10:00
Jason McDonald
8941b00a6b Remove Qt3Support test data from lancelot test
The data was already commented out and thus unused.

Change-Id: I234cea542bbacf429b6cb1fc0c9feec4f80e47e5
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:37:13 +10:00
Jason McDonald
ea1324e497 Remove Qt3Support code from algorithms autotest
qHeapSort and qBubbleSort were Qt3 functions that were replaced by
qSort.  During modularization, the Qt3Support header containing these
routines (q3tl.h) was moved into the algorithms autotest, presumably
because that was the only thing that still included the header.
However, as these routines are not part of Qt5, they don't need to be
tested anymore.  This commit deletes the q3tl.h header and the test
functions that tested it.

Change-Id: I52eed7b4b4db3bd671dc6dbd752642bc9e783c30
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:36:16 +10:00
Jason McDonald
10133d4121 Don't link qt3support lib in QMessageBox autotest
Change-Id: I0126dc790e88639ad524cdf719ced2a444df9b71
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:35:20 +10:00
Jason McDonald
c028fd12c6 Remove Qt3Support code from QVariant autotest.
This commit removes the four columns of test data that were only used
for testing Qt3Support features.

Change-Id: I93116b64ac49b0d6812595dfd58962ba8afbdad1
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:33:34 +10:00
Jason McDonald
56e7e2e059 Remove obsolete test data
Remove test data for Qt3Support functions from the QTextStream autotest.
The code that used this data was removed in an earlier commit.

Change-Id: I26e34cdefd47287c6992cf1d31276a40994c607c
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:32:14 +10:00
Jason McDonald
b8efa50fda Remove Qt3Support code from QMenuBar test, part 2.
Follow-up to previous commit: remove the "_noQt3" suffixes on test
function names and the "_Qt4" suffixes on variable names.

Change-Id: I000e87357b025930b0065efc1d0de05c2cd07bba
Task-number: QTBUG-19325
Reviewed-by: Rohan McGovern
2011-05-20 10:30:06 +10:00
Qt Continuous Integration System
f0bca208b1 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  New configure.exe binary
2011-05-20 05:03:02 +10:00
Marius Storm-Olsen
7051ce3009 New configure.exe binary 2011-05-19 13:41:57 -05:00
Qt Continuous Integration System
3a88b3c9e6 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Full translucent background support in xcb and xlib backend.
  Lighthouse xcb and xlib: Add support for transparency of GLX windows.
  Lighthouse minimal: Add support for transparency
  Compile fixes for Xlib plugin.
2011-05-20 03:08:34 +10:00
Samuel Rødal
3d34c9b78e Full translucent background support in xcb and xlib backend.
Make sure to pick an alpha visual also for non-GL surface types, and to
ask for alpha in the window format if the WA_TranslucentBackground
attribute is set.

Reviewed-by: Janusz Lewandowski
(cherry picked from commit 6241e39cff9311c943430ff2f31236b13618f2ac)
2011-05-19 19:03:23 +02:00
Janusz Lewandowski
dd43611b97 Lighthouse xcb and xlib: Add support for transparency of GLX windows.
Merge-request: 1231
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
(cherry picked from commit a3b627e1c5ce03a2500ab35c64729b1995639dcc)
2011-05-19 19:03:22 +02:00
Janusz Lewandowski
463e31fd58 Lighthouse minimal: Add support for transparency
Merge-request: 1231
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
(cherry picked from commit c15b41056e60abdbb4d835e27a360f01be618a4f)
2011-05-19 19:03:22 +02:00
Samuel Rødal
852e9766ed Compile fixes for Xlib plugin.
(cherry picked from commit 4af11f2c6666c55657569f946c33816f33711225)
2011-05-19 19:03:17 +02:00
Qt Continuous Integration System
f60b3e90e6 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Don't crash if windowmanager is not initialized
  Compile fix for 64bit Linux.
2011-05-20 00:58:20 +10:00