5 years agoxcb: Fix a colormap leak
Uli Schlachter [Thu, 1 Nov 2012 18:22:18 +0000 (19:22 +0100)]
xcb: Fix a colormap leak

The function createDummyWindow() allocated a colormap, but never freed
it. Freeing it is safe after the window is created.

Change-Id: I4c876568572c9e1e9dde7047850a51917ef3702f
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoXCB: Handle connection errors
Uli Schlachter [Thu, 1 Nov 2012 17:40:37 +0000 (18:40 +0100)]
XCB: Handle connection errors

When the XCB connection breaks, all following XCB function calls will fail and
function calls that are currently in progress will return. This means that
xcb_wait_for_event() will return NULL and thus the QXcbEventReader thread will

This patch uses the above behavior to make sure that processXcbEvents() will be
called. The error handling should always be done before normal event processing,
because all XCB calls will fail once the connection is in an error state. This
is especially unexpected for xcb_get_setup() which suddenly returns a NULL

Task-number: QTBUG-27686

Change-Id: Ie3e4058f9d92bcbfc45934a8b36d9a7254e2b4bb
Signed-off-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoQTranslator: Use resource memory instead of copying it
Thomas McGuire [Mon, 29 Oct 2012 16:14:07 +0000 (17:14 +0100)]
QTranslator: Use resource memory instead of copying it

Previously, translations in resource files were loaded through
QFile and the data was copied. Now, simply use the resource memory

Change-Id: I55a06c1e7bb15c169cc69b908b3021136beac9d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix progressbar animation on macstyle
Jens Bache-Wiig [Fri, 2 Nov 2012 13:18:54 +0000 (14:18 +0100)]
Fix progressbar animation on macstyle

The animation is not just supposed to run when indeterminate, but
also while it is progressing.

Change-Id: If176bd230c2f6f83781e01ea77526c24d54c8477
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agodon't return false from removeTranslator() just because of shutting down
Oswald Buddenhagen [Thu, 1 Nov 2012 16:50:44 +0000 (17:50 +0100)]
don't return false from removeTranslator() just because of shutting down

the condition is supposed to suppress the event emission, not to trash
the return value.

Change-Id: I3e327ceedb909ac29ba975c49b0f039b50eb4ee1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agodo not add DEPENDPATH to VPATH
Oswald Buddenhagen [Thu, 1 Nov 2012 13:50:03 +0000 (14:50 +0100)]
do not add DEPENDPATH to VPATH

DEPENDPATH merely says where to look for impliciit dependencies, not
where to find explicit ones.

fwiw, the other way round may be considered correct, but DEPENDPATH
exists for the sole purpose of limiting which paths should cause
recompilations, so it would be counterproductive to extend with with

Task-number: QTBUG-11912
Change-Id: I86450b5fd5aeb1f1b015b53f0adcd167ff4ce04d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agodon't unset TARGET_VERSION_EXT
Oswald Buddenhagen [Thu, 1 Nov 2012 13:41:49 +0000 (14:41 +0100)]

otherwise we may remove a user-provided setting.

Change-Id: If3217a3d92938fe2f3ac3740a645d3ace0ce9ab0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoFix height of combobox in macstyle without a widget
Jens Bache-Wiig [Fri, 2 Nov 2012 13:27:09 +0000 (14:27 +0100)]
Fix height of combobox in macstyle without a widget

When no widget is provided we hardcode the height and the value
was off by 2. There is no change when a widget is provided.

Change-Id: I555b5206b8750db06595a1e2572a3f8212635a9d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agofix cleanup of QWinIoCompletionPort
Joerg Bornemann [Thu, 1 Nov 2012 13:57:27 +0000 (14:57 +0100)]
fix cleanup of QWinIoCompletionPort

The QWinIoCompletionPort thread was never properly cleaned up.
Maintain a reference count for QWinIoCompletionPort and create/destroy
it on demand.

Change-Id: I607b574484554dd3ad107dfb43b0a248bcf8b7a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agomove QT_NAMESPACE define to qtcore's module pri file
Oswald Buddenhagen [Thu, 1 Nov 2012 13:23:41 +0000 (14:23 +0100)]
move QT_NAMESPACE define to qtcore's module pri file

it's basically an attribute of qtcore (and everything that depends on it).

Change-Id: I6eeefeb5df70764399d9f22dca9dbec1843b8d68
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agolet winmain just use qtcore
Oswald Buddenhagen [Thu, 1 Nov 2012 13:23:47 +0000 (14:23 +0100)]
let winmain just use qtcore

