profile/ivi/qtbase.git
13 years agoRestore subpixel rendering support with fontconfig and FreeType
Jiang Jiang [Fri, 4 Nov 2011 15:09:45 +0000 (16:09 +0100)]
Restore subpixel rendering support with fontconfig and FreeType

Change-Id: I45cf83374ba5a8b1ae88415950c1e5ab72991598
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoMoved tests into gui/kernel/ and gui/qopengl/
Jo Asplin [Thu, 3 Nov 2011 09:12:44 +0000 (10:12 +0100)]
Moved tests into gui/kernel/ and gui/qopengl/

This commit moves tests from test/auto/ into more appropriate
locations (i.e. matching the locations in the Qt source):

- qscreen and qwindow are moved into gui/kernel/
- qopengl is moved into gui/qopengl/

Note: qscreen is disabled for now since it is broken
on Linux (see QTBUG-22554).

Change-Id: Idcc7a51e78d6d0955bddb9cb4091866659193cc8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoPrevent timestamps in widgets' touch events from disappearing
Laszlo Agocs [Fri, 4 Nov 2011 12:22:30 +0000 (14:22 +0200)]
Prevent timestamps in widgets' touch events from disappearing

Change-Id: I096914eb2b02ad9c4a5c0462a1f4b76ef17c3957
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoAdded ref to bug report in qglthreads.pro
Jo Asplin [Fri, 4 Nov 2011 10:44:45 +0000 (11:44 +0100)]
Added ref to bug report in qglthreads.pro

Change-Id: Iecbda846eada49634b473959c642b8ee4c46c5c1
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoAdded -datatags option to QTestLib
Jo Asplin [Tue, 1 Nov 2011 11:19:39 +0000 (12:19 +0100)]
Added -datatags option to QTestLib

(Note: This feature is ported from Qt 4.8.
 See the following commits:
  01575deafb7d26ca2431374e92c6d71de96547c7
  4866d1ba8afbab61e102942d1ea93b81fea053d6
)

Passing the -datatags option to a QTestLib program prints the
available data tags to standard output.

For completeness, the test case name is also printed
at the start of each output line. (Although the file name
is supposed to match the lower-case version of the test case
name, this is currently not true in all cases (particularly not
under tests/benchmarks/). Even if there was a script to enforce this
convention, the -datatags option provides this information in a
reliable way.)

Data tags for each test function (f() in this case) are printed in
four different ways depending on the presence of local and global
data tags:

Case 1: No tags:
    tst_MyTestCasetst_MyTestCase f

Case 2: Local tags only:
    tst_MyTestCase f local tag 1
    tst_MyTestCase f local tag 2
    ...

Case 3: Global tags only:
    tst_MyTestCase f __global__ global tag 1
    tst_MyTestCase f __global__ global tag 2
    ...

Case 4: Local and global tags:
    tst_MyTestCase f local tag 1 __global__ global tag 1
    tst_MyTestCase f local tag 2 __global__ global tag 1
    ...
    tst_MyTestCase f local tag 1 __global__ global tag 2
    tst_MyTestCase f local tag 2 __global__ global tag 2
    ...
    ...

Note that the string __global__ is assumed to be highly unlikely to occur
in a data tag (if it does, an ambiguity results).

Change-Id: Ib51aa0c3c32ad52e52ce519729292cf8f0ec5d50
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoqmake: vcproj ignores subdirs that do "no_default_target".
Friedemann Kleint [Tue, 1 Nov 2011 09:40:31 +0000 (10:40 +0100)]
qmake: vcproj ignores subdirs that do "no_default_target".

It's nicer to do:
    SUBDIRS += foo
    foo.CONFIG = no_default_target no_default_install
then to omit foo from SUBDIRS because a Makefile is still produced
but "make" and "make install" don't descend automatically.

The vcproj generator doesn't know about this. This patch gets it to
check for no_default_target and then it simply ignores the directory.

Change-Id: I127bea79143c101612afb0e9c6603d3b065c7c56
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 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

Change-Id: I126eec019695bef7dd418d122ad911d9a10e0aa4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoFix usage of QtConcurrent headers with -Wshadow -Werror
David Faure [Thu, 3 Nov 2011 22:22:43 +0000 (23:22 +0100)]
Fix usage of QtConcurrent headers with -Wshadow -Werror

Change-Id: I172888518a3db01f89e61061eccf85f7f3387d07
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoWindows: Add dialog helpers for native dialogs.
Friedemann Kleint [Fri, 4 Nov 2011 13:36:28 +0000 (14:36 +0100)]
Windows: Add dialog helpers for native dialogs.

Implement QPlatformDialogHelper for file dialogs based on
IFileDialog. Add prototypical implementation of color dialogs.

Change-Id: If3c7470be6c0b8fbf8cfea1b6638bda43afafea7
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
13 years agoRevert "Avoid fontconfig access in fontEngine creation"
Jiang Jiang [Thu, 3 Nov 2011 14:15:16 +0000 (15:15 +0100)]
Revert "Avoid fontconfig access in fontEngine creation"

This reverts commit 8dcb52df8e2e949232ccded9fad5a4f25ba6dda2.

Turns out that hint style is retrieved from font match instead of
pattern match, which shouldn't be retreived until font engine
creation.

Change-Id: I90e779a3823e6a6604cdadb52586fcd5e22c295b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoRe-enabled passing tests in tst_qvariant
Jo Asplin [Thu, 3 Nov 2011 12:16:50 +0000 (13:16 +0100)]
Re-enabled passing tests in tst_qvariant

