profile/ivi/qtbase.git
12 years agoCONFIG+=uitools is deprecated. Use QT+=uitools instead
Sergio Ahumada [Tue, 30 Oct 2012 10:15:35 +0000 (11:15 +0100)]
CONFIG+=uitools is deprecated. Use QT+=uitools instead

Change-Id: I45105e5e1dde614d90b1fb392b6e01e698c27a7f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
12 years agotest: Remove QSKIP from tst_QSettings::dontReorderIniKeysNeedlessly()
Sergio Ahumada [Tue, 30 Oct 2012 18:18:27 +0000 (19:18 +0100)]
test: Remove QSKIP from tst_QSettings::dontReorderIniKeysNeedlessly()

Change-Id: I7b804592398869278e9a0fec982c235c41f2c3d7
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
12 years agotest: Moving tst_QMimeDatabase::inheritsPerformance() test
Sergio Ahumada [Tue, 30 Oct 2012 18:32:39 +0000 (19:32 +0100)]
test: Moving tst_QMimeDatabase::inheritsPerformance() test

tst_QMimeDatabase::inheritsPerformance() is not an unit test but a
performance test, so moving it from 'tests/auto/corelib/mimetypes/qmimedatabase'
to 'tests/benchmarks/corelib/mimetypes/qmimedatabase'

Change-Id: I59e84f61559023659f101666683870f2ca1d2034
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdding PAC and exclusion list support to BlackBerry Qt proxy implementation.
Andrey Leonov [Fri, 26 Oct 2012 18:56:37 +0000 (14:56 -0400)]
Adding PAC and exclusion list support to BlackBerry Qt proxy implementation.

The additional proxy functionality is only available starting BPS API version 3.1.1.

Change-Id: Iadd2950119fa1dca706e8cd34804b038e3f704bc
Reviewed-by: Peter Hartmann <phartmann@rim.com>
12 years agoUse qt-project.org in tst_hostinfo - qt.nokia.com changed IP address.
Janne Anttila [Wed, 31 Oct 2012 14:54:18 +0000 (16:54 +0200)]
Use qt-project.org in tst_hostinfo - qt.nokia.com changed IP address.

qt.nokia.com is also going to disapper in future, so I think it is better
to use qt-project.org.

Change-Id: Ice550fe657a33609472b8e4b8630d7649f9c9fb5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
12 years agoGenerate instances of types in the CMake tests.
Stephen Kelly [Mon, 29 Oct 2012 14:46:26 +0000 (15:46 +0100)]
Generate instances of types in the CMake tests.

All modules currently have a test_modules CMake test. The
new module_includes test has very similar requirements, and can
obsolete the hand-maintained test_modules tests in all modules.

After all test_modules have been removed in other repos, the
module_includes test can be renamed to that name.

The types chosen need to have a constructor which can be invoked
with no arguments. QtConcurrent has no public classes which fit
that description so it is still tested separately

Change-Id: Id7929cd32b3112c293cbf5e6964cc894a697f9b1
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoadd qml1_{module,plugin}.prf
Oswald Buddenhagen [Fri, 26 Oct 2012 13:26:34 +0000 (15:26 +0200)]
add qml1_{module,plugin}.prf

these are in fact thin wrappers around the qml2 variants, which got
respective hooks.

Change-Id: I1190856aea3f454b6f163e147d39c707a35ec4c6
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix QCommonStylePrivate::stopAnimation()
J-P Nurmi [Tue, 30 Oct 2012 14:38:32 +0000 (15:38 +0100)]
Fix QCommonStylePrivate::stopAnimation()

Make sure that QCommonStylePrivate::animation() does
not return an animation that was already stopped.

Change-Id: I35b7f8e0fabff9908f247b3632e35388e2c95a6d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
12 years agoAdd QNumberStyleAnimation for fading out scroll bars on Mac
J-P Nurmi [Tue, 23 Oct 2012 12:39:26 +0000 (14:39 +0200)]
Add QNumberStyleAnimation for fading out scroll bars on Mac

Change-Id: I6a85ed069a418d62078af6490a3d3186d5599a95
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
12 years agoPixel-align vertical metrics in QTextLayout again
Eskil Abrahamsen Blomfeldt [Mon, 29 Oct 2012 14:16:55 +0000 (15:16 +0100)]
Pixel-align vertical metrics in QTextLayout again

To avoid regressing due to de58eb64bc564fcb8af61a45576783e432d2380c,
we need to return a pixel aligned height in QTextLine::height() and
also use pixel aligned heights when calculating the position of
lines as well as the bounding rect of the layout.

Later, we can add a QTextLine::naturalHeight()
or something like that which gives the fractional value, but until then,
we need to access private API in QPainter to get the correct
alignment, since we still don't want to align the height of the
last line in the layout, we only want to align the origin of each
line.

Task-number: QTBUG-27740
Change-Id: I12325f07d33aaf1a1b967e0a11492759d0f565d9
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoQNX: Use inotify on QNX systems that support it
Thomas McGuire [Wed, 15 Aug 2012 13:53:43 +0000 (15:53 +0200)]
QNX: Use inotify on QNX systems that support it

Change-Id: Ia9bf8d3c202b17746036e203268ef6229aaa900d
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoANGLE: Add TextureSSE2.cpp to SSE2_SOURCES.
Jason Barron [Fri, 26 Oct 2012 14:22:49 +0000 (16:22 +0200)]
ANGLE: Add TextureSSE2.cpp to SSE2_SOURCES.

This file needs to be compiled with SSE2 intrinsic support.
It happens to compile on x64 system because SSE2 is implied
here, but on 32-bit compilers (in this case MinGW 32-bit) it
needs to be explicit.