this is correct dependency-wise (anything which links to this needs to
link qtcore), and just cleaner.

Change-Id: I2c49d16fc8a0ee8bc55a3c165993fd1c4e313dab
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agomove invariant CONFIG flags out of the configures
Oswald Buddenhagen [Tue, 23 Oct 2012 19:06:08 +0000 (21:06 +0200)]
move invariant CONFIG flags out of the configures

we now have qt_build_config.prf which can contain static code.

Change-Id: I3f0ae142fdc5ffb4e1d25e628e809ba15b5f0ac4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoremove pointless messing with CONFIG+=fix_output_dirs
Oswald Buddenhagen [Tue, 23 Oct 2012 18:52:09 +0000 (20:52 +0200)]
remove pointless messing with CONFIG+=fix_output_dirs

the function is automatically performed by debug_and_release.prf,
regardless what we do with this flag.

Change-Id: Iddec69b35e0e905fdf4133ee240af37d3a8ada0b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQNX: Fix build with QNX SDP 6.5.
Sergio Martins [Fri, 2 Nov 2012 11:48:49 +0000 (11:48 +0000)]
QNX: Fix build with QNX SDP 6.5.

__EXT_LF64SRC isn't defined in this case.

This also makes it consistent with mkspecs/common/posix/qplatformdefs.h
to decide which type of stat struct to declare.

Change-Id: Iaa155acc270783901376b543fdeffb5263294754
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agoBlackberry: Fix QCoreApplication::applicationFilePath() performance.
Sergio Martins [Thu, 25 Oct 2012 16:50:47 +0000 (17:50 +0100)]
Blackberry: Fix QCoreApplication::applicationFilePath() performance.

Listing all files with QDir is slow.
Instead, use argv[0] for zygotized apps and _cmdname() for

Apps run through the terminal will fall in the zygotized case,
which is ok.

Note about zygotized apps:
  Zygotized apps don't have an executable, they live in a shared
  object file.

  These apps are run through a deamon that forks and dlopens()
  the shared object ( for performance reasons ).

  For this reason we can't use _cmdname(), since it just contains
  the the file path of the daemon.

  On the other hand, non-zygotized apps have a bogus argv[0]
  when run through the navigator ( command line is fine ).

Change-Id: I9953e8fa05c9fb11c33b3a38ebab00fe33ba4c44
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
5 years agoQHeaderView 5.0 - correct drop on manual QHeaderView sectionmove
Thorbjørn Lund Martsum [Thu, 1 Nov 2012 15:33:25 +0000 (16:33 +0100)]
QHeaderView 5.0 - correct drop on manual QHeaderView sectionmove

This fixes an error in the calculation of the exact drop position
when an user is moving a section in QHeaderView.

Before we compared a mouse-position local to the widget
(pos) with a summed length of sections (posThreshold).

However we need to consider/substract the headers offset to make
the posThreshold comparable to the local mouse position.

This solves e.g.
Task-number: QTBUG-14814

Change-Id: If0281cf0c7b98316474f18e8eaa32c6d062dda56
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoQHeaderView - call invalidateCachedSizeHint() on clear
Thorbjørn Lund Martsum [Thu, 1 Nov 2012 06:29:12 +0000 (07:29 +0100)]
QHeaderView - call invalidateCachedSizeHint() on clear

This calls invalidateCachedSizeHint on clear, which is a logical
thing to do.

Task-number: QTBUG-22528
Change-Id: I0befb2d492599fa8a05b1c2162bbca586e1b019d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoAdd implementations of QAIM::sibling in public APIs.
Stephen Kelly [Wed, 26 Sep 2012 16:16:08 +0000 (18:16 +0200)]
Add implementations of QAIM::sibling in public APIs.

Change-Id: I2248641f2ed8735c28bd9572470520995a4a5b62
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agospeed up tst_QLocalSocket::readBufferOverflow
Joerg Bornemann [Fri, 2 Nov 2012 11:25:58 +0000 (12:25 +0100)]
speed up tst_QLocalSocket::readBufferOverflow

Ifdef out waitForBytesWritten on Windows.
See comment in source.

Change-Id: I7a2268d2634c2524cd8291c72dd9708e430e314e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoCocoa: Fix fonts on retina displays.
Morten Johan Sørvig [Fri, 2 Nov 2012 08:03:21 +0000 (09:03 +0100)]
Cocoa: Fix fonts on retina displays.

