Commit Graph

10073 Commits

Author SHA1 Message Date
Oswald Buddenhagen
93e0f1223a fix syntax of warning message
Change-Id: I2e0a9afd6e46534156b7277dc5ceaf85d2dd4cac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-16 17:31:31 +02:00
Marc Mutz
cd168110e0 QWindowsKeyMapper: use a more efficient data structure for 'keyLayout'
Instead of allocating small chunks (40 bytes) on the heap, use a contiguous
array to hold them. This always occupies 10240 bytes of memory instead of
1024 (32 bits) or 2048 (64 bits) for the pointer array (plus heap memory
which depends on the number of items allocated), but is more cache-friendly
and uses less memory when the array isn't sparse.

To emulate the nullptr, a new bool has been added (doesn't change
sizeof(KeyboardLayoutItem)).

Also replace a few more magic numbers by symbolic constants.

Change-Id: I7160f600faddd63deea265c89dc6fd857c7b557f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2012-10-16 17:31:31 +02:00
Marc Mutz
cab891dc50 QWindowsKeyMapper: remove dead code
As an array of automatic storage duration, 'keyLayout' can never be nullptr,
so remove the respective check.

Change-Id: I2fb2db8311de55b41a1f9aef7c35341949e38e5a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2012-10-16 17:31:31 +02:00
Marc Mutz
fb21212f1e QWindowsKeyMapper: replace one magic constant with a symbolic one
Replace occurrences of a literal 9 that mean 'number of modifier key
combinations' with the new symbolic constant NumMods.

Change-Id: I1e78a1a3c00b81095450ec0557e30751da44c39a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2012-10-16 17:31:31 +02:00
Shawn Rutledge
78f946f6dc QScreen manual test improvements: fields resize, better formatting
It's necessary to set the fieldGrowthPolicy on the QFormLayout in order
to have expanding fields on the Mac.  Geometry formatting with
negative x and y values looks better.  Display fewer
decimal digits for double fields.

Change-Id: Icb252c0c3fb7b605253e04c3361beba124570840
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-16 17:31:31 +02:00
Andy Shaw
47881a7144 Compile fix for AIX with xlc
The -qtls option is needed when building with thread support so it can
use the local thread storage.

Change-Id: I693d944efddac911fe03b2c9a6b06a28f112b54d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2012-10-16 17:31:31 +02:00
Stephen Kelly
102e1822ff Remove addition of dependencies for static libraries.
The content in the prl file is not compatible with what CMake
expects in the value of the IMPORTED_LINK_INTERFACE_LIBRARIES
property. That property expects a list of IMPORTED targets or
full paths to libraries.

The prl file gives us a whitespace separated string of content
suitable for passing to ld, that is, it contains -L and -l content.
As this would take a lot of error prone parsing in cmake code in
order to resolve the content to a list of full paths to libraries
(which can be processed by any cmake generator), it's better to
remove the code until qmake is able to generate a list of full
paths.

Change-Id: I72fe8e862b7f3bd25a7f9a03db94d2e9b815d08a
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-10-16 17:31:31 +02:00
Mark Brand
a5e7c2802a QComboBox: mention insert policy in context of editable property
This makes it a little bit easier for the reader to discover what
editable combo boxes are about.

Change-Id: I60ce571f01e32d4cacb4718b42a8e12884bd1c13
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-10-16 17:31:31 +02:00
Joerg Bornemann
77308b4678 implement QCocoaWindow::setWindowIcon
Code taken from Qt 4.8.

Task-number: QTBUG-27175

Change-Id: I0f7a1add3ea63761c956e43d591cd1b26f25760e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-10-16 17:31:31 +02:00
Frederik Gladhorn
08748f147b Add parameter documentation.
Change-Id: I8ce85bbb286c3cb844ef600daa5e99432ee55b74
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-16 15:29:15 +02:00
Jens Bache-Wiig
3a685dcd5e Fix incorrectly scaled constants on Mac
This fixes several scaled constants on mac that are inherited from
commonstyle. (such as toolbutton arrows) It is probably easiest
to see when running Windows style on mac.
The problem was that the code assumed a default dpi of 96 would be
used on all platforms.

Change-Id: I83789589009b268dcb1d96629c3ec9e8f968a891
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2012-10-16 15:29:15 +02:00
Niels Weber
67ff460778 Document needed packages for XCB on Fedora.
Change-Id: I415416e82d342b232607fe7087350a9dad615f7a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-16 15:29:15 +02:00
J-P Nurmi
05c2113350 Add QObject* QStyleOption::styleObject
The object is used, amongst other things, as a target for
sending style animation updates.