Change-Id: I92dd5bc9257b6dd344ab02341475c023327b756a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
12 years agoGenerate a .qmake.cache in config.tests from configure.exe.
Jason Barron [Mon, 29 Oct 2012 09:17:33 +0000 (10:17 +0100)]
Generate a .qmake.cache in config.tests from configure.exe.

We need to generate a .qmake.cache file in the config.tests
directory on Windows to ensure that the config.tests can
actually be compiled before the qmodule.pri is created.

Task-number: QTBUG-27708
Change-Id: I8d9397a8cbdb2aa19a5318497177d76049f9fa91
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
12 years agoSend leave to most recently entered window when modal dialog is shown.
Miikka Heikkinen [Tue, 30 Oct 2012 08:21:36 +0000 (10:21 +0200)]
Send leave to most recently entered window when modal dialog is shown.

If a modal dialog was shown as a response to button click, the button
retained its hover highlight, because it didn't get leave event.

Fixed by tracking the most recently entered window and sending a leave
to it when modal dialog is shown that blocks it.

Also modified tst_QGuiApplication::modalWindow() autotest to check
for enters and leaves.

Task-number: QTBUG-27644
Change-Id: I387647e18a762a39d523e3df31221b9583a39f9d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoOnly use the user set page margins for custom paper
Andy Shaw [Thu, 25 Oct 2012 04:43:01 +0000 (06:43 +0200)]
Only use the user set page margins for custom paper

When the QPrinter is initalized then it will set up page margins based
on the default paper size. If the paper size is changed to be a custom
one then it should disregard the margins for the default paper size.

If the page margins are set explicitly beforehand then it will use these
page margins.

Change-Id: Ic535c3a80b8b217dbd5eb5f4fb2cbc0ab1354563
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
12 years agotest: Remove QSKIP from tst_QByteArray::literals()
Sergio Ahumada [Mon, 29 Oct 2012 22:13:05 +0000 (23:13 +0100)]
test: Remove QSKIP from tst_QByteArray::literals()

Change-Id: I07b53cd12790d2161964dd09c5a69fe8aff7c90d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
12 years agotest: Remove QSKIP from tst_QPainter::drawText_subPixelPositionsInRaster_qtbug5053()
Sergio Ahumada [Mon, 29 Oct 2012 22:21:35 +0000 (23:21 +0100)]
test: Remove QSKIP from tst_QPainter::drawText_subPixelPositionsInRaster_qtbug5053()

Change-Id: I1aa329323767a3e849beca8fe41e39dbe98de4ee
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
12 years agotest: Remove QSKIP from tst_QListView::setCurrentIndexAfterAppendRowCrash
Sergio Ahumada [Mon, 29 Oct 2012 22:27:51 +0000 (23:27 +0100)]
test: Remove QSKIP from tst_QListView::setCurrentIndexAfterAppendRowCrash

Change-Id: I8d48722b412895e43aa8a522354c5d67d83c19dd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
12 years agoQNX: Remember information on whether a file is a link
Thomas McGuire [Mon, 29 Oct 2012 11:00:14 +0000 (12:00 +0100)]
QNX: Remember information on whether a file is a link

This avoids an additional call to lstat() When using QDir::entryList()
with the QDir::NoSymLinks flag.

Change-Id: I3b602546c6a4502ae25a5748a12c60e69325bb5d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: João Abecasis <joao@abecasis.name>
12 years agoBring back native dialogs for Windows XP.
Friedemann Kleint [Wed, 24 Oct 2012 15:00:08 +0000 (17:00 +0200)]
Bring back native dialogs for Windows XP.

The  CLSID_FileOpenDialog, CLSID_FileSaveDialog-based dialogs
are available from Windows Vista on only, the old Shell-function
based ones are required for Windows XP.

Add a command line argument to switch dialog types.

Extract some common functionality for both dialog types.

Task-number: QTBUG-27621

Change-Id: I224c5c4574c2ff54daf354f00d3d1f82abc6f459
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
12 years agoMac: Correct writingSystem check value for Chinese
Liang Qi [Mon, 29 Oct 2012 12:12:13 +0000 (13:12 +0100)]
Mac: Correct writingSystem check value for Chinese

For simplified and traditional Chinese.

Based on the Apple doc: Internationalization Programming Topics -
Language and Locale Designations.

Task-number: QTBUG-27130

Change-Id: I677563525edd607583561be20f4dbed24b2443a5
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
12 years agoCocoa: Disable touch events.
Morten Johan Sorvig [Wed, 17 Oct 2012 08:16:07 +0000 (10:16 +0200)]
Cocoa: Disable touch events.

Enabling touch events has a negative impact on overall
performance. In particular, enabling touch events seems
to disable scroll event compression, resulting scroll
processing lag.

Until we find a solution where we can have both proper
scrolling and touch events we choose scrolling over
touch events. Applications that disagree can enable
touch events manually:

NSView *qtView = (NSView *)QGuiApplication::platformNativeInterface()->
nativeResourceForWindow("nsview", qtWindow);
[qtView setAcceptsTouchEvents:YES];

Change-Id: I85cdd6e8c8ed8685c6cd5418c89fed6af02887cd
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
12 years agoUse -ffunction-sections in libbootstrap.a
Thiago Macieira [Sun, 28 Oct 2012 02:28:25 +0000 (19:28 -0700)]
Use -ffunction-sections in libbootstrap.a

So that the linker discards unused functions too. Some of our .cpp are
way too big

Change-Id: I1a2685be6a5e7fd3cf34f18d545483c63c2343dd
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
12 years agoCheck for both A and P when converting QDateTime to string.
Mitch Curtis [Thu, 18 Oct 2012 16:51:20 +0000 (18:51 +0200)]
Check for both A and P when converting QDateTime to string.

hasUnquotedAP currently only checks for an a or A, which is wrong
according to both the toString documentation and the comments for
hasUnquotedAP.

