Commit Graph

13777 Commits

Author SHA1 Message Date
Bjoern Breitmeyer
ea70ec8711 Fixed CE build of sqlite3
The updated sqlite3 lacks a forward declaration of localtime.
Depending on the CE version that forward declaration
was sometimes available.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(forward-ported from commit fb1649d30b)

Change-Id: Ief6d8ed1cad51fa92a333a20c5dfe781d19761eb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-23 12:49:39 +02:00
Mark Brand
7e0bf979a4 update bundled sqlite to 3.7.17.0
Change-Id: I90c213f1501d71b80babb83a0306b5df8e18e905
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-05-23 12:49:39 +02:00
Leonard Lee
ad443dfb1d Fix clipping of QTextList decorators.
List decorators may be clipped if you set a large font size and/or
small indent for a QTextList. This fix is to prevent clipping by
moving list decorators and items to left (or to right in case of
right to left layouts) so that the list decorator is always painted
inside the layout.

This commit fixes painting related issue, so auto test is not needed.
The manual test program can be used for verification purposes.

Task-number: QTBUG-5111
Change-Id: I7fdd92399445d33fe9eaf525a05fe5cd860b57c6
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-23 12:49:39 +02:00
Morten Johan Sørvig
5d07a4d944 Process initial expose events immediately.
Required to prevent qmlscene flicker on startup.

Also brings back that qWait() in tst_QGL::graphicsViewClipping()
that seems necessary after all.

Amended-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Change-Id: I14ba6e18ac98e5df1ce8ecbc263b30176b67d111
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-05-23 12:49:39 +02:00
Jocelyn Turcotte
b2cce40b30 Fix the Mac build on 32bit with c++11
CGFloat is a float on 32bit and qreal is a double. This causes a
narrowing error when building with c++11 support.

Change-Id: Ia73378ff9798d1f547b37f97393564e2c9e3672d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-05-23 12:49:39 +02:00
Friedemann Kleint
5d5a476e59 Windows: Pass auto-fixed window flags to shouldShowMaximizeButton().
Task-number: QTBUG-28407
Task-number: QTBUG-31258