Hardcode logical dpi to 72 again. NSDeviceResolution
gives us the physical dpi (144) and results in double-
sized fonts in Qt. QPlatformScreen does not currently
have a physicalDpi virtual, perhaps this can be added
later on.

Unfortunately the usefulness of a per-screen correct
DPI metric seems questionable to me:
1) The value returned by the system is not correct,
   pixels per inch on the rMBP is around 220.
2) Qt always uses the dpi for the main screen, via

Change-Id: Ia35804be62ee7f1c623bad854f65d744dc9075d4
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
5 years agoQWindowsVistaAnimation: inherit QBlendStyleAnimation
J-P Nurmi [Tue, 23 Oct 2012 14:39:57 +0000 (16:39 +0200)]
QWindowsVistaAnimation: inherit QBlendStyleAnimation

Change-Id: I15b348eb842730513480ecbb90bca87174d7c771
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoIntroduce QBlendStyleAnimation (based on QWindowsVistaAnimation)
J-P Nurmi [Wed, 17 Oct 2012 14:41:42 +0000 (16:41 +0200)]
Introduce QBlendStyleAnimation (based on QWindowsVistaAnimation)

Change-Id: Ie289debe69ea7f6bb7833f979e39bb91290cc49c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoCocoa: Disable malfunctioning updateScreens().
Morten Johan Sørvig [Fri, 2 Nov 2012 14:21:19 +0000 (15:21 +0100)]
Cocoa: Disable malfunctioning updateScreens().

The current updateScreens() implementations deletes
QScreens and creates new ones. Deleting a QScreen hides
all its windows. The result is that Qt windows disappears
when applicationDidChangeScreenParameters is called.

Change-Id: I5870d025d2bbf36621817cb220a835d1a6b367dc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
5 years agospecify MODULE to avoid module .pri filename clash
Mark Brand [Fri, 2 Nov 2012 00:36:31 +0000 (01:36 +0100)]
specify MODULE to avoid module .pri filename clash

Since 733ac1f6e6b3155a594376ef99288c6117124000 the default MODULE
is the base of the .pro file for the plugin (i.e., "windows"). Since
MODULE becomes the base of the module .pri, the names of the module
.pri files can clash. Now we explicitly specify MODULE for
printersupport plugins to avoid overwriting the module .pri files of
the platform plugins whose .pro files have the same names.

Follow-up to 81f8f0db5cb75e29b041a011ca4e7dbbf2d903c5 which renamed the

Change-Id: Ie83892dc419257e1df3b81bcf6ecec751ae345b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix font and positioning of headerview labels on mac
Jens Bache-Wiig [Fri, 2 Nov 2012 12:28:57 +0000 (13:28 +0100)]
Fix font and positioning of headerview labels on mac

The old code rendered text too large. On desktop components,
the widget workaround ensured that text was clipped.

This should address both problems. Since we anyway do not
adapt the height to font size, I dont se a point in
supporting custom fonts here.

Change-Id: If3c0509cdff4dbadfd98bd4b1934eaa665148cbf
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
5 years agoFix submenu navigation.
Friedemann Kleint [Tue, 30 Oct 2012 10:26:40 +0000 (11:26 +0100)]
Fix submenu navigation.

Bring back code that was removed
in Qt 4: 60324267fbb8a8554e62aaf9ef01360709292320 for QTBUG-7411 .

This code reselects the submenu action of a currently opened
popup when the mouse is moved to the submenu crossing other
actions. In addition, make sure it only triggers when
the reason is not keyboard selection.

Task-number: QTBUG-20094
Change-Id: Ibb73f83e86635083aad8b1e79fc0fdd512c65754
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoAllow QStandardPaths (Mac, Windows, Unix) to be bootstrapped
Thiago Macieira [Fri, 26 Oct 2012 20:13:03 +0000 (13:13 -0700)]
Allow QStandardPaths (Mac, Windows, Unix) to be bootstrapped

This allows using QStandardPaths in one of the bootstrapped tools, if
required for a future need.

The Blackberry version appears to be usable in bootstrapped mode

Change-Id: Ia4e9b9564395d2e151f8ac229ac2a2aa2982e92f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoAdded MultipleWindows platform capability.
Samuel Rødal [Wed, 31 Oct 2012 11:32:31 +0000 (12:32 +0100)]
Added MultipleWindows platform capability.