Change-Id: I03015734b846fe761085cf8f8fca2b29210cff97
Reviewed-by: Jon Severinsson <jon@severinsson.net>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
12 years agoDefine additional math.h constants if not already defined
Jonathan Liu [Fri, 19 Oct 2012 09:54:32 +0000 (20:54 +1100)]
Define additional math.h constants if not already defined

The M_E, M_PI_2, etc. math.h constants are not defined with MinGW-w64
GCC when compiling with -std=c++11.

Task-number: QTBUG-27561
Change-Id: I2267c170dd3788abc9c37425a9be514bbae51f5a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Alexey Pavlov <alexpux@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQtNetwork: introduce configure switch to use system proxies by default
Peter Hartmann [Tue, 23 Oct 2012 13:31:20 +0000 (15:31 +0200)]
QtNetwork: introduce configure switch to use system proxies by default

This option is opt-in (default: no). When configured with
"-proxies-system-default", Qt automatically picks up the system
proxies.

Change-Id: I8cc002f29587854f448d97117b08c43d8eedec76
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agoRemove qstandardpaths_json.cpp
Thiago Macieira [Sat, 27 Oct 2012 16:22:42 +0000 (09:22 -0700)]
Remove qstandardpaths_json.cpp

This implementation is unused. It was part of a platform that will
unfortunately not see the light of day. Remove it since no one is
maintaining it.

Change-Id: I9e675225a32f227739c688608f937df66a14e9a4
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agoQMap - improve QMap stl-map ctor
Thorbjørn Lund Martsum [Sun, 28 Oct 2012 14:36:11 +0000 (15:36 +0100)]
QMap - improve QMap stl-map ctor

We can insert directly on the most left-most Node.

We always enforce an insert here (unlike the insert call),
but that is not a problem since the keys in a std::map are unique.

Change-Id: Ib409b90ffc57a5a43dab4a4b08d34f6fdabd057f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agoQSyntaxHighlighter: minor code de-duplication
Konstantin Ritt [Sat, 27 Oct 2012 06:11:36 +0000 (09:11 +0300)]
QSyntaxHighlighter: minor code de-duplication

The (r.start != -1) case is equal to (i == formatChanges.count()) case
in the loop; no need to exit the loop just to do exactly what it did.

Change-Id: I4129d8012399895c2fce70b26716ca5aeadee79c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
12 years agofix tool invocation for -prefix + -framework builds on macx
Oswald Buddenhagen [Mon, 29 Oct 2012 10:18:06 +0000 (11:18 +0100)]
fix tool invocation for -prefix + -framework builds on macx

set DYLD_FRAMEWORK_PATH instead of DYLD_LIBRARY_PATH

Change-Id: I9849f12063b8c7a45d040c087f4611c3a48180b8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agolet qt_tool.prf set up DESTDIR
Oswald Buddenhagen [Fri, 26 Oct 2012 17:59:09 +0000 (19:59 +0200)]
let qt_tool.prf set up DESTDIR

Change-Id: Ie30066566fe25859b2a661970b11a58e69361b1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agointroduce tool_plugin CONFIG flag
Oswald Buddenhagen [Wed, 24 Oct 2012 12:03:47 +0000 (14:03 +0200)]
introduce tool_plugin CONFIG flag

while plugins for libraries need to follow the -debug-and-release switch,
plugins for tools must follow the single-config approach of tools.

Change-Id: I8a79e98034d2ff8b5d4e6191a9143c9472a5aa02
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agoVERSION makes no sense for plugins
Oswald Buddenhagen [Wed, 24 Oct 2012 11:43:13 +0000 (13:43 +0200)]
VERSION makes no sense for plugins

Change-Id: I7af058eec1c5a0fdbd9848d2dc2f6bd76ca4747e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agonamespace "module" pri files
Oswald Buddenhagen [Wed, 24 Oct 2012 13:03:49 +0000 (15:03 +0200)]
namespace "module" pri files

we now have tool and soon plugin pri files. make them easily
distinguishable.

Change-Id: I8904e4182227a78060121e8712446bc43b1dd185
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agokill $$mod_component_base & $$mod_qmake_base
Oswald Buddenhagen [Tue, 23 Oct 2012 20:19:53 +0000 (22:19 +0200)]
kill $$mod_component_base & $$mod_qmake_base

use $$MODULE_BASE_OUTDIR & $$MODULE_QMAKE_OUTDIR directly.
this is a no-op, except that now module pris will be built in qtbase for
all modules when building without -prefix - which is only consistent with
all other artifacts.

Change-Id: I2965b2c7a15aa9e82ba6017f5f4c0daa14b6e6fe
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agocentralize module directory calculation
Oswald Buddenhagen [Tue, 23 Oct 2012 20:15:43 +0000 (22:15 +0200)]
centralize module directory calculation

Change-Id: I5db529676b3287013008f28623a541fee1cde6a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agoredo QT_PLUGIN_PATH assembly for non-installed execution
Oswald Buddenhagen [Thu, 20 Sep 2012 10:53:33 +0000 (12:53 +0200)]
redo QT_PLUGIN_PATH assembly for non-installed execution

it is a bad idea to extract plugin paths from library modules.
instead, just collect plugin paths from all known repositories.

Change-Id: I527325f20e9cf98ae974997530af1b2893537e5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
12 years agoQFontEngineMulti: Fix possible crash in stringToCMap()
Konstantin Ritt [Mon, 29 Oct 2012 10:03:34 +0000 (12:03 +0200)]
QFontEngineMulti: Fix possible crash in stringToCMap()

in case when the layout is partially initialized.
We shouldn't access any data except of indices
if GlyphIndicesOnly flag has been passed in.