Change-Id: Ie918fddbeb6adee4ccbfffb2fab62b3d1842d272
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-23 12:49:39 +02:00
Friedemann Kleint
15fbc0112d Suppress "Click to focus" for widget windows.
Calling requestActivate() on native child widgets
can cause focus problems (keyboard input going to
widgets that don't handle it,etc).

Breakage introduced by:
4675681b5e88b178adbdef775ac6a4b1e573458 .

Task-number: QTBUG-30922

Change-Id: I4efdfef6bffc89fe62156d248f05ed99c58bf794
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-05-23 12:49:39 +02:00
Friedemann Kleint
8078a04e19 Observe initial screen for fullscreen windows.
Introduce flag to determine "create" state and do
not try to determine the screen from the geometry.

Fixes breakage introduced by
ded4613ae4.

Task-number: QTBUG-31166
Task-number: QTBUG-30724

Change-Id: Ibe8df95e0ea84be070fdd06b158a6a10c76d42be
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-05-23 12:49:39 +02:00
Friedemann Kleint
b94fe52f85 Clear QWindowPrivate::positionAutomatic in setFramePosition().
Task-number: QTBUG-31166

Change-Id: Ic0fa26e93db5a035539850ece819b1df2c58e95a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-05-23 12:49:39 +02:00
Gabriel de Dietrich
004f25df78 QGLWidget: Support retina framebuffer grabbing
And update the opengl/grabber example.

Task-number: QTBUG-31173
Change-Id: If09f1f3634b353d034f51240fc68be6ee7aabb48
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-05-23 12:49:39 +02:00
Gabriel de Dietrich
602bd98737 Make QWindow update its screen when moved to a different one
Also implements the Cocoa backend for that.

Change-Id: I32977e12a04e1cf48b12333442482746c69ce133
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-05-23 12:49:39 +02:00
Samuel Rødal
f610814b05 Made the X11 eglfs hooks provide mouse input.
Makes the X11 hooks slightly more useful for testing eglfs.

Change-Id: I53652cef7b9fc6830ee72e44c153fe281bc1bd7d
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2013-05-23 12:49:39 +02:00
Gabriel de Dietrich
7a85fccb8f Update opengl/overpainting example for high-dpi
Depends on I8e81a0c6af61df1c4497a5934e2b89bad6f616f0 to properly
render the overlay.

Change-Id: I7ef6b726cc06eb750e7c00beb4ec6e80e85866a1
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-05-23 12:49:39 +02:00
Gabriel de Dietrich
27f68818c8 Cocoa: Make sure main window gets focus after closing modal dialog
As explained in the code, this is due to our event dispatcher. This could
also make applications crash due to the way we bind windows to the menubar
in the Cocoa QPA plugin.

Task-number: QTBUG-30451
Change-Id: I6dd190d5b3b83f1216caec0b14414efa771634a5
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-05-23 12:49:39 +02:00
Friedemann Kleint
ef8ece3f93 Stabilize tst_qgraphicssceneindex.
Change-Id: I8cda10a5a4c9bf949b560e7be4da9bef92667688
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
2013-05-23 10:02:19 +02:00
J-P Nurmi
7a6c0f0673 QFusionStyle: fix highlight colors
Respect the current color group of the palette,
and fix the inactive highlight color.

Task-number: QTBUG-30034
Change-Id: Iddfc15a2dd98d4588c6c587b7aaf64d88538fa28
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-05-23 09:58:18 +02:00
Friedemann Kleint
23fd348631 QPrintPreviewDialog: Prevent changing of page in resize handling.
Task-number: QTBUG-14517

Change-Id: I59e444eed8d44be9fb7213fdbab4be473d595be8
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
2013-05-23 09:31:27 +02:00
Ray Donnelly
7582bb51f3 Android: Disable xkbcommon in configure.exe
Task-number: QTBUG-31220

Change-Id: I711fa5d37cb58216199cc0ce479a14a3300d8cb8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-23 06:48:02 +02:00
Gabriel de Dietrich
9c674c58fb Cocoa: Remove "Incomplete implementation" compilation warning
Change-Id: I1db62c2504b55ef1451cb147d745c19cbef7de1e
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2013-05-23 06:37:02 +02:00
Shawn Rutledge
767342dd5d A Dialog should not hide when the application is deactivated
To get this behavior, use Qt::Tool.

Task-number: QTBUG-31133
Change-Id: I4811b5fe7e180a63bcdfe8018b35a56b370d9b61
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-05-23 06:36:52 +02:00
Dmitry Shachnev
d1ad5d6b46 Do not call g_type_init() with GLib >= 2.36
g_type_init() is deprecated and the type system is now initialized
automatically.

Change-Id: I5bf5702136cc948dea0a55676dfee2486f12ca00
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2013-05-22 23:57:16 +02:00
Christian Strømme
77c0216369 Android: Added the attribute "extends".
Enables us to detect if a library should be added as a dependency or not.
E.g., libQt5MultimediaQuick_p should only be added as a dependency if an
application is using both QtMultimedia _and_ QtQuick.

Task-number: QTBUG-30861
Change-Id: Id62642c40e2ecca7149d249f65c7b0c950898374
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-22 23:31:46 +02:00
Oswald Buddenhagen
23ee57c5e9 move detectArch() call right after autoDetection()
it belongs there (technically, it would not hurt to actually call it
from within autoDetection()).

Task-number: QTBUG-31095
Change-Id: I7eb53762513eb9cebfd22317c8f44fe123eb91dd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-05-22 21:18:02 +02:00
Oswald Buddenhagen
f18b0810be reality adjustment: rename generateSystemVars() => prepareConfigTests()
Change-Id: I3f9cd8b8cdb54d682d0207f28168f4e518b98280
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-05-22 21:17:59 +02:00
Oswald Buddenhagen
836260974f purge dead output-related code
QTBUILDINSTRUCTION is not evaluated anywhere anymore.

Change-Id: Ie23f61f5a25594591efdafdc49e279f13623b049
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-22 21:17:56 +02:00
Oswald Buddenhagen
c21a1621ce purge buildkey-related dead code
Change-Id: I196dbe33b349d437450a5ea68befb3d6bfe1b574
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-22 21:17:54 +02:00
Oswald Buddenhagen
62b4525d6f purge obsolete EVAL #ifdefs
clearly, nobody's been maintaining them for an extended period of time.

Change-Id: I41c6b40026f107d34f7964934f36bc727fb6b795
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-22 21:17:51 +02:00
Samuel Rødal
a53e929889 Fixed XCB build with -no-opengl
Task-number: QTBUG-30115
Change-Id: I1651a1cdda2a5370e23fabe631b0742a617631c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-22 15:24:02 +02:00
Samuel Rødal
f3aad61120 Fixed crash associated with reparenting a QGLWidget
We need to make sure that we don't reset() the context when the
QGLWidget is being reparented, as that will lead to the QOpenGLContext
being destroyed and not recreated, leading to a crash in makeCurrent().

Also, don't destroy() the widget if it has not yet been created, as in
that case there's no ParentAboutToChange event sent.

Task-number: QTBUG-31016

Change-Id: I409fff94456802a80bd72b470a6fbaee87505baa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-05-22 15:23:59 +02:00
Paul Olav Tvete
3c50917a6a Android: Fix crash when using QBackingStore
When making a QBackingStore for a QWindow that was not created yet,
Qt would try to dereference the (null) platform window pointer.

Task-number: QTBUG-31022
Change-Id: I866c71cce9d401ebb598ea4cc91f7cf9bbb30982
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-22 15:20:18 +02:00
Bernd Weimer
18db71d601 QNX: Fixed build of QPA plugin
Added private core and gui includes to project file. Those were
implicitly included in the past, but removed with commit 289302e.
Removed redundant module, as well.

Change-Id: I878d9acabc5497702dc282e25d6fdd9016ae2ad6
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2013-05-22 14:02:36 +02:00
Topi Reinio
e724fd4710 Doc: Updated content for Drill Down example
QtWidgets/Drill Down example uses images and information about Nokia's
old office locations as content. This change updates the example to
use concepts related to Qt instead.

In addition,
    - Documentation, screenshot updated accordingly
    - Corrected aspect ratio when scaling image items in the scene
    - Added a gray background with a slight gradient
    - Removed Symbian-specific code remnant

Task-number: QTBUG-31075
Change-Id: Id8abfbf7f4033f74172477570f8f28390854101c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-05-22 13:48:53 +02:00
Kai Koehne
f9b3b02360 Fix compiler warning about deprecated API
Explicitly disable warnings about qInstallMsgHandler being deprecated.
We have to use it in testlib to not break test cases still using it.

Change-Id: Icf7eb6c4d549f80ef45a4201fab2ac3eb03dda9e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-05-22 13:18:03 +02:00
J-P Nurmi
fffca846c1 Fusion palette: add missing disabled roles
Task-number: QTBUG-30034
Change-Id: I98358cfe43963ef27a8aa527d6100095be753305
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-05-22 13:07:34 +02:00
Shawn Rutledge
381c0050c1 Ignore mouse enter/leave on non-exposed windows
If you put two OpenGL widgets in two tabs, you will have several
QNSViews on the Mac (because using OpenGL forces a lot of the widgets
to be non-alien).  The GL widget on the non-visible tab will not be
exposed, but QCocoaWindow::childWindowAt is recursive and was returning
the last window found which contained the mouse location; but the
children are not reordered when switching tabs.  It should ignore
the invisible windows and report that the mouse entered the
one which is visible.

Task-number: QTBUG-30934
Change-Id: Iae28db56e15815671bf39e1b1f382c8c285532bd
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2013-05-22 10:31:03 +02:00
Eskil Abrahamsen Blomfeldt
2cde2fca6f Fix Qt for Android build with recent SDK bundle
In the recent revisions of the Android SDK bundle, the dx
tool has moved from platform-tools/ and into
build-tools/<revision-number> where revision-number is 17.0.0 at
the moment. To enable building on these SDKs, we add
detection for the dx tool and an environment variable which
can be set to override the revision number to provide a way
to build it against future revisions as well.

Task-number: QTBUG-31199
Change-Id: I0d6a22163dc2e50f7a81cd3fe8f3d53c6335aaee
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-05-21 15:24:13 +02:00
Oliver Wolff
184e1a37e8 Fixed autotest build for configurations without printsupport
Change-Id: I7fc4a6e4885e9640ecfbe93547fb56868ebba309
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-21 07:25:39 +02:00
Maurice Kalinowski
a2d75c5558 apply standard behavior
According to documentation hoverLeaveEvent calls update(), which happens
in QGraphicsItem. As QGraphicsWidget has not been calling parent
implementation that did not happen and e.g. animatedtiles example did
not work correctly.

Change-Id: Ia25dda967bd21298c763996589c63dc173ba6b6a
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2013-05-21 07:13:56 +02:00
Michael Brasser
8a082ad32c Fix linuxfb plugin when fb offset is present.
Task-number: QTBUG-30994
Change-Id: Ic9e80f5bfaf54e89e9a9187f3e73e57015ed8c3d
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-05-20 15:36:52 +02:00
Stephen Kelly
899af081d7 Make CMake not fail if EGL is not found.
As EGL is not a 'public dependency' of Qt, it is ok for it not
to be available where Qt is deployed.

Change-Id: I02dcc5f72ca4437210cff10e8b557e216f3e0419
Reviewed-by: Johannes Lochmann <johannes.lochmann@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-05-20 15:20:46 +02:00
Stephen Kelly
c2f2c8a4e7 Check that files we expect to find actually exist when using a cmake package.
Change-Id: If7c724daa85df5e29e410b8deb4e69beb43ee8ea
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2013-05-20 15:20:26 +02:00
Friedemann Kleint
0feb1aadfd configure/Mac: Handle errors by xcrun.
xcrun occasionally prompts for a license or outputs errors which
results in:

configure: line 2488: [: : integer expression expected

Check the output and bail out on error.

Change-Id: Ic1ae62b5f19cf87365c38901e98d6b385cdb39a4
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-05-20 15:20:26 +02:00
Oswald Buddenhagen
2bf76918ab mark private dependencies as such
Change-Id: Ic93c8dc5aaad3973e4d4fc6bb3b70ad7c0a632b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Oswald Buddenhagen
289302e61f remove redundant QT statements
the top-level file already adds core-private and gui-private

Change-Id: Ic3e3a9c5683cc43f5e7a1075efbd7ce7c2f41e1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Oswald Buddenhagen
da03abe54a make sure that dependencies added by the pri files become visible
Change-Id: I0ec56a0a7bd13cd09451cfc27afde1f75cd37cba
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Oswald Buddenhagen
5957a8e01b update size calculations for assignment statements
this was forgotten when the value lists were extended by a size hint.

Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
(cherry picked from qtcreator/f24c9865306624c2fc150d4bd262a5c4d5a3689a)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Orgad Shaneh
119b53be83 QMakeEvaluator: Set pro file as source for internal variables
Task-number: QTCREATORBUG-7006

Change-Id: I3f599f92d03b6f9fdf65b12cf4090e28cc497fbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtcreator/6e3af2bf2e2833e0ecbc9b366af8e06abd7ecf96)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Orgad Shaneh
81f4ecdd79 Fix warning
Warnings came up using MinGW 4.4:
* qmakebuiltins.cpp: 'QString windowsErrorCode()' defined but not used
[...]

Change-Id: I80827f7f740ff380f13cef96d6b43baaa7e179cb
(cherry picked from qtcreator/0e13cf3faffc7463ae2bf535dfdb008202112cc4)
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Daniel Teske
76bf4a24f1 Qt4Project: Do a build_pass evaluation
Some projects set TARGET or DESTDIR only in the build_pass

Task-number: QTCREATORBUG-4273

Change-Id: I3673dd93b37b10102a0c1f1ce053e1aef8aaf53f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
(cherry picked from qtcreator/95169eb8e39c6f43b7e74fbb18d4db19a38b0124)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-20 15:20:26 +02:00
Martin Smith
e469ee1340 qdoc: Brief attribute was written incorrectly
The brief attribute for a C++ property was being written
after the <property> tag had been closed. This has been
fixed by explicitlty writing the brief attribute for each
XML tag that has a brief text to write.

Task-number: QTBUG-31149
Change-Id: Ic3857b8fa50cfb84536b838771751d8b92ed590e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-05-20 15:20:26 +02:00