Several platform plugins, like eglfs, kms, etc don't support multiple
windows as there's no system compositor, they're rendering directly to
a single back buffer. By adding a platform capability we'll be able to
provide better error reporting when an application tries to create
multiple QWindows on a single-window platform. Also, QML apps can use
this capability to figure out whether they should create a QWindow for
dialogs / popups / menus, or whether to just create items in the same
scene, that are shown on top of the rest of the content.

Change-Id: I15b8d21ee2bc4568e9d705dbf32f872c2c25742b
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
5 years agoExclude ANGLE headers from syncqt-checks.
Friedemann Kleint [Wed, 24 Oct 2012 15:15:06 +0000 (17:15 +0200)]
Exclude ANGLE headers from syncqt-checks.

Change-Id: I08797e1cdfc2d79b0292f4d8077847496c4bac62
Reviewed-by: Jason Barron <jason.barron@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoQFileDialog: Do not pass on file model root to QFileDialogOptions.
Friedemann Kleint [Fri, 26 Oct 2012 13:03:00 +0000 (15:03 +0200)]
QFileDialog: Do not pass on file model root to QFileDialogOptions.

QFileDialog::selectedFiles() defaults to file model root
for 'AnyFile', which confuses native dialogs since
selectedFiles == directory in that case. Split up
QFileDialog::selectedFiles() and skip the default when
initializing QFileDialogOptions for native dialogs.

Change-Id: I65cda182df8b1748159058fc361c10d97f5650ce
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agofix error handling bug in QWindowsPipeReader
Joerg Bornemann [Thu, 1 Nov 2012 11:14:09 +0000 (12:14 +0100)]
fix error handling bug in QWindowsPipeReader

If ReadFile returns with an error then we must set our internal state
accordingly. QWindowsPipeReader::readSequenceStarted must be set to
false. If ReadFile fails, we're not within a read sequence.
Also, we must handle the ERROR_BROKEN_PIPE error.

Task-number: QTBUG-25342

Change-Id: Ic9247f170fa9cc47fa7e45d0f47ccfedac06a593
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agofix tst_QProcess::batFiles for shadow builds
Joerg Bornemann [Tue, 30 Oct 2012 10:37:39 +0000 (11:37 +0100)]
fix tst_QProcess::batFiles for shadow builds

Change-Id: If7a9c9aa6ba16b7744d8ef8a66b43e40f375b5e7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoUse fusion instead of motif.
Frederik Gladhorn [Fri, 26 Oct 2012 08:58:21 +0000 (10:58 +0200)]
Use fusion instead of motif.

Change-Id: Ic75ea959ac825efabf0f3a8606dfca4b65fae474
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoFix the gregorian date <-> julian day calculations in QDate
Jon Severinsson [Mon, 8 Oct 2012 04:46:28 +0000 (06:46 +0200)]
Fix the gregorian date <-> julian day calculations in QDate

The old code is just plain wrong for negative julian days. Replaced
with plain math from The Calendar FAQ [1], which is correct for all
julian days, provided you use mathematical integer division (round to
negative infinity) rather than c++11 integer division (round to zero).

[1] http://www.tondering.dk/claus/cal/julperiod.php

While the conversion code works for up to around JD +/- (2^63/4), we
only use an int for the year in the API, so this patch limits minJd()
and maxJd() to 1 Jan (2^31) BC and 31 Dec (2^31-1) AD, respectively.

Note that while the new conversion code looks like it would be more
expensive than the old, gcc will in fact be able to optimize it to be
slightly faster (probably because x86 hardware implements round to
negative infinity, and so GCC manages to optimize floordiv to a single
instruction, compared to the three instuctions needed for operator/).

In the following test application, run with a release mode Qt and
redirecting stderr to /dev/null, I measured an improvement from
6.81s +/- 0.08s to 6.26s +/- 0.16s user time over five runs on an
otherwise idle x86_64 system.