Change-Id: I264689b498e0f9de8b5c040d47dbae4f6ef391c4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
12 years agoRemove some dead code
Jan Arve Saether [Fri, 26 Oct 2012 09:01:47 +0000 (11:01 +0200)]
Remove some dead code

This code became dead when the Symbian code was removed, and should
ideally have been removed at that point.

You can find the old code in 4.8 repo:
    bool showSystemDialogFullScreen = false;

    if (qobject_cast<QFileDialog *>(this) || qobject_cast<QFontDialog *>(this) ||
         qobject_cast<QWizard *>(this)) {
         showSystemDialogFullScreen = true;
    }

    if (showSystemDialogFullScreen) {
        setWindowFlags(windowFlags() | Qt::WindowSoftkeysVisibleHint);
        setWindowState(Qt::WindowFullScreen);
    }

So, obviously, stuff inside the #ifdef Q_OS_SYMBIAN was removed, but
the side-effect of that was not realized.....

Change-Id: I6b5d1066c97367c354af4da1ce6b9c60c8dc2120
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
12 years agoDo the actual removal of the Soft Keys API and related code
Jan Arve Saether [Mon, 22 Oct 2012 11:48:59 +0000 (13:48 +0200)]
Do the actual removal of the Soft Keys API and related code

In addition to the actual removal of the softkeys API in QAction,
this commit removes some enums related to the softkeys feature:
  Qt::WA_MergeSoftkeys
  Qt::WA_MergeSoftkeysRecursively

It also removes some "zombie" enums:
  Qt::WindowSoftkeysVisibleHint = 0x40000000,
  Qt::WindowSoftkeysRespondHint = 0x80000000,

  (The only implementation that used these were removed when
  qapplication_s60.cpp and qwidget_s60.cpp were removed.)

Change-Id: Ib6fc6d543def4757383d5f19256199d9d190c614
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
12 years agoFix build on MinGW after 0f14ea3f3a05ef785b44fa610bf90ff3b5ba7beb
Konstantin Ritt [Sat, 27 Oct 2012 11:52:42 +0000 (14:52 +0300)]
Fix build on MinGW after 0f14ea3f3a05ef785b44fa610bf90ff3b5ba7beb

Also generalize set _WIN32_WINNT to 0x0501 and _WIN32_IE to 0x0501 globally,
as it is out minimal requirement these days.

Change-Id: I8ca9102d49c37f908fd8ac032f707f8fe4fdcb22
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agoTest: refactor tst_QProcess
Caroline Chao [Tue, 16 Oct 2012 11:56:49 +0000 (13:56 +0200)]
Test: refactor tst_QProcess

Remove QSKIP and instead omit the whole tests when appropriate.

Remove QSKIP from crashTest, crashTest2 and exitStatus on Windows,
the tests are now passing.

Add a guard in testForwarding to check if QT_NO_PROCESS is defined.

Change-Id: Icba4d773315e3bf87764a381742168b51cf169c0
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
12 years agoTest: remove QSKIP in tst_QEventLoop::throwInExec()
Caroline Chao [Thu, 18 Oct 2012 08:24:28 +0000 (10:24 +0200)]
Test: remove QSKIP in tst_QEventLoop::throwInExec()

Instead omit the whole test when appropriate.

Change-Id: I60c34b020f6e25e865bbe0182395d4fc6419f65e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agotest: Update task number for QAccesibilityLinux autotest.
Sergio Ahumada [Sat, 27 Oct 2012 09:46:37 +0000 (11:46 +0200)]
test: Update task number for QAccesibilityLinux autotest.

Reference tasks with detailed information of failures rather than generic
task for blacklisted tests.

Task-number: QTBUG-27732
Change-Id: I0f0f500d255ea8748dd98d066deeaf1dfcdb7ec8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
12 years agoRemove some dead code in switch statements
Sergio Ahumada [Sat, 27 Oct 2012 14:45:32 +0000 (16:45 +0200)]
Remove some dead code in switch statements

Following the Code Style described in
http://qt-project.org/wiki/Qt_Coding_Style#e289ee44592e9c32d4212069f0806daf

There is no need for a 'break' after a 'return'.

Change-Id: I1eca350391a7e4e14e504d60b24b69982cc5ac47
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoList possible matches when specifying invalid test function.
Friedemann Kleint [Mon, 29 Oct 2012 11:18:11 +0000 (12:18 +0100)]
List possible matches when specifying invalid test function.

List functions matching the command line parameter instead
of dumping all functions.

Change-Id: Ic504587b1036f09702f47579f90406333c4efbeb
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
12 years agoFix qfile:invalidFile() test.
Friedemann Kleint [Fri, 26 Oct 2012 15:18:22 +0000 (17:18 +0200)]
Fix qfile:invalidFile() test.

The test expects 'fail:invalid' to be an invalid file,
which it no longer is on Windows 7. It also assumes that
f: is an invalid drive. Fix by picking a drive that does not exist.

Task-number: QTBUG-27306
Change-Id: I9d9b36c50fc31d2561d3c4eec66f65d96084f0d7
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
12 years agoImplement QAccessibleLineEdit::characterRect()
Jan-Arve Saether [Tue, 14 Aug 2012 10:47:48 +0000 (12:47 +0200)]
Implement QAccessibleLineEdit::characterRect()

It was probably not implemented because it needed to access
private APIs.
However, accessing those from this a11y plugin is unproblematic.

Forward-ported from Qt 4.8 with change
d2fb64d52fc6ec229d775f829a9a0cb3d251aad3 (and then slightly improved)

Change-Id: Ifa2d48c152fd75fc1fff49a05369787a7db3b902
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
12 years agoEnable the "#include <QSql>" camel-case header, for the QSql namespace
Sze Howe Koh [Fri, 26 Oct 2012 12:58:33 +0000 (20:58 +0800)]
Enable the "#include <QSql>" camel-case header, for the QSql namespace