To increase the effective test coverage, this patch
re-enables the tst_qvariant test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Ibf0dc3caf50d34084fa50cf76d199e77a42f6e16
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoImprove QtGui start-up time and memory use.
Samuel Rødal [Wed, 2 Nov 2011 16:02:11 +0000 (17:02 +0100)]
Improve QtGui start-up time and memory use.

The gamma lookup tables can be allocated and computed on demand, as
they're not always needed, depending on the platform and the use case.

Change-Id: I2d4c2860746366a0e46edb53bd4ecd2778de2464
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agotest: Use QWidget::grab() instead of QPixmap::grabWidget()
Sergio Ahumada [Fri, 4 Nov 2011 09:53:45 +0000 (10:53 +0100)]
test: Use QWidget::grab() instead of QPixmap::grabWidget()

Removing warnings from the test function as QPixmap::grabWidget()
is being deprecated.

Change-Id: I26ad1e9def0bebe8e4ee997068ba593245d0cd05
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoRevert "Fixed deployment problems with MSVC 2005 and 2008 SP1"
Joerg Bornemann [Fri, 28 Oct 2011 09:32:26 +0000 (11:32 +0200)]
Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"

This reverts commit ec41d27565ed0b4d517f30563def135d0b4c7a8d.

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

Change-Id: I4097c8d0962c633bab6edbb86df9046d93148cab
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoRevert "Use standard spelling for two languages"
Lars Knoll [Fri, 4 Nov 2011 09:57:36 +0000 (10:57 +0100)]
Revert "Use standard spelling for two languages"

This reverts commit 9358f7eaa4b773bdbfa45b08ab92a89096954881.

The change is source incompatible and hasn't been agreed upon. Revert
it even though it's correct in principle. It's simple to keep the old
enums around for compatibility.

Change-Id: I8d9d33868e44d0299a3f081833b06cedf0ed4345
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoQStandardPaths: add DownloadLocation.
David Faure [Thu, 3 Nov 2011 18:13:32 +0000 (19:13 +0100)]
QStandardPaths: add DownloadLocation.

Only properly implemented on unix (XDG), falls back to Document location
on Mac and Windows, because not easily available with the current API
being used by either one.

Change-Id: Id269f0e3c4e3a68e19205de96c0b39980fde80ff
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoFix tst_qstandardpaths: Mac OSX is a unix, but doesn't use XDG.
David Faure [Thu, 3 Nov 2011 18:12:53 +0000 (19:12 +0100)]
Fix tst_qstandardpaths: Mac OSX is a unix, but doesn't use XDG.

Change-Id: I2b4552a162dc9f993e0587ace6e7e3fb4f96571e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRe-enabled passing test in tst_qdbuspendingcall
Sergio Ahumada [Thu, 3 Nov 2011 21:00:56 +0000 (22:00 +0100)]
Re-enabled passing test in tst_qdbuspendingcall

tst_QDBusPendingCall::watcher_waitForFinished_threaded()
autotest was fixed by faa6113c41b81368c5bbc2a764c2ae9bbc42e415

Task-number: QTBUG-20859
Change-Id: I05aaebfde45862836b10700aa7d9c64e4287466f
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoDon't rely on PlatformQuirks in qimagereader test
Jason McDonald [Fri, 4 Nov 2011 05:16:35 +0000 (15:16 +1000)]
Don't rely on PlatformQuirks in qimagereader test

The PlatformQuirks header is, by its author's own admission, based on
"very bad assumptions", those being that only Meego has quirks.

The assumption that only Meego has versions of libjpeg and libpng with
rounding errors is not a good assumption.  Change the test to be a
little tolerant of rounding error regardless of the platform, at least
until there's a reliable way to tell which libjpeg/libpng versions have
rounding errors.

Change-Id: Id2be5cc54739249b615bf3307ee1850c0a5c06b3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 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
Change-Id: Ia0a25931f4043359f72a6c0c14a74b905e40b93e
Reviewed-by: Eskil
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 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
(cherry picked from commit 8935a84e18804c7ff4b7336e3cfdf1cd558eaf1c)

Change-Id: I079c903d60e1bbcf78f555f8044dde69af82cf0e
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoUse standard spelling for two languages
Jiang Jiang [Thu, 1 Sep 2011 13:51:42 +0000 (15:51 +0200)]
Use standard spelling for two languages

Singhalese -> Sinhalese
Divehi -> Dhivehi

Change-Id: I3faa7163202a4a9be14e3cf857da60aa4dd3196f
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoQWidgets: Delayed creation of the QPlatformDialogHelper.
Friedemann Kleint [Wed, 2 Nov 2011 14:35:18 +0000 (15:35 +0100)]
QWidgets: Delayed creation of the QPlatformDialogHelper.

- Create helper only once and ensure deletion
- Move nativeDialogInUse into QDialogPrivate, ensuring the native
  modal helper is called from QDialog::exec() only if it is true

Change-Id: Id92b278bb051ce254458f276fbf7075689a7d491
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoRe-enabled passing tests in tst_qlistview
Jo Asplin [Tue, 1 Nov 2011 13:18:31 +0000 (14:18 +0100)]
Re-enabled passing tests in tst_qlistview