Change-Id: Ic210e7ae2111bc08b70331a3a2030a494919a06d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2012-10-16 15:29:15 +02:00
Frederik Gladhorn
5fb7d6240b Mark linux accessibility test as insignificant.
The test was not run so far and chances are that it would block
the CI completely.
So disable it for now, enable it again as soon as breakages have been fixed.

Change-Id: I452c02027b37a604eefbadb253c9a4d5041ef159
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2012-10-16 15:29:15 +02:00
Miikka Heikkinen
af13c79b30 Implement setWindowIcon() for Windows.
Platform implementation for QWindow::setWindowIcon() was missing from
Windows platform plugin.

Task-number: QTBUG-27175
Change-Id: I6807d1ded057b7788a9f2fa5b143e212a666029b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-10-16 15:29:15 +02:00
Caroline Chao
782cae4104 Test: remove QSKIP in tst_QCoreApplication::argc
Instead omit the whole test when Q_OS_WIN is defined since
the test is invalid on this platform.

Change-Id: Idb77df96b0c2a223cddbfffb4e24c6d1f5d33dfb
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-16 15:29:15 +02:00
Caroline Chao
d81cf44a6b Test: remove QSKIP from tst_qstextstream
Instead omit the whole tests when Q_OS_WINCE is defined.

Change-Id: Idb15d622c9e1dbe4c8ec6a43c34a88e7fef2a384
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-16 15:29:15 +02:00
Caroline Chao
26dddabcaa Test: remove QSKIP from tst_QProcessEnvironment::putenv
Instead omit the whole test when Q_OS_WINCE is defined.

Change-Id: I19e35b837709c92e0202c6a96d113367bc6c92c2
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-16 15:29:15 +02:00
Friedemann Kleint
fbd10a401f Use organization name "QtProject" in examples.
Change-Id: Ibbe9517ccf81d25eccbdff98f7cfe8ff6ec485d2
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-16 15:29:15 +02:00
Andy Shaw
dc0927f2b8 Check if there is an old item before removing it
If something had changed with the menu item before it had actually been
originally added to the native menu then this would crash when trying
to remove a null item from the native menu.  This prevents that from
happening.

Change-Id: I8d78b5504759225364d5fd051a23c8d6dbd7d1eb
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-10-16 15:29:15 +02:00
Morten Johan Sorvig
f144d538fd Cocoa: Set platform window geometry correctly.
Handle the non-toplevel child window case, where
QWindow has a parent NSView instead of a parent
NSWindow. QWindow geometry is  then equivalent to 
the frame geometry

Task-number: QTBUG-26972

Change-Id: Ie7cedb3ec1a564ce55b72e8269d4853962e073ce
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2012-10-16 15:29:15 +02:00
Teemu Katajisto
4135951ae8 Cocoa: use defaultPixmap() if pixmap is not set for drag
Task-number: QTBUG-26971

Change-Id: I6aed56a6b292c5aeebf38278d2a1fa982346c909
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-10-16 15:29:15 +02:00
Kai Koehne
8fdef974b7 Logging: Mark deprecated API with QT_DEPRECATED
Still use it in qtestlib though because using qInstallMessageHandler
here would break all tests (still) using qInstallMsgHandler - Qt always
uses the new message handler if there's one, ignoring any message handler
installed through deprecated API.

Change-Id: I6fefefb315a2421425d2b7787e367fd348a33d83
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2012-10-16 15:29:15 +02:00
Frederik Gladhorn
c40333ef50 Remove unneded forward declaration.
Change-Id: I19157bde9a7b5ac3eb54830841baea08c8af8670
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-16 15:29:15 +02:00
Kai Koehne
e76f820e55 QML plugins: Make sure that both debug and release versions are built
Make sure that both debug and release versions of QML plugins are built
if Qt is configured accordingly. Also pass on the other QT_CONFIG configurations.

Change-Id: I4aaaf002068dd66277235bef7d1e3da3366d6d12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-16 15:29:15 +02:00
Frederik Gladhorn
1dc970b0c4 Fix function names in warning messages.
Change-Id: I14abc176ea670799496e10bee296b4e84fdc7181
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-16 15:29:15 +02:00
Miikka Heikkinen
74230f126b Fix setting custom cursor for widgets and windows before showing them
If custom cursor was set before the window was created, it didn't
actually get set, and in some cases even caused a crash.
Fixed by making sure the cursor is correct when showing widget/window.