The sync.profile Perl script will now generate the "QSql" header file
during compilation. By removing the \inheaderfile command, the
documentation will now display the namespace's own name as the header
(i.e. "QSql" in this case).

Previously, the only documented way to include the namespace was to
include the whole module, which is expensive. This change also makes
QSql consistent with other namespaces, such as QSsl and QAudio, which
have their own dedicated camel-case headers.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007421.html)

Change-Id: Ibb82d442956e767c13b82f1e552aabdf2e8ff110
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoAccessibility: remove redundant role function
Frederik Gladhorn [Fri, 19 Oct 2012 13:08:42 +0000 (15:08 +0200)]
Accessibility: remove redundant role function

The role is already set through the ctor,
no need to explicitly do it again.

Change-Id: I0027068c66b5771b628a9fe10fbfe929e7bf1554
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
12 years agoAccessibility: make sure right objects are cached on linux
Frederik Gladhorn [Fri, 19 Oct 2012 09:13:09 +0000 (11:13 +0200)]
Accessibility: make sure right objects are cached on linux

This patch goes together with 730a5a994ff46055055c58b25bd059373dddb934
and is the second code path that deals with the hash of valid objects.

Change-Id: Ia7b0995cb667cfce5f7697aa61856e44f745a932
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
12 years agoBe more careful about asserting in accessibility.
Frederik Gladhorn [Thu, 18 Oct 2012 14:24:37 +0000 (16:24 +0200)]
Be more careful about asserting in accessibility.

It is possible to call the accessibility update for any widget,
even if it doesn't implement the right interfaces.

While that is bad, warning about it is better than asserting.

Change-Id: I23c0c783083f73fb816d75b2c9b78efd603edcb6
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
12 years agoDoc fixes for qcoreapplication.
Frederik Gladhorn [Tue, 16 Oct 2012 10:55:49 +0000 (12:55 +0200)]
Doc fixes for qcoreapplication.

Change-Id: I58806424b37ebf7bdf9b7f1ead9953b605332361
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
12 years agoClean up index handling in itemviews accessibility.
Frederik Gladhorn [Mon, 15 Oct 2012 12:22:25 +0000 (14:22 +0200)]
Clean up index handling in itemviews accessibility.

Change-Id: Icc017c7df9cb0dc4bf17e5168c1e3acda6af7523
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
12 years agoMake table test use smart pointers for interfaces.
Frederik Gladhorn [Mon, 15 Oct 2012 11:44:40 +0000 (13:44 +0200)]
Make table test use smart pointers for interfaces.

Change-Id: I9669da2ef398f12c4d6d584e7032dea13b148a81
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
12 years agomention QComboBox::currentText changes in change list
Mark Brand [Mon, 15 Oct 2012 22:53:29 +0000 (00:53 +0200)]
mention QComboBox::currentText changes in change list

Change-Id: Iaea8b8e7d86c29902d9c0d6a38058cea40f1c0b7
Reviewed-by: David Faure <david.faure@kdab.com>
12 years agoFix compilation: QChar(char) is "from ASCII"
Thiago Macieira [Fri, 26 Oct 2012 20:12:03 +0000 (13:12 -0700)]
Fix compilation: QChar(char) is "from ASCII"

This fixes the build if QT_NO_CAST_FROM_ASCII is defined.

Change-Id: I0273794a83b0adaa0c15a9910cbcc9ea5d48ef7a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
12 years agoQMap 5.0 - keep track of leftmost node (BIC)
Thorbjørn Lund Martsum [Thu, 27 Sep 2012 12:56:43 +0000 (14:56 +0200)]
QMap 5.0 - keep track of leftmost node (BIC)

This suggestion keeps track of the most left node.
The point is that constBegin() becomes a lot faster.

That speeds up iteration a bit, and makes it O(1) to get the
first element. The penalty in insert and remove is very small.
On large trees it seems to be less than 1%.

It should be noticed that constBegin() is a very common hint
on my planned change to 5.1, and this opperation will without
this patch cost 2 x log N. One when the user calls the hint
with begin - and one where it is compared with begin.

Other std::maps has a very fast begin(). E.g
http://www.cplusplus.com/reference/stl/map/begin/
(begin with constant time)

Change-Id: I221f6755aa8bd16a5189771c5bc8ae56c8ee0fb4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agoQMap - use hint on insert in QMap::toStdMap
Thorbjørn Lund Martsum [Mon, 1 Oct 2012 04:42:28 +0000 (06:42 +0200)]
QMap - use hint on insert in QMap::toStdMap

Giving the std-map a hint (normally) improves insert performance.
There seems to be no reason not to provide this hint.

Change-Id: I4344607ebf54574a3ae9666d87a41a3c14762361
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agotest: Remove dead code from tst_QPixmap
Sergio Ahumada [Fri, 26 Oct 2012 10:51:03 +0000 (12:51 +0200)]
test: Remove dead code from tst_QPixmap

Change-Id: I1945a0f431364f47a43cf7f600ad38fdba5f4a08
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoPrevent potential crash in QXcbCursor::queryPointer().
Samuel Rødal [Tue, 23 Oct 2012 15:19:29 +0000 (17:19 +0200)]
Prevent potential crash in QXcbCursor::queryPointer().

xcb_get_setup might return 0, but we already have it in QXcbConnection.

Task-number: QTBUG-27686
Change-Id: I58418aedd6bc121ae2b9605389beb3f6612d7fb7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agoCheck the EGL error before calling eglTerminate().
Samuel Rødal [Thu, 25 Oct 2012 12:36:45 +0000 (14:36 +0200)]
Check the EGL error before calling eglTerminate().

Otherwise we always get EGL_SUCCESS, which is not very informative.