To increase the effective test coverage, this patch
re-enables the tst_qlistview test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: I029be60c16cdff5ee3e38889d2780f1ee7d01b51
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoAdd QT_MODULE(Gui) macro
Sergio Ahumada [Mon, 31 Oct 2011 20:37:57 +0000 (21:37 +0100)]
Add QT_MODULE(Gui) macro

Fixing `macros' function test of `tst_headers'

Task-number: QTQAINFRA-324
Change-Id: Ib6fcf276108bbb5515a72f3f17b373de82a599fc
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoQtGui: Fix compilation with gcc 4.4
Friedemann Kleint [Tue, 1 Nov 2011 13:36:20 +0000 (14:36 +0100)]
QtGui: Fix compilation with gcc 4.4

- Do not mix QStringLiteral and Q_TR_NOOP.
- Replace static QString member variables by
- static member functions to return the strings.
- Use tr() since QAccessibleActionInterface declares it.

Acked-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: Iabbee8ef61a5d7bfd35978a3f1cce1866329d065
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
13 years agotest: Skipping tst_qmdisubwindow::setFont() as it's unstable
Sergio Ahumada [Thu, 3 Nov 2011 17:56:10 +0000 (18:56 +0100)]
test: Skipping tst_qmdisubwindow::setFont() as it's unstable

This unstable test is preventing some good changes from being
merged. Further investigation needs to follow, so people can
refer to QTBUG-22544 for a real fix.

Change-Id: I038e5f340ccd2562d0e67428af595a2bcfc8c11d
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoFixed returned geometry of toplevel child widgets
Oliver Wolff [Thu, 3 Nov 2011 12:08:51 +0000 (13:08 +0100)]
Fixed returned geometry of toplevel child widgets

If a widget has got a parent widget but also is a toplevel widget it
should not return its geometry relative to its parent.
In addition to that, child widgets which are not toplevel should not
change their left and top values according to their parent but also
keep their width and height intact.

Change-Id: I5e641abf5ddc0b8d056ba023f8de52af1d2ccc9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix unstable test due to a race in QThread
Bradley T. Hughes [Thu, 3 Nov 2011 10:10:44 +0000 (11:10 +0100)]
Fix unstable test due to a race in QThread

QThread::finished() is emitted before setting the thread's state to
finished and !running, which means it's possible to receive the
finished() signal and act on it while QThread::isRunning() still
returns true.

This test randomly fails due to this race. Fix it by using checking
the return value of QThread::wait() instead.

Change-Id: Ibf347fc9a2e8d32b328227ee6978e1129dd781f4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoQThread::isFinished should return true from finished()
Olivier Goffart [Thu, 3 Nov 2011 13:11:34 +0000 (14:11 +0100)]
QThread::isFinished should return true from finished()

and isRunning() should return false.

This restore the Qt 4.7 behaviour

In Qt 4.7, the finished() was called with the thread's intenal mutex
locked. Which mean that:
 - Call to isRunning or isFinished called from a slot connected to
   finish within the thread would deadlock. (Hence no compatibility
   to keep here)
 - Call to isRunning or isFinished from a slot connected with
   QueuedConnection in another thread would lock the mutex until
   the destructors are finished. and then return as if the thread have
   finished.

Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoEnable deprecated feature for now
Olivier Goffart [Wed, 26 Oct 2011 18:25:35 +0000 (20:25 +0200)]
Enable deprecated feature for now

Rationale is that it makes it possible to deprecate functions without
breaking other modules.

After the feature freeze, this should be reset to 5

Notice that QT_DEPRECATED is not defined while bootstrapping Qt
(QT_NO_DEPRECATED defined)

This also means that compilation is tested

Change-Id: I85f0e65ac3a160e9aba3833787ded3f94304cb90
Reviewed-by: David Faure <faure@kde.org>
13 years agoRenamed QTextLayout member variable for readability
Pekka Vuorela [Wed, 2 Nov 2011 11:30:38 +0000 (13:30 +0200)]
Renamed QTextLayout member variable for readability

Class complex enough already without int i as member variable.
Furthermore, some methods use loop variable with same name, shadowing
the member one.

Change-Id: Idf2f5e34f130a60eb6121480e596e443f23641dd
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoDocumented side-effect of QTextLayout::setPreeditArea()
Pekka Vuorela [Wed, 2 Nov 2011 08:53:09 +0000 (10:53 +0200)]
Documented side-effect of QTextLayout::setPreeditArea()

Invalidates layout and requires layouting again.

Change-Id: I1cb954f155e4fc1df4b217478998ac903cc18323
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoFix regular expression when replacing headers
Harald Fernengel [Wed, 2 Nov 2011 23:42:32 +0000 (00:42 +0100)]
Fix regular expression when replacing headers

Use non-greedy capturing where it makes sense, also
keep the user's whitespace indentation in his include statements

Change-Id: Iff2b5dabf443529292e943ae69427bd15e702bf9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRemove empty functions from QDirModel test.
Jason McDonald [Thu, 3 Nov 2011 05:07:09 +0000 (15:07 +1000)]
Remove empty functions from QDirModel test.

Change-Id: Ieb8af41425739f9175df26224b171cd9f8b3c4f3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove QDirModel autotest
Jason McDonald [Tue, 1 Nov 2011 01:34:09 +0000 (11:34 +1000)]
Improve QDirModel autotest

The unreadable() test function has been disabled since before the tests
were imported into the Qt repository.  The idea of the test seems valid
(though the original implementation failed to correctly create an
unreadable file), so it should be re-enabled.