Task-number: QTBUG-27535
Change-Id: I3bc946a9c406c96af5b86869a3a54893f8980aba
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>
2012-10-16 15:29:15 +02:00
Jason Barron
c92ceb179f Fix compile errors in configure.exe.
qstringmatcher.cpp and qchar.cpp are included in qstring.cpp and
qunicodetables.cpp is included in qchar.cpp so these files should
not be compiled as standalone objects.

Change-Id: I323e0878af28b9e5fb2f659fb8077347b93fa439
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-16 15:29:15 +02:00
Gabriel de Dietrich
c3b939818a QPA: Introducing QPlatformTheme standardPixmap(), fileIconPixmap()
The basic idea is that the platform theme is now responsible for
providing the pixmaps for the given standard name, or any file or
directory. Then, the QStyle implementation should query the platform
theme for the pixmaps, and build the icons accordingly using
ThemeHint::IconPixmapSizes. Same thing for QFileIconProvider. This
also opens future support for getting platform dependent pixmaps in
QtQuick components.

Also includes the implementation for the Cocoa (QCocoaTheme) and
Windows (QWindowsTheme) platform plugins.

Task-number: QTBUG-27450
Change-Id: I4e8406585d970a9af481be10f6643cf0abbc38a3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2012-10-16 15:29:15 +02:00
Stephen Kelly
c153f471d2 Remove QImageReader benchmark dependency on QtWidgets.
The QLabel is not actually used.

Change-Id: Ia3f43b734fa52ad002111943ed1ba55b9e8a678c
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2012-10-16 15:29:15 +02:00
Jens Bache-Wiig
3928bd0606 Add HasFrame feature to QStyleOptionTab
This makes it possible for styles like Fusion to draw tabbars different
when they have a frame.

Change-Id: I1bb21198c0c3caf44c757f6f39310bf2509054bf
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-16 15:29:15 +02:00
J-P Nurmi
7501d55ae0 Introduce (private) QStyleAnimation
QStyleAnimation handles style animations in a generic fashion by
sending StyleAnimationUpdate events back to the animation target
instead of calling QWidget::update() directly. This decouples style
animations from widgets and makes it possible to run style animations
for QQuickItems (ie. the desktop components).

The next step is to add "QObject* QStyleOption::target" and use that
everywhere instead of the widget pointer passed to various QStyle
methods.

Change-Id: Ib963c54872805fc3f0123ff922f82c9962a68b90
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2012-10-16 15:29:15 +02:00
Mark Brand
e437051ff5 QComboBox: replace homebrew with QSignalSpy for editTextChanged test
Change-Id: Id4c81ae71d6dc87f9ad7cfb99a89d335162e1f75
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2012-10-16 13:36:43 +02:00
Frederik Gladhorn
e0ad6e5f7d Add documentation for ucs4 overloads.
Change-Id: Ibacd8f260950db195a17cffe8396e8460f227eb9
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
2012-10-16 13:34:49 +02:00
Friedemann Kleint
c6cc55c9fe Windows: Document WinAPI usage for the various compilers.
Change-Id: I139c6546cb84a1fa93920a501cd15eb11fdadbb8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2012-10-16 11:03:26 +02:00
Michele Caini
b3e2c69cc2 Review of documentation.
Documentation has been updated, changes apply to Qt5 as well as Qt4.

Change-Id: I692869971bafffabbb9c323dc031f6d984c1adb9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2012-10-16 10:48:22 +02:00
Giuseppe D'Angelo
8f79ab3549 Fix QComboBox icon testing
The icons used were always null -- the files used to create them were
not present. So

1) add back the files used for the test (qtlogo.png,
copied from src/widgets/dialogs/images/qtlogo-64.png, and qtlogoinverted.png,
its copy rotated by 180°);

2) use QFINDTESTDATA to get the paths to the files.

Change-Id: I26f094079e037116e49e2a95345c2dea7496eecb
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-10-16 10:47:41 +02:00
Stephen Kelly
f7241e8cb9 Exclude a QCOMPARE in tst_QListWidget instead of excluding the whole class.
The original bug was reported as a different test failing. Looking
through the CI logs, that test now always passes, but fastScroll fails
unstably. The fastScroll test is already excluded on Mac, but the patch and
reason for that predates the public git history.

This is a regression since marking the entire test as insignificant,
and shows why insignification of tests should be as narrow as possible.

Narrow this one now.

Task-number: QTBUG-21098
Change-Id: I0d6c22e422af190c9e6331e123db38022af28e4b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2012-10-16 08:41:48 +02:00
Stephen Kelly
f696205b37 Use the mkspec name Qt was configured with instead of default symlink
The default symlink is not available on Windows, so the qplatformdefs.h
header is not available there. Instead we can bypass the symlink and
use the actual mkspec name directly.