Change-Id: I25311c14108ae385913aa9dc159a1f5fad142342
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
12 years agoRemoved usage of pipe in Blackberry event dispatcher
Bernd Weimer [Thu, 25 Oct 2012 08:53:35 +0000 (10:53 +0200)]
Removed usage of pipe in Blackberry event dispatcher

Using a pipe for thread wake-ups is inefficient and can introduce significant
latency. Replaced the pipe by directly sending a BPS event.

Refactored the wake-up code in the private class of the UNIX event dispatcher.

Change-Id: Ic073b0b56c3cbf8327fc6bc3c37132cc3583ef86
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
12 years agoChange one int to qint64 in QDateTime::setMSecsSinceEpoch(qint64)
Jon Severinsson [Thu, 25 Oct 2012 23:49:28 +0000 (01:49 +0200)]
Change one int to qint64 in QDateTime::setMSecsSinceEpoch(qint64)

This one was missed when the QDate range was extended.

Change-Id: I0dbcc9fdebca88f7397203d8e539429dcff9ac30
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQSqlRelationalDelegate: remove setEditorData reimplementation
Mark Brand [Sat, 13 Oct 2012 20:21:00 +0000 (22:21 +0200)]
QSqlRelationalDelegate: remove setEditorData reimplementation

Since commit 84787d82ee9369b2a83c5b0568ee62ab602a5528
QItemDelegate::setEditorData() works out of the box
on QComboBox.

Change-Id: Ic9839f7eccccbdb787ce204fe98311335ee16b92
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoSet the Directory flag when we find a directory.
Stephen Kelly [Fri, 13 Jul 2012 17:38:32 +0000 (19:38 +0200)]
Set the Directory flag when we find a directory.

Change-Id: I103a0b8e7b7ba673d00f920944026d7d04fac193
Reviewed-by: hjk <qthjk@ovi.com>
12 years agosimplify determination of static plugin link line
Oswald Buddenhagen [Thu, 20 Sep 2012 10:17:30 +0000 (12:17 +0200)]
simplify determination of static plugin link line

qt_debug & qt_release are dead, so collapse the respective paths and use
an existing function.

Change-Id: Ie800be477186a6eab72682d367b24e83c3b9bbc0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agotest: Don't fail if the network test server is not set up
Sergio Ahumada [Thu, 25 Oct 2012 17:42:33 +0000 (19:42 +0200)]
test: Don't fail if the network test server is not set up

Leftover from 704a4e4747b2c42e262d9b4bd440ff365ab92a35

Change-Id: I437da91be31259a748303bd7cf20ff0c8bcf53b4
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
12 years agoQt Core: Adding a landing page and sorted the documentation.
Jerome Pasion [Thu, 18 Oct 2012 13:37:50 +0000 (15:37 +0200)]
Qt Core: Adding a landing page and sorted the documentation.

-Added \annotatedlist for the groups
-Sorted and placed the pages on the index page.

Change-Id: Id1a4344c0b39f00036f5ac29b1fcb869d5602d2b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 years agoPossibility to change custom Drag&Drop cursors while dragging something. Implementati...
Cyril Oblikov [Thu, 27 Sep 2012 14:55:16 +0000 (17:55 +0300)]
Possibility to change custom Drag&Drop cursors while dragging something. Implementation for Windows and X11.

Additional checks to figure out if new Drag&Drop cursors where set. This means it is possible now to keep QDrag object in your program and call setDragCursor() method every time we need to change cursor depending on context.

Change-Id: I4be69e44b2863371a7ffbb29efc17c18210d6cde
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoRemove compatibility headers for QPA classes.
Friedemann Kleint [Mon, 22 Oct 2012 15:00:59 +0000 (17:00 +0200)]
Remove compatibility headers for QPA classes.

The handling of deprecated headers in syncqt causes those
headers to end up in the <QtGui> master include when
shadowbuilding on another drive on Windows.

Task-number: QTBUG-27497
Change-Id: I9318ae670c50bc010b6bf97cd5fd003e08db84c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoQGLTextureGlyphCache: Fix text rendering artifacts on NVIDIA
Jonathan Liu [Fri, 26 Oct 2012 11:53:56 +0000 (22:53 +1100)]
QGLTextureGlyphCache: Fix text rendering artifacts on NVIDIA

Check GL_VENDOR to test whether using NVIDIA graphics. On Linux,
GL_VERSION and GL_VENDOR contains "NVIDIA". On Windows, only
GL_VENDOR contains "NVIDIA".

Task-number: QTBUG-27658
Change-Id: I5e74d07ecb9522d1a86ac2953415a51bbdbe8c49
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoQComboBox: new signal currentTextChanged
Mark Brand [Sat, 13 Oct 2012 13:08:11 +0000 (15:08 +0200)]
QComboBox: new signal currentTextChanged

Adds NOTIFY to currentText property.

Test included.

Change-Id: I3e92b585ad6697891d61537c82f6ab9e8beb1a00
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQComboBox: fix use in QDataWidgetMapper/QItemDelegate
Mark Brand [Sat, 13 Oct 2012 11:41:30 +0000 (13:41 +0200)]
QComboBox: fix use in QDataWidgetMapper/QItemDelegate

QItemDelegate and QDataWidgetMapper use the WRITE method on the USER
property to set a value in a widget. This did not work for QComboBox
whose USER property currentText lacked a WRITE method.

This change adds the missing setter and flags it as the WRITE method.

The setter setCurrentText() simply calls setEditText() if the combo
box is editable. Otherwise, if there is a matching text in the list,
currentIndex is set to the corresponding index.

Test included.

Follow-up to 816c5540179362500dfc175b77f05abf3ef25233 which restored
currentText as the USER property.