Change-Id: I94634bc5785dfbfbb42ca975badaead7fe812b29
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix getting of enviroment strings in testlib
Jason McDonald [Wed, 2 Nov 2011 08:39:20 +0000 (18:39 +1000)]
Fix getting of enviroment strings in testlib

The standard C getenv() returns NULL if the requested environment
variable is not found.

In Qt4 and later, qgetenv() does not return a null pointer if the
requested environment string is not defined.  Instead it returns a
QByteArray containing an empty string.  If using qgetenv(), there is no
way to tell the difference between an undefined environment variable
and one which is defined to be the empty string.

In testlib, all calls to qgetenv() were checking whether the returned
QByteArray's constData() returned a null pointer, but that would never
happen.  These calls must instead check whether the QByteArray contains
a non-empty string.

Change-Id: I342f0e8b196896c26cccce3ff169fa1b9669b5ff
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAllow extra selftests without modifying source.
Jason McDonald [Fri, 28 Oct 2011 08:19:05 +0000 (18:19 +1000)]
Allow extra selftests without modifying source.

Change-Id: I21708b725611eb64bdb0414cee08ca00dd62b213
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoGet rid of "#if 0" and skipped tests in QPainter autotest.
Samuel Rødal [Tue, 1 Nov 2011 07:12:07 +0000 (08:12 +0100)]
Get rid of "#if 0" and skipped tests in QPainter autotest.

qt_format_text_clip() and qt_format_text_boundingrect() have been
skipped ever since they were originally added to git, so I see no point
in keeping them.

The #if 0 in setEqualClipRegionAndPath() was ifdefed out from when that
specific test case was added (maybe it was failing to begin with?), but
it passes now, so we should enable it.

Change-Id: I6551e3b5612a4d4b00a969511af6abc85db43892
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoQStandardPaths: fix encoding of XDG_CONFIG_HOME env var
David Faure [Wed, 2 Nov 2011 17:15:37 +0000 (18:15 +0100)]
QStandardPaths: fix encoding of XDG_CONFIG_HOME env var

Change-Id: Ibb89f204fc93aed5a669f8f9efc7859845e6d493
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRe-enabled passing tests in tst_qgraphicsitem
Jo Asplin [Mon, 31 Oct 2011 08:33:35 +0000 (09:33 +0100)]
Re-enabled passing tests in tst_qgraphicsitem

To increase the effective test coverage, this patch
re-enables the tst_qgraphicsitem test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: If311bc61801d2a279c274928ae7f0faeb595eeb3
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoRe-enabled passing tests in tst_qgraphicsview
Jo Asplin [Mon, 31 Oct 2011 09:25:35 +0000 (10:25 +0100)]
Re-enabled passing tests in tst_qgraphicsview

To increase the effective test coverage, this patch
re-enables the tst_qgraphicsview test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: I6b8eb09000ece789b990a2dd697cdb8b47cc8e1c
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoRe-enabled passing tests in tst_qgraphicsscene
Jo Asplin [Mon, 31 Oct 2011 09:45:11 +0000 (10:45 +0100)]
Re-enabled passing tests in tst_qgraphicsscene

To increase the effective test coverage, this patch
re-enables the tst_qgraphicsscene test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Idd229532787ce8138d8e1c86daf1f91b90e87e38
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoMoved tests into network/ssl/
Jo Asplin [Tue, 1 Nov 2011 13:04:01 +0000 (14:04 +0100)]
Moved tests into network/ssl/

This commit moves qsslsocket_onDemandCertificates_member and
qsslsocket_onDemandCertificates_static from tests/auto/ to
tests/auto/network/ssl/.

Change-Id: I1593e113016ce7bb7dffbee82f1196275784d0ac
Reviewed-by: Holger Ihrig <holger.ihrig@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoAdding custom bezier easing curves to QEasingCurve
Thomas Hartmann [Wed, 2 Nov 2011 11:33:30 +0000 (12:33 +0100)]
Adding custom bezier easing curves to QEasingCurve

I added the possibilty to define Bezier/TCB splines and use them
as custom easing curves.

Note:
Splines have a parametric definition. This means we have a
function/polynom of t that evalutes to x and y. x/y = f(t).

For our purpose we actually need the function y = f(x).
So as a first step we have to solve the solution x = f(t) for a given
t and then in a second step we evaluate y = f(t).

f(t) is a cubic polynom so we use cardanos formula to solve this equation
directly.

For the casus irreducibilis we need 3 functions that are a combination of
arcos and cos. Instead of evaluating arcos and cos we approximate these
functions directly.

TCB splines are converted into the corresponding cubic bezier spline.

Change-Id: Id2afc15efac92e494d6358dc2e11f94e8c524da1
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoWindows platform plugin: Fix compiler warnings.
Friedemann Kleint [Wed, 2 Nov 2011 09:58:06 +0000 (10:58 +0100)]
Windows platform plugin: Fix compiler warnings.

Change-Id: Id7111ca74455b93aabb803babff51c4393508dbc
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
13 years agoUse C++11 static_assert
Olivier Goffart [Wed, 2 Nov 2011 09:26:50 +0000 (10:26 +0100)]
Use C++11 static_assert

Change-Id: I75aa2bc209cdc8869e7daa9fd0dd865ccf65a68e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoSilence warning from clang: semicolon before method body is ignored
Bradley T. Hughes [Mon, 31 Oct 2011 15:02:37 +0000 (16:02 +0100)]
Silence warning from clang: semicolon before method body is ignored

