Alexey Chernov [Mon, 2 Jul 2012 19:14:31 +0000 (23:14 +0400)]
Color transparency support in html import/export
Export of color transparency component is added for cases where color
is exported to html. New static function colorValue() is added to
prepare CSS string representation of QColor. When the color is opaque,
it falls down to QColor::name() method which was used previously,
otherwise it returns 'rgba()' CSS statement or 'transparent' keyword in
case transparency is 0.
6-digit precision is used for alpha value as it's maximum which can be
processed properly by Gecko and Webkit engines
(http://lists.w3.org/Archives/Public/www-style/2009Dec/0295.html).
Import part for rgba() statement was also added to QCssParser. It
supports rgba() color values as stated in CSS Color Module Level 3
(http://www.w3.org/TR/css3-color/#rgba-color).
Import of undocumented statement 'rgba(int,int,int,int);' was also
added to preserve regression test success and to provide compatibility
with previous code relying on this behaviour.
Test cases added to QCssParser autotest for rgba(int,int,int,float)
statement and to QTextDocument autotest for rgba(int,int,int,float)
and 'transparent' statements for certain 'color', 'background-color'
and 'bgcolor' properties.
Change-Id: Id341c4e800249820d52edef8003e50f9a74d062b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Eskil Abrahamsen Blomfeldt [Mon, 9 Jul 2012 13:52:13 +0000 (15:52 +0200)]
Support fallback fonts in DirectWrite font engine
When selecting fallback fonts for a DirectWrite font, we would
cast the font engine to QWindowsFontEngine and get unpredictable
results and crashes. This change factors out getting the LOGFONT
data from the QFontDef struct and will use this to create a new
DirectWrite engine.
Task-number: QTBUG-22658
Change-Id: I743944d9a44d8742b47b1aa3354532493362cc4a
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Marc Mutz [Mon, 7 May 2012 17:45:40 +0000 (19:45 +0200)]
QtDBus: declare some classes as shared
Change-Id: I82f8d8d02f4a5276924f579871547c0a34605424
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Marc Mutz [Thu, 5 Apr 2012 14:42:41 +0000 (16:42 +0200)]
Q_DECLARE_SHARED: mark the type movable
All implicitly shared classes are by definition movable,
so this patch adds Q_DECLARE_TYPEINFO(Type, Q_MOVABLE_TYPE)
to Q_DECLARE_SHARED.
Change-Id: Idf8989ae1a7ed6d1ac13fccb7eaef7395a875350
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Marc Mutz [Fri, 4 May 2012 13:27:56 +0000 (15:27 +0200)]
QtCore: mark some classes as shared
Change-Id: I811d3eebd87c230883cc579c20f9fa4e14ff9521
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Marc Mutz [Fri, 6 Jul 2012 13:58:00 +0000 (15:58 +0200)]
fix compilation with conforming compilers (e.g. GCC >= 4.7)
In qdbus_cast(), qMetaTypeId<QDBusArgument> as well as
qvariant_cast<QDBusArgument> are used. They don't depend
on any template argument of qdbus_cast(), so their
definitions need to be available at function template
definition instead of instantiation time.
But the necessary Q_DECLARE_METATYPE(QDBusArgument)
was at the end of the header, after the defintion of
qdbus_cast(), which is too late for conformin compilers.
Fixed by moving it up just after the QDBusArgument
definition.
Similarly, in tst_qdatetime and tst_qvector, the
Q_DECLARE_METATYPE() for Qt::DateFormat and QVector<int>,
and with it the specialisation of QMetaTypeId<>, were
issued after the first use of meta typing; too late for
conforming compilers.
Change-Id: I25ca0b06e68d5184597a22708404a8f2040b2de1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Laszlo Papp [Sun, 8 Jul 2012 11:49:05 +0000 (12:49 +0100)]
Make the x() and y() method documentation consistent with the rest
Change-Id: I24d34fe32e2ed7673ba525db0543e705d08037c4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Laszlo Papp [Sun, 8 Jul 2012 11:23:45 +0000 (12:23 +0100)]
Add note and references to the operator*=() methods for consistency
Change-Id: Ic2681e1db39a30619d3b2a906595cdbdd0e766d6
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Konstantin Ritt [Mon, 9 Jul 2012 01:30:28 +0000 (04:30 +0300)]
Optimize QFontMetrics:: boundingRect() and left/rightBearing()
by avoiding unneeded metrics calculation.
Same optimization for QFontMetricsF.
Change-Id: I7fd0caa2ddb45862ee9e9c0519a71b03bcd0cb6f
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Konstantin Ritt [Mon, 9 Jul 2012 14:08:54 +0000 (17:08 +0300)]
Fix the UCS-2 surrogates handling in Q*FontEndine*::stringToCmap()
by making sure QGlyphLayout's numGlyphs member is properly initialized
if the string-to-glyphs lookup was successful
(tip: a surrogate pair produces a single glyph index).
Change-Id: I01953f3b6281d79e1a214bfab0424e796d94769a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Konstantin Ritt [Mon, 9 Jul 2012 14:06:33 +0000 (17:06 +0300)]
Optimize Q*FontEngine*::stringToCMap()
by avoiding the glyph metrics calculation when those metrics weren't requested
(QFontEngine::GlyphIndicesOnly flag has been passed).
As a side effect, this fixes a crash in case QGlyphLayout
was initialized only partially (with the glyphs array and the size).
Change-Id: I7d67abc2a74683131361fa21f8be203f61f247bc
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Konstantin Ritt [Mon, 9 Jul 2012 13:50:32 +0000 (16:50 +0300)]
Move ShaperFlags enum from QTextEngine to QFontEngine
These flags are specific to font engine(s) and has nothing
to do with the text engine or the text layout.
Change-Id: I4bb793c3c634b3cf0ae0a8a8c23b946fad5874b6
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Thomas Senyk [Thu, 5 Jul 2012 16:55:29 +0000 (18:55 +0200)]
Adding iMX6-device-files
Change-Id: Ifdfacf7201c9ee47783ae782d1f9042fe529a039
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Sergio Ahumada [Mon, 9 Jul 2012 10:17:13 +0000 (12:17 +0200)]
Change deprecated use of CONFIG+=qdbus to QT+=dbus
qdbus.prf was deprecated by
812adb58ba714c69eea9249584da2efd4fedecbc
Change-Id: I5ceb65c1c671734491fe12e2174e6d8ecc14147d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Casper van Donderen [Fri, 6 Jul 2012 12:31:46 +0000 (14:31 +0200)]
Fix installation of syncqt.
- Use the syncqt from the source dir, not build dir.
- Copy both syncqt and syncqt.bat on win32.
Change-Id: Ic07805d03124386fb112c154e22363a06ae1c8ec
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Eskil Abrahamsen Blomfeldt [Mon, 9 Jul 2012 11:24:30 +0000 (13:24 +0200)]
Fix glyph positions with DirectWrite font engine
Make same change as we have done in the other engines (floor instead
of round) to be in sync with changes in the paint engines.
Task-number: QTBUG-26409
Change-Id: I7a99aa27c93cb695ac91507505ef0b940cd78ebc
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Eskil Abrahamsen Blomfeldt [Mon, 9 Jul 2012 12:14:36 +0000 (14:14 +0200)]
Fix bounding box of DirectWrite font engine
Vertical bearings of the font were ignored, giving the wrong height.
Also, the left bearing is right bound in DirectWrite, so the sign
should be flipped.
Task-number: QTBUG-22649
Change-Id: I82934f5b08e68e46d1b2221b35008bf9d75c5748
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Stephen Kelly [Mon, 9 Jul 2012 07:56:59 +0000 (09:56 +0200)]
Update the moc no-keywords test for the signals replacement.
Change-Id: I5c544e71615b00ff8fd337579fcd185e4b8e24af
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Marc Mutz [Mon, 9 Jul 2012 13:05:33 +0000 (15:05 +0200)]
QNX: QtGlobal: compile as a C header again
<utility> is a C++ header, only execute the check for the
Dinkumware standard library if we're compiling under a
C++ compiler.
Change-Id: I1b24e76f20bfc03b70a330f9da96b4f815106e61
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Oswald Buddenhagen [Mon, 9 Jul 2012 12:09:01 +0000 (14:09 +0200)]
deal with %PATH% containing parentheses
we need to make cmd escape the expanded output, so it doesn't confuse
its own command line parsing (which happens later!).
Change-Id: I0c2c71d276c0aebe3c2163f7f08db8050a14d7ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thomas McGuire [Mon, 9 Jul 2012 12:32:28 +0000 (14:32 +0200)]
Update .gitignore to ignore mkspecs/default-host
Change-Id: Idc497acbd11730635fccbbc558f46dc5b5b40a0c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jiang Jiang [Tue, 3 Jul 2012 08:17:49 +0000 (10:17 +0200)]
Fix cursor truncate to include line position
Since we could have moved the line position (QTextLine::setPosition),
the truncating position should be adjusted with that.
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
(cherry picked from commit
ca89c49fa2c5cbb3945897046f33eed9f7da846c)
Change-Id: I89ea1a3776a50732181bdfea9e79b4dddef950d4
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Thorbjørn Lund Martsum [Thu, 12 Apr 2012 14:20:45 +0000 (16:20 +0200)]
QItemDelegate - add a more comprehensive test
This is a bigger test after this change:
c3e1abad4e141e6e9d876e5cff194c473a2654eb
Beside the test of behavior it has the class
FastEditItemView which could be useful in the future.
QTestEventLoop::instance().enterLoop(1) does not perform well.
(IE it makes CI slower). My class could be used to extensions.
(or maybe even to remove a few of these calls)
Change-Id: I4f1460873cd07ddc482d5cfe462b59c47ebb189f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Joerg Bornemann [Mon, 9 Jul 2012 09:20:19 +0000 (11:20 +0200)]
fix "paintEngine: Should no longer be called" warnings on Windows
Change-Id: Idece743d1f28f1c579d823123b6814fae786b58b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Bjoern Breitmeyer [Fri, 6 Jul 2012 12:12:45 +0000 (14:12 +0200)]
removed unecessary ce override of QT_INSTALL_PREFIX
this stopped the installation of mkspecs for windows ce
Change-Id: Ic57337904b88e4460f9f4110b08ecefb1a2eed8b
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Girish Ramakrishnan [Fri, 6 Jul 2012 15:30:51 +0000 (21:00 +0530)]
qpa: Fix crash when native interface is null
QPlatformNativeInterface is optional.
Change-Id: Iae2a6de63fc8a36deb6059047a0d7f05defb6b5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Tasuku Suzuki [Tue, 29 May 2012 01:21:13 +0000 (10:21 +0900)]
Remove Library dependency on Settings
made QLibraryInfo available with QT_NO_SETTINGS.
QKdeTheme is removed when QT_NO_SETTINGS is defined.
Change-Id: I63d619bb305e6c23985d9ea50c72d39a697b7a4b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Joerg Bornemann [Mon, 9 Jul 2012 07:55:10 +0000 (09:55 +0200)]
remove QEXPECT_FAILS from tst_qwidget
Task-number: QTBUG-26420
Change-Id: Ic4cb725cda418bfb427e7d834c0e07c2543d408d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joerg Bornemann [Fri, 6 Jul 2012 12:58:45 +0000 (14:58 +0200)]
QWindowsWindow: fix FullScreen state transition
When putting the window into FullScreen state, we
- must not override the saved style and geometry
if it has been saved before.
E.g. FullScreen -> Minimized -> FullScreen
- have to retrieve the window's normal geometry
if the window is currently minimized.
E.g. Minimized -> FullScreen
Task-number: QTBUG-26420
Change-Id: If4164feee5997682406701f0ea7018d7f6257d35
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joerg Bornemann [Fri, 6 Jul 2012 12:51:14 +0000 (14:51 +0200)]
QWindowsWindow: fix state transition FullScreen -> Minimized
When going from FullScreen to Minimized we must not restore the window's
saved geometry.
Task-number: QTBUG-26420
Change-Id: I75af8bb9aeb38f5bc24bc4e0b725786c8c22fdb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joerg Bornemann [Fri, 6 Jul 2012 12:49:34 +0000 (14:49 +0200)]
QWindowsWindow: fix restoring from minimized to fullscreen
This fixes the state transition FullScreen -> Minimized -> FullScreen.
Task-number: QTBUG-26420
Change-Id: I555c4f332e796b465149e592c2583d615b37c4ec
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Joerg Bornemann [Fri, 6 Jul 2012 12:45:07 +0000 (14:45 +0200)]
fix fullscreen state in QWidgetWindow::handleWindowStateChangedEvent
A widget can be Qt::WindowMaximized and Qt::WindowFullScreen at the same
time. See tst_qwidget::windowState.
Task-number: QTBUG-26420
Change-Id: I89d6edb857f41cda911152244cf23d36dfd1cdce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Oswald Buddenhagen [Fri, 6 Jul 2012 17:39:26 +0000 (19:39 +0200)]
make QT_BUILD_PARTS setting in qmodule.pri additive
that way it is actually possible to add additional parts from the qmake
command line.
Change-Id: I42e0b58424292cebafb57538a879204d370397bb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Laszlo Papp [Fri, 6 Jul 2012 14:03:04 +0000 (15:03 +0100)]
Use QDoc instead of Qdoc to be consistent with the rest of the documentation
Change-Id: Iec031e207609b87e3c85bec66a7aaebd971973d1
Reviewed-by: Richard J. Moore <rich@kde.org>
David Faure [Fri, 6 Jul 2012 08:16:03 +0000 (10:16 +0200)]
QMimeType: document preferredSuffix()/suffixes() better
Change-Id: Icf4aab3516cd622d9932e32cb0bd819bef22ce9b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
David Faure [Mon, 2 Apr 2012 09:42:26 +0000 (11:42 +0200)]
Fix QMimeType::operator== to only compare mimetype names.
The name is the unique identifier. Code such as
if (oldItem.mimeType() == newItem.mimeType())
really wants to detect whether the item has a new mimetype (name),
not compare static mimetype data such as comments and icons.
Change-Id: I5fe56443295c91e1024c066ad6e7f93d842ae507
Reviewed-by: Wolf-Michael Bolle <wolf-michael.bolle@nokia.com>
Bjoern Breitmeyer [Fri, 6 Jul 2012 08:48:06 +0000 (10:48 +0200)]
fixed unittest builds for wince
removed printsupport tests for wince as there
is no print support on wince and removed the special
handling for wince from 4.8 on some tests as the dependent
modules are not part of qt base anymore
Change-Id: I4ffb22da11f98beee1013f775cb5ce4b936d3211
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Marc Mutz [Thu, 5 Apr 2012 13:34:46 +0000 (15:34 +0200)]
Q_DECLARE_SHARED: fix docs; require and use member-swap
By requiring a member-swap, this macro becomes applicable to a wider
range of types (e.g. QFont, which has another member besides 'd'),
while at the same time avoiding the encapsulation leak that is data_ptr().
There have been concerns over breaking existing users of
this macro, but for some time now, Q_DECLARE_SHARED only
works within QT_BEGIN_NAMESPACE anyway, so its a safe bet
that all users of this macro are in-tree.
Change-Id: I7fdd9dba204554af8d3f9768b97bb42847a5acf4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Marc Mutz [Thu, 5 Apr 2012 12:49:02 +0000 (14:49 +0200)]
QPalette: add member-swap
Implemented as in other shared classes (e.g. QPen), except that
I wrapped the bitfield in a union to speed up swapping.
(GCC didn't manage to optimize (hand-rolled) swaps of adjacent
bit field elements into an integer one, even at -O2).
GCC -pedantic complains about anonymous structs, so I had to
give the struct in the union a name.
Change-Id: I519e1c2f88f6ae2dffed38b493991189d67073b8
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Marc Mutz [Thu, 5 Apr 2012 12:49:02 +0000 (14:49 +0200)]
QtNetwork: add member-swap to shared classes
Implemented as in other shared classes (e.g. QPen).
Change-Id: Ib3d87ff99603e617cc8810489f9f5e9fe054cd2a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Marc Mutz [Mon, 7 May 2012 18:19:40 +0000 (20:19 +0200)]
QtGui: replace some copies with swaps
This provides move speed even for non-C++11 compilers and avoids
having to call the copy assignment operator from within copy ctors.
(which will result in infinite recursion when using the copy-swap idiom).
Change-Id: I379bc8bf2c72d9f986c0f17f9eef56cd592e7a06
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Casper van Donderen [Fri, 6 Jul 2012 12:26:27 +0000 (14:26 +0200)]
Doc: Replace all occurences of \BR with \br.
Change-Id: I9b0fac5fac7b0467de2d9a57a951b10a0f5438d7
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Joerg Bornemann [Wed, 4 Jul 2012 09:01:02 +0000 (11:01 +0200)]
make tst_qwidget significant again on Windows and Linux
To let this test pass, a bunch of test cases had to be disabled.
Task-number: QTBUG-25300
Change-Id: I26bc08f366c43fb2bf3ba42a5fcbeb3888ed02c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Laszlo Papp [Fri, 6 Jul 2012 14:34:49 +0000 (15:34 +0100)]
Fix some typos in the qdoc manual
Change-Id: I7d5e4ad684556b6c96fde2dcbdce6c772856cc33
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Miikka Heikkinen [Thu, 5 Jul 2012 14:09:44 +0000 (17:09 +0300)]
Update framestrut initially after window creation
Creating native widgets such as QGLWidget and then calling move()
on top level widget before doing show() on it caused framestrut to
be incorrect, as native widgets force the creation of the
native windows also on their ancestors when they are constructed,
rather than waiting for window to be shown.
Change-Id: I3e8d60547b3b683178ba059c5d92526a1d447442
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Fri, 6 Jul 2012 09:44:14 +0000 (11:44 +0200)]
QArrayData: Fix gcc warning about parentheses in 'a + b & c'.
Change-Id: I2c08dc8170c77de401663b1643ebca8484dbfec0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Kim Motoyoshi Kalland [Thu, 5 Jul 2012 12:52:53 +0000 (14:52 +0200)]
Fix division by zero in triangulating stroker.
Task-number: QTBUG-15621
Change-Id: I10e0e39e57078507a01e1c2edb59fa52fd932f6c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kim Motoyoshi Kalland [Thu, 5 Jul 2012 15:01:25 +0000 (17:01 +0200)]
Remove duplicate triangulating stroker implementation.
Change-Id: I9d8f609c9ecb02dd25e588313bc98db4b9325974
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Bjoern Breitmeyer [Thu, 5 Jul 2012 13:20:50 +0000 (15:20 +0200)]
fixed ce makefileenvironment
XQMakeSpec is not available after configure
but the QMakeSpec contains the correct value
Change-Id: I6cd4da8b0d6c95565f31842c17611ffd361bc010
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 09:34:42 +0000 (11:34 +0200)]
ifdef out the "clears variables previously set" warning
it produces way too many false positives to be useful.
Change-Id: Iefa423f96fa5574267b1468abb5efc8454ab54a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Rohan McGovern [Thu, 5 Jul 2012 23:03:28 +0000 (09:03 +1000)]
qt_parts.prf: fixed handling of demos
Subdir for demos/demos.pro is 'demos', not 'examples'.
Change-Id: Ic4d80501e5d910891b0436ecd9881b79a4a99090
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tasuku Suzuki [Sun, 1 Jul 2012 08:27:30 +0000 (17:27 +0900)]
QPlatformScreen::grabWindow() support on Mac
Added QCocoaScreen::grabWindow() and copied Qt 4 implimentation.
examples/desktop/screenshot works but WId window is not handled yet.
Change-Id: If228bb59d98a5166788ab38293d7e6a6300d1f85
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Jeremy Katz [Fri, 29 Jun 2012 11:19:26 +0000 (13:19 +0200)]
make QtGui compile when QT_NO_WHEELEVENT is defined
This is necesary but not sufficient to make the small configuration
build.
Task-number: QTBUG-24816
Change-Id: I1a06555e6f54f4d3c09a34fd50bf76e7b47d469f
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Mitch Curtis [Thu, 28 Jun 2012 13:42:51 +0000 (15:42 +0200)]
Improve QDate, QTime, QDateTime auto tests.
Add more test data, merging operator!= tests in with operator==
to take advantage of added data.
Change-Id: If0426a3d01b8800cb7363385dbf3bcb21af5ed8f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Miikka Heikkinen [Fri, 6 Jul 2012 10:24:15 +0000 (13:24 +0300)]
Fix positioning when embedding native widgets such as QGLWidget
Embedding native widgets creates window before ActiveQt has a chance
to set the _q_embedded_native_parent_handle property on the window,
so embedded flag doesn't get set during window creation.
Update embedded flag also when setting window flags.
Task-number: QTBUG-26438
Change-Id: Id29d7123de81d6542dfd6471d6dba3d31bbfe2df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Martin Smith [Fri, 6 Jul 2012 10:16:59 +0000 (12:16 +0200)]
qdoc: Removed several #if 1 macros.
The code should be there. Also removed
a few obsolete #defines.
Change-Id: Id63418b344157a99ac502329eea4f0bc9dc77849
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Casper van Donderen [Thu, 5 Jul 2012 12:49:10 +0000 (14:49 +0200)]
QDoc: Fix relative URL generation for cross-linking.
Previously the URL relative to the installdir was used, now we use a
relative URL to the index file.
Change-Id: Ia2485aa49da8240901d0db1f102eb48da689ef2a
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Martin Petersson [Thu, 5 Jul 2012 11:05:21 +0000 (13:05 +0200)]
tst_qudpsocket: Interface fix for Windows Xp
On Windows Xp we can not connect to the pseudo interfaces used for
Teredo, so do not add these to the tests.
Change-Id: I4e20c880fa2d18f266ffcef2f640d8b2e6d0cd21
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Jorgen Lind [Thu, 5 Jul 2012 11:59:22 +0000 (13:59 +0200)]
Implement nativeResourceFunctionForContext for xcb
Change-Id: Icf6c39fb456b39fec58ac2f74c569b9d01993589
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Martin Smith [Thu, 5 Jul 2012 11:58:17 +0000 (13:58 +0200)]
qdoc: Removed several #if 0 blocks.
Removed a lot of dead code.
Change-Id: I237521efab7dd046d3a47ab92a6a0e083c59ab55
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Rohan McGovern [Thu, 5 Jul 2012 23:00:08 +0000 (09:00 +1000)]
qt_parts.prf: fixed examples, tests, tools always disabled
exists() resolves the path relative to qmake's current working
directory, which is mkspecs/features. Explicitly refer to the full
path.
Change-Id: I04e9f377528bffc1ebeeed69c86d73b85a117423
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Bjoern Breitmeyer [Wed, 4 Jul 2012 14:14:29 +0000 (16:14 +0200)]
fixed cursor handling on wince
Change-Id: Iea91dde458b0e41a55ba6cb3e157756a1473f653
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Eskil Abrahamsen Blomfeldt [Thu, 5 Jul 2012 13:21:56 +0000 (15:21 +0200)]
Clean up attribute arrays flags in OpenGL glyph cache
When used in the SceneGraph we're expected to disable the arrays
after we're done, otherwise we'll get a warning about memory corruption
and crashes.
Change-Id: Ie8e426309716bef4b75d79039e8ca0b4943c79e7
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Oswald Buddenhagen [Thu, 5 Jul 2012 13:00:02 +0000 (15:00 +0200)]
windows hosts of course also need exclusion from mkspecs_pre
Change-Id: I90de625b1b521977a4dc1cd499eb6ece02d837f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Robin Burchell [Thu, 5 Jul 2012 12:44:22 +0000 (14:44 +0200)]
eglfs: Allow setting screen size through environment variables.
This adds:
- QT_QPA_EGLFS_WIDTH
- QT_QPA_EGLFS_HEIGHT
If both are set, fb0 detection is completely bypassed, otherwise, the
environment variables act as an override for the fb0 values.
Change-Id: Iaf38c8b0d40ce0a921bb6c5dbf31af788802d3fa
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Robin Burchell [Thu, 5 Jul 2012 12:37:21 +0000 (14:37 +0200)]
android: work around android's linux/input.h being retarded.
It seemingly doesn't include many of the required defines for evdev, so do what
everyone else seems to do, and work around it.
Change-Id: I4a6ffb548c7370f675c736177b63220f034d06b8
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Robin Burchell [Thu, 5 Jul 2012 12:38:01 +0000 (14:38 +0200)]
android: Fix evdev configure test.
Android doesn't define a number of items in its input.h for MT, so don't test
for them here. They will still work, they just need manual defines.
Change-Id: I471f55b7c7f8950d2048e525119b2b36c8e9743b
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 17:32:42 +0000 (19:32 +0200)]
don't blow away mkspecs/modules-inst when reconfiguring
otherwise we get lots of nasty warning messages about missing pri files.
it is arguable whether it is a good idea to do that, but we preserve
mkspecs/modules, too, and the previously built libraries don't just
vanish, either.
Change-Id: Ieded8d8858f1b0135bc3bea894b4a676024ac8ca
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 19:26:36 +0000 (21:26 +0200)]
centralize handling of QT_BUILD_PARTS
Change-Id: I33b8c3958a102d87461ad887fa5749bd9a6dc037
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 17:26:36 +0000 (19:26 +0200)]
make non-bootstrapped non-installed prefix-built executables runnable
tools like idc and lrelease are outside qtbase/bin and depend on libraries
which are not in any search path, so we need some way to let the modules
announce the locations (qt_tool.prf) and use it (in qtPrepareTool()).
Change-Id: I98d5109cbee5e745d86dde94e3dc791d42edc3ec
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 15:41:43 +0000 (17:41 +0200)]
set DLLDESTDIR only for non-prefix builds
a prefix build needs to be installed first anyway
Change-Id: I798861fddad2be289e9e4f182d0373e389b57437
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 15:40:53 +0000 (17:40 +0200)]
set DLLDESTDIR to the build dir, not the install dir
Change-Id: I0aa3b512e5d633c5628c4bb285f96a41cda858d9
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Oswald Buddenhagen [Tue, 3 Jul 2012 14:49:53 +0000 (16:49 +0200)]
don't use a different de-duplication algo for the library list in mingw prl files
i have no idea why that was done (the commit message says "not sure why
it works elsewhere"), but it makes no sense whatsoever, specifically
doing it only on mingw. probably some workaround, as usual. the
de-duplication is broken by design anyway.
This reverts commit
7a6302c2baf6861fdaf65992b71a7676859860c2.
Change-Id: I6edecaa062570e59eccd24d50919ba132e65a403
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Rafael Roquetto [Wed, 4 Jul 2012 15:41:53 +0000 (17:41 +0200)]
Disable dedicated screen event thread by default.
Screen events should come through QEventDispatcherBlackberry by default.
Change-Id: I64d17b99e9dd8edf23f68e1186e9318849f1a398
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Martin Petersson [Tue, 3 Jul 2012 13:16:28 +0000 (15:16 +0200)]
tst_QTcpServer::linkLocal fix for Windows Xp
Do not try to connect to the Terdo Tunneling Pseudo-Interface as
this will fail for Windows Xp.
Change-Id: I6dcd8369ba1e8642224cd4ac53f4032ed46d050d
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Thorbjørn Lund Martsum [Sat, 23 Jun 2012 18:06:19 +0000 (20:06 +0200)]
QHeaderView - adding an auto test with saveState and restoreState
This test is nice to have regardless though the main reason for it
is a refactor of hiddenSections in QHeaderView.
Change-Id: Id41a1d5edda2ef75bf432a78cdb3e952303eae92
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Thorbjørn Lund Martsum [Sun, 1 Apr 2012 04:31:43 +0000 (06:31 +0200)]
QHeaderView - resizeSection improvement
This patch improves the manual resizeSection a bit. Before we didn't
consider that the program could maybe resize other sections when the
user was resizing one section.
The main issue with that is that setOffset is so smart that it helps
moving the mouse cursor - however it really shouldn't do if the
program is trying to change something too.
Maybe this won't solve all (possible) problems at once - but it is
a fixed needed just to make something work - trying to make anything
work without this fix is horrible....
Change-Id: I3cefa375a9b8ee4c1ef1e08ba0900025c671e4c6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Rafael Roquetto [Wed, 4 Jul 2012 15:23:03 +0000 (17:23 +0200)]
Fix event loop throughput issue
Currently, only one bps event can be handled per event loop iteration,
bringing about a huge performance penalty. This patch fixes this issue by
bulk processing events whenever they are available.
Change-Id: Iecce1e86730bd90c3c81a7c6ebdf9ed83189e58e
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Jiang Jiang [Thu, 5 Jul 2012 09:20:40 +0000 (11:20 +0200)]
Do not delete m_blitProgram more than once
When m_blitProgram is created the constructor will add it to
QOpenGLContext as a child of that QObject, so it will be deleted
when that QOpenGLContext is deleted as QObject will delete its
children in destructor. Delete it here will cause crash in
thread termination.
Change-Id: If9d3287d159cc3276b6a840a584a1b212b9c9fd0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Iikka Eklund [Thu, 5 Jul 2012 04:14:22 +0000 (07:14 +0300)]
Fix FRAMEWORK_INCLUDE for Mac
On Mac the framework include paths were generated wrong.
The $${MODULE_NAME} was missing.
This patch fixes the framework include path generation.
Change-Id: Ic0e8d69ac7ac63be755302dc822c28240c9bc3d2
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Christoph Schleifenbaum [Wed, 11 Apr 2012 18:12:48 +0000 (20:12 +0200)]
Support for overlay-scrollbars on Mac
On Lion scroll bars are within the scroll area itself and are not being
shown as long as the user is not scrolling.
This patch draws the new scroll bars and makes them fade away. Further
it introduces a pixel metric checking for this behaviour. It's used by
QAbstractScrollArea to put the viewport to the correct place.
Task-number: QTBUG-21673
Change-Id: Id530265043549318ac420b392de6b8642deaa4c6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Morten Johan Sorvig [Fri, 18 May 2012 05:55:53 +0000 (07:55 +0200)]
Sync QWindow properties on NSWindow creation.
Synchronize size hints, window title, flags and state.
Change-Id: Ibc2358d8d4d0625aaddfbcad159e3682e3e79d3c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Martin Smith [Thu, 5 Jul 2012 08:44:34 +0000 (10:44 +0200)]
qdoc: The \br macro is promoted to a qdoc command
The \br macro, which is used to insert a line break in the output
text, is now promoted to be a qdoc command. For html, it outputs a
<br/>. For DITA XML it does nothing.
Task Nr: QTBUG-26435
Change-Id: Ie0542c9053f68473ccaa2f50ace74baa30f78dd0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Toby Tomkins [Thu, 5 Jul 2012 04:05:55 +0000 (14:05 +1000)]
Remove insignificant flag because all tests are passing.
Task-number: QTBUG-26432
Task-number: QTBUG-23050
Change-Id: Iafec02ed5008fc53b32f405a431e0987322c0d3a
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Toby Tomkins [Thu, 5 Jul 2012 01:52:07 +0000 (11:52 +1000)]
Replace insignificant test with QEXPECT_FAIL.
Task-number: QTBUG-26430
Change-Id: I647388701b7e6a71bb011f7714ff3b96c833a837
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
James Turner [Wed, 20 Jun 2012 13:01:56 +0000 (15:01 +0200)]
Native drag implementation on Mac
Create a native implementation of QCocoaDrag, using the 10.6 (and earlier) Cocoa
dragging API. This matches the implementation in Qt4 closely for the moment.
In the future it may be desirable to create an alternative implementation using
the new (non-blocking) drag API introduced in 10.7, but that will require deeper
changes to the mime-data handling.
This changes makes one more method on QPlatformDrag virtual, since the
Cocoa behaviour diverges from the base version: ::defaultAction is customised.
Change-Id: I1843293a62b2b4973a07b5e75ea3c312dc064018
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Morten Johan Sorvig [Fri, 18 May 2012 05:53:40 +0000 (07:53 +0200)]
Cocoa: Fix size hint and resize increment setting.
Call the corresponding NSWindow size functions.
Add special cases where Qt returns null or empty sizes.
Change-Id: I880c50c04e92271dc342ad587191c8cb2c006dba
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Thorbjørn Lund Martsum [Mon, 25 Jun 2012 04:31:58 +0000 (06:31 +0200)]
QHeaderView - prevent negative default+minimum section sizes
In
96f1fe8855082017fbbecccdab1eb11fd8c1f870 we agreed that sections
with negative sizes did not make sense. Of the same reason default
section sizes and minimum section sizes should be not negative.
Change-Id: I6a770e7f510d8e2bb90bfd8f38b4fa0566fc137b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Jocelyn Turcotte [Tue, 3 Jul 2012 14:36:30 +0000 (16:36 +0200)]
Properly detect the max texture size when using QOpenGLPaintDevice.
The value is currently hard-coded to 1024, this is a problem since
any image painted with a size higher that this will be scaled down before
being uploaded.
This patch copies the implementation from QGLContext which works correctly.
Change-Id: Ia2bda60cf21d9adf13c91cea4854a2b20e4041f2
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Tasuku Suzuki [Tue, 3 Jul 2012 01:32:20 +0000 (10:32 +0900)]
disable building uic when -no-widgets is set
Change-Id: I86040ec086621913fefcf6d349fe603758991c4e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Rafael Roquetto [Thu, 28 Jun 2012 12:16:46 +0000 (14:16 +0200)]
Fix socket notifier registration on Blackberry.
This fixes a bug on QEventDispatcherBlackberry, where registerSocketNotifier()
and unregisterSocketNotifier() wrongly assumed that a file descriptor was
being watched exclusively by one QSocketNotifier, while in fact there can be
more than one QSocketNotifier associated with a single file descriptor.
Change-Id: I0ce54bf809df109ad97f4a7f170f448d5d04d453
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Stephen Kelly [Wed, 4 Jul 2012 08:18:35 +0000 (10:18 +0200)]
Skip (re-)creation of cmake files during build passes.
Change-Id: I03973220c17c065bc6ea391300b677e27f48a46f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Tue, 3 Jul 2012 20:29:45 +0000 (22:29 +0200)]
Uppercase the CONFIG for verbatim mode.
Change-Id: Iec883e0218af80fc329d866affb2b95db72c54d3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 2 Jul 2012 15:11:18 +0000 (17:11 +0200)]
Add a Q_PROPERTY for the sourceModel of a proxy model.
Now that Q_PROPERTY with a QObject derived type is more powerful.
This property can be used in QML so that wrappers for proxy models
do not need to be created, such as in the example
at https://codereview.qt-project.org/#change,13007
Change-Id: I6ba676549d2135585d429a28e214fef0b2a6b1f9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Stephen Kelly [Sun, 24 Jun 2012 18:00:58 +0000 (20:00 +0200)]
Set the language of a STATIC library.
This is used as a hint for the linker.
Change-Id: I869039c1ea50f1926809ead4064317628ebbb2e7
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Joerg Bornemann [Wed, 4 Jul 2012 10:53:29 +0000 (12:53 +0200)]
tst_qwidget: remove QEXPECT_FAIL for QTBUG-8911
QTBUG-8911 has been fixed some time ago.
Change-Id: I19dae0571b1829f6b3b797f7e0ec5c24a4241db8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Girish Ramakrishnan [Tue, 3 Jul 2012 16:25:46 +0000 (21:55 +0530)]
Make QGenericPlugin and QGenericPluginFactory public API
These classes are not specific to QPA.
Discussed in QtCS 2012.
Change-Id: I32bc5fad4f0fa5e7095af86d61966fdf4d9e4ad7
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Samuel Rødal [Thu, 28 Jun 2012 08:27:00 +0000 (10:27 +0200)]
Removed private header warning from public QOpenGLPaintDevice header.
Change-Id: I9f2068d7271778e98251d8cbcfffa3a8c3e58f3d
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Tasuku Suzuki [Tue, 3 Jul 2012 01:30:30 +0000 (10:30 +0900)]
enable platformsupport for -no-widgets
qpa plugins need platformsupport
Change-Id: I6ebfac327940c00e1ab591045cf1a3bb3ac689e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Toby Tomkins [Tue, 3 Jul 2012 04:39:54 +0000 (14:39 +1000)]
Replace insignificant test with QEXPECT_FAIL.
Task-number: QTBUG-26403
Change-Id: Id933665a35be056f2b2a6fa2152f324810a7f057
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>