Task-number: QTBUG-26501
Change-Id: I5f2f999e60b09728ca03ead4e28fe36d1f3ee189
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQHeaderView 5.0 - no emit of sortIndicatorChanged when unchanged
Thorbjørn Lund Martsum [Thu, 25 Oct 2012 04:49:20 +0000 (06:49 +0200)]
QHeaderView 5.0 - no emit of sortIndicatorChanged when unchanged

There is no reason to emit this when there is no change.

Change-Id: I34f0ceec7c4b0959b77bc5be3ce2c2ad55864598
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQt 5.0 - Add QHeaderView refactor to changes notes.
Thorbjørn Lund Martsum [Thu, 25 Oct 2012 13:44:11 +0000 (15:44 +0200)]
Qt 5.0 - Add QHeaderView refactor to changes notes.

Some widgets users could get the picture that nothing has
happened in that area. So lets at least write that something
has been improved.

Change-Id: Ic314ab06d28e687986a8ab472d8b58830cb0ad90
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAdd a CMake macro to test module includes
Stephen Kelly [Fri, 19 Oct 2012 14:59:53 +0000 (16:59 +0200)]
Add a CMake macro to test module includes

The variations of includes which should work are tested. For example,
in the case of testing the QtCore module and QObject include, the
following includes are generated and compiled:

      #include <QObject>
      #include <QtCore/QObject>
      #include <QtCore>
      #include <QtCore/QtCore>

As the private include directories are not available to the compiler,
this also tests that private headers are not included from public ones.

Change-Id: Id03d0fe290c9691e0f7515015892991d1701ab72
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix syncing of visibility and enabled for menus on Cocoa
Andy Shaw [Fri, 28 Sep 2012 13:58:58 +0000 (15:58 +0200)]
Fix syncing of visibility and enabled for menus on Cocoa

Fixed menu handling on Cocoa so if a menu is enabled/disabled or made
visible or not then it will keep this in sync with the appropriate
native menu entry.

Change-Id: If269185fcf065fb1b2f60d6ef8c27c107eb4509f
Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com>
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
12 years agoescape constructed command for makefiles
Oswald Buddenhagen [Thu, 18 Oct 2012 17:20:34 +0000 (19:20 +0200)]
escape constructed command for makefiles

Change-Id: Iec7f2bd7b02d03bf6a99dde363a41578924e523c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agoRemove unnecessary call to png_set_sBit when writing png files
Sergey Borovkov [Wed, 24 Oct 2012 21:20:01 +0000 (01:20 +0400)]
Remove unnecessary call to png_set_sBit when writing png files

According to libpng documentation - PNG files reduce possible bit depths
to 1, 2, 4, 8, and 16. If data is of another bit depth, it's possible to
write an sBIT chunk into the file so that decoders can recover the
original data if desired. Since we hardcode depth to 8 there is no need
to call png_set_sBit

Change-Id: I8e3941675019b920051775128ff4cf2bf1ca7c4a
Reviewed-by: aavit <eirik.aavitsland@digia.com>
12 years agoAngle: Fix shadow build
Yuchen Deng [Thu, 25 Oct 2012 12:57:06 +0000 (20:57 +0800)]
Angle: Fix shadow build

Change-Id: I4ce4741ba1aa4009bd4984b4fad5a1b407d2cce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agoBlackberry bearer plugin: Only Report working interfaces as active
Peter Hartmann [Tue, 23 Oct 2012 10:42:20 +0000 (12:42 +0200)]
Blackberry bearer plugin: Only Report working interfaces as active

Some interfaces might be connected but not working (e.g. no IP address,
no gateway etc.)

In practice, this prevents the USB interface (among others) from
being reported as active and thus the QNetworkConfigurationManager
as being reported as online.
We only want Wifi and 3G etc. connections to be reported as online
when they are up.

Change-Id: I59fbe53bed8392d363a0191d589737f2304c853f
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Andrey Leonov <aleonov@rim.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoQNX: Query dynamic buffer count at runtime
Rafael Roquetto [Wed, 24 Oct 2012 18:27:24 +0000 (16:27 -0200)]
QNX: Query dynamic buffer count at runtime

While unlikely, there are cases in which QQnxWindow::renderBuffer() is
called before the window buffers have been created. Without this check, the
program will abort on QQnxBuffer constructor, since the value that will be
passed to it will be of an invalid buffer.

Change-Id: I9ad5926dca856570032dcf10b6975e8f3364c284
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agomove QMAKEMODULES addition to .qmake.super to qt_build_config.prf
Oswald Buddenhagen [Tue, 18 Sep 2012 16:26:09 +0000 (18:26 +0200)]
move QMAKEMODULES addition to .qmake.super to qt_build_config.prf

this is qt module specific magic that has no business in the generic
default_pre.prf.

a side effect is that every qt module now needs to have a .qmake.conf
(unless it sets MODULE_QMAKE_OUTDIR, like webkit does).

Change-Id: Id9e5f6eee2d8ec0c711e7217d9e1893fc9c88132
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
12 years agoremove last traces of qpluginbase.pri
Oswald Buddenhagen [Fri, 21 Sep 2012 13:57:49 +0000 (15:57 +0200)]
remove last traces of qpluginbase.pri

Change-Id: Idafdab98016cd20f0605a46bf9cb8938da41a99e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
12 years agofix 'qmltypes' targets
Oswald Buddenhagen [Tue, 23 Oct 2012 18:10:25 +0000 (20:10 +0200)]
fix 'qmltypes' targets

should now actually work for all build types

Change-Id: I2dc1f8231737c13e95ce8aab1330b4f063951547
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
12 years agomake qmltypes target properly respect debug vs. release
Oswald Buddenhagen [Tue, 23 Oct 2012 14:46:32 +0000 (16:46 +0200)]
make qmltypes target properly respect debug vs. release