Change-Id: I1d7e05f35c1ff56befab5bed307cb1755ade8377
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-16 08:41:48 +02:00
Shawn Rutledge
3dad01ed58 QScreen's physicalSize can change. Ensure siblings are updated.
I have found the following scenarios when the physical size can
appear to change even though you can't actually stretch your monitor:
1) VNC allows setting the resolution.  Physical size will then be a
fraction of the physical size of the monitor on which you display the
VNC window.
2) When you rotate your display, the width and height are reversed.
3) MacOS X simulates a change in physical size when you change the
mode to one whose aspect ratio does not match your monitor, and also
when you use simulated HiDPI mode on a non-HiDPI monitor.  While this
info is basically wrong, since we are now querying the OS for it, we
might as well make sure it is propagated all the way through to the
QScreen object's properties.

Also, make sure that when geometry changes on one screen, all the
siblings are informed of the change in virtual geometry.  Also
simplified the signals (don't need separate ones to inform of
changes which are fundamentally related to each other and always
change together).

Change-Id: I6a98a1c203e24e8fbeef6e90999671e56dc0c655
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2012-10-16 08:41:48 +02:00
Shawn Rutledge
02549ed219 Windows QScreen: handle change in working area when the taskbar moves
Change-Id: Ic496419d89b9cca7653e77ef22978597abcb4e30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-10-16 08:41:48 +02:00
Janne Anttila
cae1eeafff Mark tst_networkselftest as an insignificant.
The ftpProxyServer test case is failing constantly in Digia hosted
Qt-Project CI system, especially on Windows machines. Because this
failing autotest is blocking the use of Digia hosted CI system,
it is marked as an insignificant for now.

There is a bug report QTBUG-27571 created to fix the problem.

Change-Id: I196ad76823874dbc85b1f5abbaf020e02b3c410e
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
2012-10-16 06:48:06 +02:00
Konstantin Ritt
4171cb7a35 Get rid of unused member
Change-Id: Ic6d207cacf02f2e6837f9f35020be7728ec60706
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-10-16 02:47:52 +02:00
Konstantin Ritt
46ed9dbaa0 QTextBlock: Handle surrogates in textDirection()
just like QString does.

Change-Id: I002827d9ec93fb19ef2c0198b5fcd4dae15c5c34
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2012-10-16 02:47:51 +02:00
Konstantin Ritt
34823524ae QFont: Don't detach unless value has really changed
Change-Id: I496b0102853d04652322bf8751e5824aaa0725b7
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2012-10-16 02:47:49 +02:00
Jason Barron
c967c9ec7f Ensure QOPENGLF_APIENTRY and QGLF_APIENTRY are set correctly.
gl2ext.h only defines GL_APIENTRY and not APIENTRY so we should use
this macro if it is available. Without it, code that uses
QOPENGLF_APIENTRY and QGLF_APIENTRY might experience compile errors
due to the differing signatures.

Task-number: QTBUG-27313
Change-Id: Id79d934825928d9913138edc6e8f1b00edc89a8d
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-10-16 02:47:46 +02:00
Tor Arne Vestbø
3e095fcbf5 Get rid of QT_MODULE_DOC_BASE/QT.foo.docs
It was only needed by qt_module.pri anyways, to handle index lookup
paths for qdoc when building documentation that depends on other modules.

Change-Id: Ibf60e2504f388b1aed7231eee04d89d3ba31c6eb
Hand-held-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-16 02:46:04 +02:00
Jędrzej Nowacki
70c45c3b45 Remove an old workaround in QKeySequence.
The workaround is not needed anymore. QMetaType is smart enough to use
dummy functions for types that are not active (switched off by QT_NO_
macros).

It also moves forward Qt build with -qconfig=minimal.

Change-Id: I8308ac8342917a2e32d70836902522e93f2b5014
Reviewed-by: Jing Bai <jing.bai@digia.com>
2012-10-16 02:19:00 +02:00
Oswald Buddenhagen
df880f69c2 remove apparently dead CONFIG+=dylib
Change-Id: Ib7d1739e6a283bb93179345adb9470ac1f064ec8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-16 02:18:34 +02:00
J-P Nurmi
6891d8a4b6 qfeatures.txt: add LOCALSERVER (requires TEMPORARYFILE)
Change-Id: I5b03fee3ceceade1fc0f4e3162eac339b1d147f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-10-15 22:44:29 +02:00