int main(int, char *[])
    int year, month, day;
    qint64 jd;
    for (qint64 i = Q_INT64_C(-1048576) ; i < Q_INT64_C(1048576); ++i) {
        QDate::fromJulianDay(i).getDate(&year, &month, &day);
        jd = QDate(year, month, day).toJulianDay();
        qDebug() << jd << year << month << day;

Change-Id: Ifd0dd01f0027f260401f7f9b4f1201d2b7a3b087
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoIntroduced QWindow properties {min/max}imum{Width/Height}
Samuel Rødal [Thu, 1 Nov 2012 16:03:45 +0000 (17:03 +0100)]
Introduced QWindow properties {min/max}imum{Width/Height}

These are useful when QWindow is exposed to QML.

Change-Id: I7ec49ef365183e2c784605889e8ea22c2ef34781
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoUpdate QDateTime serialisation docs and increase version number.
Mitch Curtis [Tue, 23 Oct 2012 13:06:11 +0000 (15:06 +0200)]
Update QDateTime serialisation docs and increase version number.

Refer to Qt::TimeSpec instead of listing potential values (which are

Also, the current QDataStream version number is now 13.

Change-Id: I9a68385977dc2fe4dacee75330cb539850478480
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
5 years agoImprove QDateTime test coverage.
Mitch Curtis [Fri, 19 Oct 2012 10:01:03 +0000 (12:01 +0200)]
Improve QDateTime test coverage.

Change-Id: Ic521d9d2ffb1b8e3b14d9cebdeb3dc7a5e08580e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agoRemove a couple of unused variables.
Miikka Heikkinen [Tue, 30 Oct 2012 14:27:48 +0000 (16:27 +0200)]
Remove a couple of unused variables.

Change-Id: I33528cdb27801317d311d39e4499d2db6a291377
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoExpose IAccessibleTable2 to non-conformant screen readers
Jan Arve Saether [Thu, 1 Nov 2012 13:32:46 +0000 (14:32 +0100)]
Expose IAccessibleTable2 to non-conformant screen readers

This seems to be the established practice.

Change-Id: I75a65d722a026ab0eb1805688743f46aba406e6c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoCompile cocoa with QT_NO_ACCESSIBILITY
Jan Arve Saether [Thu, 1 Nov 2012 14:07:16 +0000 (15:07 +0100)]
Compile cocoa with QT_NO_ACCESSIBILITY

Change-Id: I82b5dbf1bce94bd928eee207992c0036edc527ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoXCB: Use screen's client leader as fallback for transient parent.
Friedemann Kleint [Wed, 31 Oct 2012 13:23:26 +0000 (14:23 +0100)]
XCB: Use screen's client leader as fallback for transient parent.

Modal dialogs that do not have a QWidget parent may be hidden
by their parent unless they actually have a transient parent.

Task-number: QTBUG-27786
Change-Id: I7847df3517e5ba6e8d77a2a18c905e908a3cd2f4
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoSSL certificate printing: Fix auto test for OpenSSL 1.0.1 version.
Janne Anttila [Tue, 30 Oct 2012 13:28:17 +0000 (15:28 +0200)]
SSL certificate printing: Fix auto test for OpenSSL 1.0.1 version.

Different OpenSSL versions  produce slightly different output when
dumping a certificate.

Change-Id: Ida98b24422302e287641be074d6740ca292cf203
Reviewed-by: Richard J. Moore <rich@kde.org>
5 years agoFix warnings when using QImage as QtConcurrent::mapped return type
Liang Qi [Wed, 31 Oct 2012 09:05:46 +0000 (10:05 +0100)]
Fix warnings when using QImage as QtConcurrent::mapped return type

Task-number: QTBUG-27391

Change-Id: I68b37ffa645be21d4d23b205bc052540b9aba7f4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: João Abecasis <joao@abecasis.name>
5 years agoMac: Add support for WindowMasks platform capability
Gabriel de Dietrich [Wed, 24 Oct 2012 14:09:52 +0000 (16:09 +0200)]
Mac: Add support for WindowMasks platform capability

Also brings back a working QWidgetPrivate::setMask_sys().

Change-Id: Idde9eea15d28bb0299258df81322a5a3ff0b9493
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agolet static plugins have "module" pri files
Oswald Buddenhagen [Wed, 24 Oct 2012 13:02:08 +0000 (15:02 +0200)]
let static plugins have "module" pri files

... and use them in qt.prf instead of (not) maintaining hand-coded lists.

Change-Id: Ia21f7864eaf3ca92fa75f23876f71075d0521f4b
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agodisambiguate plugin name vs. windows platform plugin
Oswald Buddenhagen [Tue, 30 Oct 2012 09:15:20 +0000 (10:15 +0100)]
disambiguate plugin name vs. windows platform plugin

static plugin linking needs unique names.
also, non-unique names are generally somewhat counterproductive.

Change-Id: Idffba2b442b98dd2b0917f9f0af89f0694a99196
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoImprove / fix QRegularExpression* docs
Giuseppe D'Angelo [Wed, 24 Oct 2012 15:46:58 +0000 (17:46 +0200)]
Improve / fix QRegularExpression* docs

Fixed a couple of typos; also, wrapped the snippets in a main() function,
so that now the snippet file can be compiled
(and therefore the compiler can help us at detecting those typos).

Change-Id: Ie182a9c4cb451db13a6f4bfa5eaed66bc6966c8f
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agomove remaining configure'd CONFIG flags to qmodule.pri
Oswald Buddenhagen [Tue, 23 Oct 2012 18:45:18 +0000 (20:45 +0200)]
move remaining configure'd CONFIG flags to qmodule.pri

so they are uniformly available to all modules.

Change-Id: I734f703c5923c42cb26f1456ed960cecc01c4b41
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUse the new QMAKE_XSPEC to get the mkspec.
Stephen Kelly [Mon, 29 Oct 2012 14:16:51 +0000 (15:16 +0100)]
Use the new QMAKE_XSPEC to get the mkspec.

Change-Id: I7f307ffe0954464f68192f9f3781bdb206f87809
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agorewrite default spec handling
Oswald Buddenhagen [Mon, 29 Oct 2012 11:43:43 +0000 (12:43 +0100)]
rewrite default spec handling

instead of symlinking (on unix) or creating a forwarding spec (on
windows), just put the default specs into (the bootstrapped)

Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agopurge dead defines
Oswald Buddenhagen [Mon, 29 Oct 2012 18:59:48 +0000 (19:59 +0100)]
purge dead defines

Change-Id: I8770416a19fb0951c0096cedf3f36c3493437903
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoremove pointless indirections
Oswald Buddenhagen [Mon, 29 Oct 2012 17:32:04 +0000 (18:32 +0100)]
remove pointless indirections

Change-Id: I2bf6d9a0352dea75f8fd596859ca7939685c9cec
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agouse .qmake.conf instead of sync.profile as "anchor"
Oswald Buddenhagen [Mon, 29 Oct 2012 10:22:17 +0000 (11:22 +0100)]
use .qmake.conf instead of sync.profile as "anchor"

this is less expensive, as qmake already provides us with it.

Change-Id: Ifb44ea9126e6b52c02025858c5d88032e7a6cc2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agobeef up qt_plugin.prf
Oswald Buddenhagen [Wed, 24 Oct 2012 12:00:12 +0000 (14:00 +0200)]
beef up qt_plugin.prf

it now defines the DESTDIR and creates an INSTALLS rule.

Change-Id: I15a462ccad9acbe3521c352fa98327825dc27c05
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoSome Vista style cleanup
Jens Bache-Wiig [Thu, 25 Oct 2012 14:16:14 +0000 (16:16 +0200)]
Some Vista style cleanup

Creates a function for cloning the style options
used by Vista style.

Change-Id: I4d83661acd6bdfff5c633447046a206018b537af
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoMake ToolButton work with Macstyle for components
Jens Bache-Wiig [Thu, 1 Nov 2012 10:47:37 +0000 (11:47 +0100)]
Make ToolButton work with Macstyle for components

We needed a new helper function for this. The widget cast was
breaking desktop components. By using accessible role, we can make
it work for both use cases without depending on the widget.

Change-Id: Ic854dc45a4e5b7a50c5be701e903d58a4a914ee5
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoFix groupboxes for desktop components on mac
Jens Bache-Wiig [Thu, 1 Nov 2012 11:47:40 +0000 (12:47 +0100)]
Fix groupboxes for desktop components on mac

The logic was a bit odd as it would check if the groupbox had a
font set and then override it anyway. Since we anyway want the
fallback to be used for components we just make sure that the fallback
is to use the same code path.

Change-Id: Ic5071b43cda76e2bb7356a6f71cc8458c4e8bf27
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoFix build when libQtGui is not available
Harald Fernengel [Mon, 29 Oct 2012 09:43:15 +0000 (10:43 +0100)]
Fix build when libQtGui is not available

Change-Id: I9e35d9302f58d283459f7e625c4e0b87fd1dc2bf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoCompile fix for tst_qstylesheetstyle.cpp
hjk [Thu, 1 Nov 2012 10:32:51 +0000 (11:32 +0100)]
Compile fix for tst_qstylesheetstyle.cpp

There was a semicolon missing.

Change-Id: Id2eb843604907acf952d7d238f80ba8a7010ccd1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoStrip trailing whitespace in itemviews.
Stephen Kelly [Thu, 1 Nov 2012 11:21:11 +0000 (12:21 +0100)]
Strip trailing whitespace in itemviews.


 git ls-files -z |     xargs -0 sed -i 's/ \+$//'

in the relevant directories.

Change-Id: I861ef9952fb32ed2db9ec8b67864ec7d0d61f0f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoFix for leak in QFuture
Christian Strømme [Thu, 25 Oct 2012 10:32:52 +0000 (12:32 +0200)]
Fix for leak in QFuture

To avoid leaking when converting a QFuture<T> to a QFuture<void> we need
to have a separate ref. counter for QFuture<T>. When the last QFuture<T>
goes out of scope, we need to clean out the result data.

Task-number: QTBUG-27224

Change-Id: I965a64a11fffbb191ab979cdd030a9aafd4436c2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agoRemove #ifndef QT_NO_ACCESSIBILITY around qaccessible.{h,cpp}
Jan Arve Saether [Thu, 1 Nov 2012 13:33:36 +0000 (14:33 +0100)]
Remove #ifndef QT_NO_ACCESSIBILITY around qaccessible.{h,cpp}

Jens has an use-case for using accessibility from styles.

By making the enums always available regardless of QT_NO_ACCESSIBILITY,
it makes the style code less littered with ifndefs.

It should (ahem) also solve the problem where Qt Desktop components
does not compile if QT_NO_ACCESSIBILITY is not defined.
This happens on some linux distros, since atspi-2-dev is not installed
by default, which again causes grief for those affected.

Change-Id: I15d65df8c752a0c4af37cc7b4d908a757cb6a9c4
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agomove QSystemSemaphore autotest from qtscript to qtbase
Oliver Wolff [Wed, 31 Oct 2012 09:27:33 +0000 (10:27 +0100)]
move QSystemSemaphore autotest from qtscript to qtbase

As the script dependency for that autotest is not really needed it should
be moved to qtbase.

Task-number: QTBUG-27705

Change-Id: I4ce0d34aca97cadd79b157b0f7c90c406bed4295
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQt Core: Removed unnecessary group membership.
Jerome Pasion [Mon, 29 Oct 2012 16:36:06 +0000 (17:36 +0100)]
Qt Core: Removed unnecessary group membership.

The 'Non-GUI Classes' page is not relevant.
Also removed landing page from the 'modules' group.

Change-Id: Ie2d34d36f98a4697becfebd5fbc215913bbb41ce
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agoFix buttonsize on macstyle when no widget is defined
Jens Bache-Wiig [Thu, 1 Nov 2012 12:40:43 +0000 (13:40 +0100)]
Fix buttonsize on macstyle when no widget is defined

The previous size was incorrect and added far too much height
when the widget was undefined. When it was defined it would get
its size corrected so the patch should have very little effect on existing
widget code.

Change-Id: I7c22f4226eda270f0d71050bc4248686b035cb39
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoTestlib: Disable gcc warning about deprecated qInstallMsgHandler
Kai Koehne [Wed, 24 Oct 2012 10:25:45 +0000 (12:25 +0200)]
Testlib: Disable gcc warning about deprecated qInstallMsgHandler

Fix warning: 'void (* qInstallMsgHandler(QtMsgHandler))(QtMsgType, const char*)' is deprecated (declared at qtestlog.cpp:85) [-Wdeprecated-declarations]

Change-Id: I28d2baf696fdeddec90780edc88574fc368468db
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoAdd manual test for dialogs.
Friedemann Kleint [Thu, 25 Oct 2012 10:45:13 +0000 (12:45 +0200)]
Add manual test for dialogs.

Implemented for QFileDialog, currently.

Task-number: QTBUG-27621
Change-Id: I0c9b7628aa92e3fbca6f737448a7c469893764f1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

Task-number: QTBUG-27740
Change-Id: I12325f07d33aaf1a1b967e0a11492759d0f565d9
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

Change-Id: I03015734b846fe761085cf8f8fca2b29210cff97
Reviewed-by: Jon Severinsson <jon@severinsson.net>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 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>
5 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

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>
5 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>
5 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>
5 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>
5 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


Change-Id: I9849f12063b8c7a45d040c087f4611c3a48180b8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 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>
5 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>
5 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>