qnsview.mm:171:45: warning: semicolon before method body is ignored
      [-Wsemicolon-before-method-body]
- (void)handleMouseEvent:(NSEvent *)theEvent;
                                            ^

Change-Id: I0b2fdd9c28586ce03f14f784d35e88dbbb5bd8f4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
13 years agoDisable warnings while building QtV8
Bradley T. Hughes [Tue, 1 Nov 2011 12:45:01 +0000 (13:45 +0100)]
Disable warnings while building QtV8

This is a 3rd-party submodule that we do not directly modify. Warnings
from this code is of no value to people diagnosing and fixing warnings
in Qt code itself.

Change-Id: If17d9ce6509abb7d7aa1f00daf7e771fc6231993
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoTestlib: Remove remains of qpa.
Friedemann Kleint [Tue, 1 Nov 2011 07:42:14 +0000 (08:42 +0100)]
Testlib: Remove remains of qpa.

Link ApplicationServices in the non-qpa case (CoreServices
present).

Change-Id: I7555243aa480a7a4db84731a797924a97bf200cd
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agoReinstate disabled part of qsortfilterproxymodel test
Jason McDonald [Tue, 1 Nov 2011 06:45:36 +0000 (16:45 +1000)]
Reinstate disabled part of qsortfilterproxymodel test

This test function has been disabled since before the tests were
imported into the Qt repository in 2006, but seems to pass today, at
least on Linux.

Change-Id: I8ff90a11a0fbb260d66b20ae735b5f21c450a5af
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove stale test data from qsortfilterproxymodel test
Jason McDonald [Tue, 1 Nov 2011 05:59:40 +0000 (15:59 +1000)]
Remove stale test data from qsortfilterproxymodel test

The removed test data has been disabled since before the tests were
added to the Qt repository in June 2006, and was incomplete (the
"pattern" field was missing).

Change-Id: I974d03a4dcca76ba1a20f740372702612c8ce02b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled code from QWidget autotest.
Jason McDonald [Tue, 1 Nov 2011 05:52:34 +0000 (15:52 +1000)]
Remove disabled code from QWidget autotest.

The removed code was already disabled when first committed in January
2009.

Change-Id: I00a82f2e673fee76869cc76d756c36d081da2d2a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled code from qgridlayout autotest
Jason McDonald [Tue, 1 Nov 2011 05:33:12 +0000 (15:33 +1000)]
Remove disabled code from qgridlayout autotest

The removed code was already disabled when it was first added in June
2006, and is based on assumptions that no longer hold true.

Change-Id: Id7941d46e2a993aac422554dcc5540eb64eac492
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled test data from QUrl autotest
Jason McDonald [Tue, 1 Nov 2011 04:40:32 +0000 (14:40 +1000)]
Remove disabled test data from QUrl autotest

The removed test data was for obex URLs, which are not supported by
QUrl.

Change-Id: I166130ae936342d415165e46b7943d198de8986b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove redundant #if 1 from qdbusmarshall test
Jason McDonald [Tue, 1 Nov 2011 03:57:04 +0000 (13:57 +1000)]
Remove redundant #if 1 from qdbusmarshall test

Change-Id: I5342210cda1f02950667621e5e64d65d6357c6ce
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove redundant code from qsortfilterproxymodel test
Jason McDonald [Tue, 1 Nov 2011 03:53:11 +0000 (13:53 +1000)]
Remove redundant code from qsortfilterproxymodel test

Remove a couple of "#if 1" directives (but not their contents), which
have been present since before the tests were imported into the Qt
repository in 2006.

Change-Id: Id43aff37843e7a44ed96973f809de3838ba0e5b9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove QWidget autotest.
Jason McDonald [Tue, 1 Nov 2011 03:48:33 +0000 (13:48 +1000)]
Improve QWidget autotest.

Remove some "#if 1" directives and a line of debug code.

Change-Id: Ib34f5b65470a24ee499799525ffe0645ccc117fe
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove debugging code from qgraphicsitem autotest.
Jason McDonald [Tue, 1 Nov 2011 03:17:43 +0000 (13:17 +1000)]
Remove debugging code from qgraphicsitem autotest.

Change-Id: Ia2ff65b5e980b42c5c64b957143860e94395d54f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove unused code from qdbusmarshall test.
Jason McDonald [Tue, 1 Nov 2011 02:48:12 +0000 (12:48 +1000)]
Remove unused code from qdbusmarshall test.

The removed functions have been unsued since at least as far back as
2006.

Change-Id: Id1ea77dbfffa319c18891968f3aa378cfb563fd4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete code from qdbusmarshall test.
Jason McDonald [Tue, 1 Nov 2011 02:45:40 +0000 (12:45 +1000)]
Remove obsolete code from qdbusmarshall test.

The removed code had been disabled since 2007 and tested functionality
that was no longer supported.

Change-Id: I49dfe58601c1cc6d41590ab2980daba27eca6bfb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete code from qdbuspendingcall test
Jason McDonald [Tue, 1 Nov 2011 02:14:24 +0000 (12:14 +1000)]
Remove obsolete code from qdbuspendingcall test

The tested functionality hasn't been in the public API since 2008.

Change-Id: I2898da3730fa6248eea2e19779b33ccc793b7a31
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove disabled code in QItemView test.
Jason McDonald [Tue, 1 Nov 2011 01:52:29 +0000 (11:52 +1000)]
Remove disabled code in QItemView test.