Change-Id: Ia4f5ccb2b795a7594b74ea95aa0cc56a91aa7043
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
12 years agoAdd glxContextForContext function to QXcbNativeInterface.
Zeno Albisser [Wed, 24 Oct 2012 14:04:15 +0000 (16:04 +0200)]
Add glxContextForContext function to QXcbNativeInterface.

This change enables receiving the native GLXContext object that is used
by a QOpenGLContext in case of GLX.
This clearly is non-public api that is only meant to be used as a
last resort for cases where it is really necessary to get hold of
a native context object.

Change-Id: I7f1f974f18063ed334b8034a0c0192c875c10cec
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoAdjust autotest files for raster engine to new default pen
aavit [Wed, 24 Oct 2012 08:42:37 +0000 (10:42 +0200)]
Adjust autotest files for raster engine to new default pen

Fix those test scripts that assumed cosmetic default pen, and
improve testing coverage of cosmetic vs non-cosmetic pens in general.
Ref. I04d910e9700baf7f13a8aac07a3633014bb9283e

Change-Id: I2bb3525c21a8e9c8dd1f16e7dcd225195df43c1b
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
12 years agoDrop Symbian Carbide settings from .gitignore
aavit [Mon, 22 Oct 2012 09:04:27 +0000 (11:04 +0200)]
Drop Symbian Carbide settings from .gitignore

Change-Id: I429343246714e26690ffd9748e5e6873509c6625
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
12 years agoFix a crash in QFileDialog when selecting an invalid name filter.
Friedemann Kleint [Fri, 26 Oct 2012 08:44:00 +0000 (10:44 +0200)]
Fix a crash in QFileDialog when selecting an invalid name filter.

When nameDetailsVisible is set to false and an invalid/empty
string is passed to selectNameFilter(), the regexp used to
strip the filter off the suffixes returns empty and a crash
occurs.

Change-Id: I926ea49514ff25a103977d8121fca1cf83d647f5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoFix enter/leave event generation between native widgets when grabbing.
Miikka Heikkinen [Fri, 26 Oct 2012 08:30:22 +0000 (11:30 +0300)]
Fix enter/leave event generation between native widgets when grabbing.

Removed enter/leave event generation when moving between between
related windows in QWidgetWindow (i.e. native widgets) while some
widget was explicitly grabbing the mouse input. This makes enter/leave
event generation identical to non-native widgets.

Task-number: QTBUG-27551
Change-Id: I4996007bd7922e073a2957ad267a6373e8f3fecc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agoNew-style Windows cursors when dragging object from outside
Cyril Oblikov [Tue, 23 Oct 2012 15:00:58 +0000 (18:00 +0300)]
New-style Windows cursors when dragging object from outside

New-style drag&drop cursors are used now on Windows when user drags
object to application from outside (e.g. image from Explorer). This is
achieved by using IDropTargetHelper.

Change-Id: I67e1db73cf433e235fce891eef0093cd4e605904
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agoMake compile on WCE after c3b9398
Kevin Funk [Thu, 25 Oct 2012 09:27:04 +0000 (11:27 +0200)]
Make compile on WCE after c3b9398

Change-Id: I594893eb80ecade903e592c41c7117b08bc946a5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agoProperly check for widget's visibility in doublespinbox autotest
Oliver Wolff [Mon, 22 Oct 2012 08:59:52 +0000 (10:59 +0200)]
Properly check for widget's visibility in doublespinbox autotest

Change-Id: If9e08ab5c84090729537e2a060257564c62fda9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
12 years agocorrect spelling in comment
Mark Brand [Wed, 24 Oct 2012 13:55:53 +0000 (15:55 +0200)]
correct spelling in comment

Change-Id: I6ffa96ac9cda0701c99f839804f400a167fcf9a7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRemove Windows as a dependency of mac style
Jens Bache-Wiig [Wed, 17 Oct 2012 14:11:58 +0000 (16:11 +0200)]
Remove Windows as a dependency of mac style

There is not need to have this dependency any more
since mac is overriding anything we depend on in Windows
style anyway.

Change-Id: I8fe0e0cc949265170947b492e04e08fdd4cf5027
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
12 years agoHappy Eyeballs: Make sure that we commit the address type for SSL connections
Jocelyn Turcotte [Mon, 15 Oct 2012 12:35:19 +0000 (14:35 +0200)]
Happy Eyeballs: Make sure that we commit the address type for SSL connections

_q_connected checks if pendingEncrypt is false before committing the
address type. This could be used to delay the commit but nothing is done
later in _q_encrypted, so the commit is avoided completely.

This causes SSL connections on a network without IPV6 support to hang
if the domain name record contains both IPV4 and IPV6 addresses.

As SSL is handled a few layers above IP, there should be no reason to
avoid/delay committing the address type if the TCP connection was
established surccessfully. Thus this patch is removing the check completely.

Change-Id: If56a3365f9f51712b4aae3f7902711711ace86fd
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agotest: Remove QSKIP from tst_QFileDialog2
Sergio Ahumada [Sun, 21 Oct 2012 18:53:02 +0000 (20:53 +0200)]
test: Remove QSKIP from tst_QFileDialog2

In task227930_correctNavigationKeyboardBehavior()

Task-number: QTBUG-23602
Change-Id: I07f40dbc3840c232e09ff1327f00e3fd9c16c22f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
12 years agotest: Remove tst_QPixmap::grabWindow() function
Sergio Ahumada [Sun, 21 Oct 2012 21:56:14 +0000 (23:56 +0200)]
test: Remove tst_QPixmap::grabWindow() function

QPixmap::grabWindow() was deprecated by 41914453d38d01b9b69e16ccee69444d1a304bf7

Task-number: QTBUG-20863
Change-Id: I7e675c124cd96cf1815b65e57f3fba19e5065066
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>