The removed code was disabled in January 2007.  The commit history does
not make clear what the code was supposed to achieve and the code
doesn't do what the comment at the top says (that looks like a TODO).
Best to delete it and start again.

Change-Id: I42b6b1d865c96518d74dc189a4a41d0d2776e5bc
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoSilence warning from clang
Bradley T. Hughes [Tue, 1 Nov 2011 12:53:13 +0000 (13:53 +0100)]
Silence warning from clang

The original intent was most likely to memset() the entire MD5Context to
zero at the end of MD5Final(), which we do now.

In file included from tools/qcryptographichash.cpp:49:
...qtbase/src/corelib/../../include/QtCore/../../src/corelib/tools/../../3rdparty/md5/md5.cpp:139:24:
warning:
      argument to 'sizeof' in 'memset' call is the same expression as
the
      destination; did you mean to dereference it? [-Wsizeof-pointer-
        memset(ctx, 0, sizeof(ctx));    /* In case it's sensitive */
               ~~~            ^~~

Change-Id: I793c6f0944b89c0e4c5f9253cdb1071175c17152
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRemove test that hasn't been enabled since 2007.
Casper van Donderen [Mon, 31 Oct 2011 09:52:37 +0000 (10:52 +0100)]
Remove test that hasn't been enabled since 2007.

Task-number: QTBUG-22444

Change-Id: Id7569cf60cb314511a7d4f38833913c442f3fbba
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoRemove remains of qpa in tests.
Friedemann Kleint [Tue, 1 Nov 2011 14:07:31 +0000 (15:07 +0100)]
Remove remains of qpa in tests.

Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Change-Id: I41aed5290df5aebeb30ebf5d2796aca6c65980d1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix broken build.
Jędrzej Nowacki [Tue, 1 Nov 2011 13:41:10 +0000 (14:41 +0100)]
Fix broken build.

Variadic macros are not supported by C++98 standard.

Change-Id: Ib520297e43b654b46925f3ee2735a975ebbe8e35
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoAdd Q_PROPERTY declarations to QScreen.
Samuel Rødal [Mon, 31 Oct 2011 15:02:42 +0000 (16:02 +0100)]
Add Q_PROPERTY declarations to QScreen.

This means we can expose the API to QML in a simple way.

Change-Id: Ibc36711071d288ed78ce833a64d6be2f22fc4b62
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoTentatively keep operator=(const QAtomic* &other)
Bradley T. Hughes [Fri, 28 Oct 2011 18:10:32 +0000 (20:10 +0200)]
Tentatively keep operator=(const QAtomic* &other)

QAtomic* has a copy constructor, so it may make sense to allow
assignment of one atomic variable to another.

Change-Id: Ic754d13765080e2fcd13dc583940e354ad4404cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoqeventdispatcher_win: Fix warnings about QAtomicInt.
Friedemann Kleint [Tue, 1 Nov 2011 10:50:42 +0000 (11:50 +0100)]
qeventdispatcher_win: Fix warnings about QAtomicInt.

Change-Id: I2639fcee046ad3cc5de9c2635fdb6de4b757fc27
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
13 years agoRe-enabled passing tests in tst_qgraphicswidget
Jo Asplin [Mon, 31 Oct 2011 10:52:32 +0000 (11:52 +0100)]
Re-enabled passing tests in tst_qgraphicswidget

To increase the effective test coverage, this patch
re-enables the tst_qgraphicswidget test case as such, and
instead disables only the test functions that are currently
failing in CI.

Task-number: QTBUG-22453
Change-Id: Ic484fde3492f077453f47a959dd6dc862288dcaf
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
13 years agotst_qvariant: add a test QVariant works with not movable types
Olivier Goffart [Tue, 1 Nov 2011 10:24:10 +0000 (11:24 +0100)]
tst_qvariant: add a test QVariant works with not movable types

Soon, QVariant will use more internal storage. It is important
that it still work with not movable types

Also, check with type that are movable but cannot be copyed
without their copy constructor to be called such as QSharedDataPointer

Change-Id: I6d67755476e4822468599bebfa8774ad96a15306
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
13 years agoRevert "Fix use of qMax() with floating point constants"
Sergio Ahumada [Mon, 31 Oct 2011 14:17:39 +0000 (15:17 +0100)]
Revert "Fix use of qMax() with floating point constants"

This reverts commit 4e1b8720c1498edbb7a5bd37f622fdd3feb07850

Change-Id: I5e52a86119b522888b69fa261ebfa9168f885864
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoAppend -W* configure flags to QMAKE_C*FLAGS_WARN_ON
Bradley T. Hughes [Fri, 28 Oct 2011 18:05:34 +0000 (20:05 +0200)]
Append -W* configure flags to QMAKE_C*FLAGS_WARN_ON

... instead of adding them to all C*FLAGS. This makes it
possible to pass -Wno-warning-name to configure to disable
certain warnings enabled by default (which didn't work
previously). This also has the added benefit that only projects
that have CONFIG+=warn_on will get the extra warning flags.

Change-Id: I7bbc100155e02e7ccb9ac3be14bd8f585b7bc39b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoRemove debug code from qsortfilterproxymodel test
Jason McDonald [Mon, 31 Oct 2011 07:48:38 +0000 (17:48 +1000)]
Remove debug code from qsortfilterproxymodel test

Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.

Change-Id: I80691b274d9d2abda72bca894ace9de545410ed8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove QWidget autotest
Jason McDonald [Mon, 31 Oct 2011 07:44:11 +0000 (17:44 +1000)]
Improve QWidget autotest

There are two cases where a QCOMPARE may fail on some platforms. Rather
than disabling the QCOMPAREs with "#if 0", use QEXPECT_FAIL so that we
can look in the CI logs to see which platforms fail.

Change-Id: Ife93c8032e01a04e8068bf213e2040778c12f711
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove debug code from QLayout autotest.
Jason McDonald [Mon, 31 Oct 2011 07:33:42 +0000 (17:33 +1000)]
Remove debug code from QLayout autotest.

Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.

Change-Id: Id4efb74a2d3646f3554b643762beefba113c3602
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove debug code from QGridLayout autotest
Jason McDonald [Mon, 31 Oct 2011 07:32:21 +0000 (17:32 +1000)]
Remove debug code from QGridLayout autotest

Any test diagnostics that are useful should be part of the regular test
output, as the CI system cannot switch on commented-out code when there
is a test failure.

Change-Id: Ifd2bbd17677e16ddb0f1846287d722cdae76d984
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove obsolete test.
Jason McDonald [Mon, 31 Oct 2011 07:28:36 +0000 (17:28 +1000)]
Remove obsolete test.

The commit that disabled this test a few days after it was originally
comitted (bda80c4b in the grafted history) makes it clear that this
test was never valid.

Change-Id: Ib0090fc35d0b9251d7b7367de2c71a66a332c567
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoImprove QMenu autotest.
Jason McDonald [Mon, 31 Oct 2011 07:12:11 +0000 (17:12 +1000)]
Improve QMenu autotest.

Originally this commit was just going to reinstate the disabled line of
test data (after correcting it to use keyboard modifiers instead of
invalid bitwise-or of key-codes, which would trigger an assert in
qtestlib).  Unfortunately, this revealed a minor bug in QMenu, as
reported in QTBUG-22449, so a QEXPECT_FAIL has also been added.

Change-Id: I29699fcbfa353c037a83379a6140f0e3da5be027
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove S60/symbian specific code in plugins/bearer
Liang Qi [Mon, 31 Oct 2011 12:44:01 +0000 (13:44 +0100)]
Remove S60/symbian specific code in plugins/bearer

Clean up and remove Symbian specific code and data.

Change-Id: Icef41c22f143278a66f6a46ca80c495d083bf9a9
Reviewed-by: Alex <alex.blasche@nokia.com>
13 years agoUse QAtomicInt::store() instead of operator=(int)
Bradley T. Hughes [Mon, 31 Oct 2011 11:35:12 +0000 (12:35 +0100)]
Use QAtomicInt::store() instead of operator=(int)

... since the latter is now deprecated and will be removed.

Change-Id: I456c1bf93ebf119c028bc4a63f1f8a31f069b83b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFixes to the ibus input context
Lars Knoll [Mon, 31 Oct 2011 09:16:15 +0000 (10:16 +0100)]
Fixes to the ibus input context

Adjust to changes in the QPlatformInputContext
and implement commit(). Fix a bug that caused the
cursor to be hidden after the first commit.

Change-Id: I85e59a72766d1180a54df412cf33beb653af4e7b
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
13 years agoRemove S60/symbian specific mkspec
Liang Qi [Mon, 31 Oct 2011 12:34:01 +0000 (13:34 +0100)]
Remove S60/symbian specific mkspec

Clean up and remove Symbian specific mkspec.

Change-Id: I0fa75287720db92983422611e0090301d06814ec
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoRemove S60/symbian specific code in corelib/arch
Liang Qi [Mon, 31 Oct 2011 12:39:25 +0000 (13:39 +0100)]
Remove S60/symbian specific code in corelib/arch

Clean up and remove Symbian specific code and
data.

Change-Id: I41794085fd5122310b1fdf4c524c6e77d22e8500
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoImprove QMenu autotest
Jason McDonald [Mon, 31 Oct 2011 06:36:42 +0000 (16:36 +1000)]
Improve QMenu autotest

The test for keyboard navigation was only checking correct highlighting
when a menu item was not activated by the latest key-click.  It should
also check that no item is highlighted after an item is activated.

Change-Id: I443e154be5cdc2def4f12d3f0abab2cc1bc6e4a8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoHTTP proxy engine - accept standard Connection header
Shane Kearns [Wed, 26 Oct 2011 13:45:50 +0000 (14:45 +0100)]
HTTP proxy engine - accept standard Connection header

The Proxy-Connection header is a non standard header, but is widely
used so forming a de-facto standard.
Some proxies use the official Connection header, so we should check
for that in responses. Otherwise https connections over http proxy
fail in case the proxy sends "Connection: close" with the 407 reply.

Task-number: QTBUG-22177
Change-Id: If6cfa4ebb7ac9d97d65b6ddcc8257aee20ac0448
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoSSL documentation: correct enum name
Peter Hartmann [Mon, 31 Oct 2011 15:49:46 +0000 (16:49 +0100)]
SSL documentation: correct enum name

(cherry picked from commit 9d5c920bb23b949a0b98f1268679a0a2c06dd1d9)

Change-Id: Id99040051afe97bca3b1a8e4e3ae5a4c7f617cc9
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
13 years agomkspecs: Remove qpa conditionals.
Friedemann Kleint [Fri, 28 Oct 2011 08:43:07 +0000 (10:43 +0200)]
mkspecs: Remove qpa conditionals.

Preparing removal of -qpa from configure.

Change-Id: Id2f784206f97729c739cf20504a2a9428ddc1cce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoUpdate enums in documentation.
Casper van Donderen [Mon, 31 Oct 2011 09:41:13 +0000 (10:41 +0100)]
Update enums in documentation.

Change-Id: Ic48051cc832dc8bc06df2e82c54388df60208e39
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoReimplement GLTexture::failed() properly in GLRenderTargetCube
Bradley T. Hughes [Mon, 31 Oct 2011 13:48:33 +0000 (14:48 +0100)]
Reimplement GLTexture::failed() properly in GLRenderTargetCube

The GLRenderTargetCube::failed() method needs to be const.

Change-Id: I9bfa031e284b62c86a9be786aea3b851582b71f4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
13 years agoAdd file from qtdoc.
Casper van Donderen [Mon, 31 Oct 2011 09:40:31 +0000 (10:40 +0100)]
Add file from qtdoc.

Change-Id: I0e76b1eb0195a621ca3888e2194bdd7fd10f6251
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoRemove Symbian support from bind enum documentation.
Robin Burchell [Sun, 23 Oct 2011 18:06:18 +0000 (20:06 +0200)]
Remove Symbian support from bind enum documentation.

Symbian is no longer a supported platform.

Change-Id: Ifcb2e05661b16acc6307a4ccfaa42586750734c1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoMove support for socket binding from QUdpSocket upstream to QAbstractSocket.
Robin Burchell [Sun, 23 Oct 2011 18:04:52 +0000 (20:04 +0200)]
Move support for socket binding from QUdpSocket upstream to QAbstractSocket.

This should be API-compatible with Qt 4, but is not ABI-compatible, due to
removing the enum from QUdpSocket.

Task-number: QTBUG-121
Change-Id: I967968c6cb6f96d3ab1d6300eadd5bde6154b300
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
13 years agoSet localAddress and localPort on socket binding.
Robin Burchell [Mon, 24 Oct 2011 16:36:23 +0000 (18:36 +0200)]
Set localAddress and localPort on socket binding.

This should have always been the case, as it simply makes sense, but the
upcoming moving of binding to QAbstractSocket will require this for autotesting.

Change-Id: Ieef70196616227e7914c76fff5388a4068c36efb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
13 years agoRemove declaration of QRasterPlatformPixmap::fromFile()
Bradley T. Hughes [Mon, 31 Oct 2011 13:58:56 +0000 (14:58 +0100)]
Remove declaration of QRasterPlatformPixmap::fromFile()

This function is not implemented, and the declaration hides the virtual
QPlatformPixtmap::fromFile():

../../include/QtGui/5.0.0/QtGui/private/../../../../../src/gui/image/qpixmap_raster_p.h:70:10:
warning:
      'QRasterPlatformPixmap::fromFile' hides overloaded virtual function
      [-Woverloaded-virtual]
    void fromFile(const QString &filename, Qt::ImageConversionFlags flags);
         ^
../../include/QtGui/../../src/gui/image/qplatformpixmap_qpa.h:90:18:
note:
      hidden overloaded virtual function 'QPlatformPixmap::fromFile' declared
      here
    virtual bool fromFile(const QString &filename, const char *format,
                 ^

Change-Id: Iedbc4acd9f9218f8fe72a44a9eff6a35b5494d75
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoMove QPrinter::init() to QPrinterPrivate::init()
Bradley T. Hughes [Mon, 31 Oct 2011 13:10:52 +0000 (14:10 +0100)]
Move QPrinter::init() to QPrinterPrivate::init()

This method is private, and only called from the QPrinter constructor.
This also removes warnings about overloading the virtual
QPaintDevice::init() method interitted form QWidget:

../../include/QtPrintSupport/../../src/printsupport/kernel/qprinter.h:259:10:
warning:
      'QPrinter::init' hides overloaded virtual function [-Woverloaded-
    void init(PrinterMode mode);
         ^
../../include/QtGui/../../src/gui/painting/qpaintdevice.h:93:18: note:
hidden
      overloaded virtual function 'QPaintDevice::init' declared here
    virtual void init(QPainter *painter) const;
                 ^

Change-Id: I7c5203a1264b0ad825ed4075b66017fef22a40fb
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
13 years agoDoc: Fixing typos
Sergio Ahumada [Sun, 30 Oct 2011 16:34:46 +0000 (17:34 +0100)]
Doc: Fixing typos

Change-Id: I445b4cb0fe88d775c9421fbf1e8b7bb76dec0fc4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoRe-added hellogl_es and ES 1 support for QOpenGLContext.
Samuel Rødal [Mon, 24 Oct 2011 12:35:50 +0000 (14:35 +0200)]
Re-added hellogl_es and ES 1 support for QOpenGLContext.

Change-Id: I576cf3595cdeeefb4ed840bb3b2b7097b3609cc7
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoQRecursiveMutexPrivate should not inherit from QMutexPrivate
Olivier Goffart [Thu, 20 Oct 2011 15:11:18 +0000 (17:11 +0200)]
QRecursiveMutexPrivate should not inherit from QMutexPrivate

QMutexPrivate takes more memory than necessary, and also initialize
platform specific ressources.

Change-Id: I70be1b89b1c21499645785ae47693a6b2514e28b
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>