profile/ivi/qtbase.git
11 years agoFix missing return in QtOpenGl/paintedwindow example.
Friedemann Kleint [Thu, 11 Oct 2012 14:58:38 +0000 (16:58 +0200)]
Fix missing return in QtOpenGl/paintedwindow example.

Change-Id: I17da0e93bb7c1b0cdbb5b76035ec913cbc616608
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoStabilize Accessibility/Combo test.
Friedemann Kleint [Thu, 11 Oct 2012 12:46:16 +0000 (14:46 +0200)]
Stabilize Accessibility/Combo test.

The Windows combo animation causes a delay, introduce
QTRY_VERIFY. Fix warnings about being unable to
set geometry on Windows.

Change-Id: I52ca960c06f023ade3afe85f31deaf8e32edff26
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years agoOpenGL: Add missing WINAPI calling convention for QGL functions
Sean Harmer [Thu, 11 Oct 2012 13:08:45 +0000 (14:08 +0100)]
OpenGL: Add missing WINAPI calling convention for QGL functions

This is the QGL equivalent of commit

602cab9bb2072c5564bbb43c4125e04f98266043

Without this QGLExtensionMatcher causes stack corruption when using
a core profile GL context due to the call to glGetStringi() with
an incorrect calling convention.

Change-Id: Ibd86645e04df8c650c182fecfc8c481dae8a75b2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQtPrintSupport: Fix build with QT_NO_PICTURE.
Sérgio Martins [Tue, 9 Oct 2012 22:34:29 +0000 (23:34 +0100)]
QtPrintSupport: Fix build with QT_NO_PICTURE.

Printer support depends on having Picture support.
If QT_NO_PICTURE is defined, qfeatures.h will define
QT_NO_PRINTER.

Not all code is including qfeatures.h, which causes inconsistency,
some code has QT_NO_PRINTER defined and some has not, which causes
the build to fail.

Change-Id: I10a854244a41d017b921b731ec0e08f90a3326cf
Reviewed-by: Holger Ihrig <holger.ihrig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoqdoc: qdoc now can run in 2 passes
Martin Smith [Thu, 11 Oct 2012 12:04:21 +0000 (14:04 +0200)]
qdoc: qdoc now can run in 2 passes

Two command line options have been added, -prepare and -generate.
If you run qdoc with -prepare, qdoc reads and parses the source
files but does not generate the documentation. It only creates
the .index file for the module you are running qdoc on.

If you run qdoc with -generate, qdoc reads and parses the source
files as well as the .index files created by running qdoc with
-prepare, and it generates the documentation but no .index file.

If you run without either option, qdoc runs as before, i.e. it
runs both passes as a single pass.

Task number: QTBUG-27539

Change-Id: Idbfe3f0f9dff58283596b504f00dff3f70f6e371
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoqdoc: Allow empty character literal ''
Martin Smith [Wed, 10 Oct 2012 13:15:21 +0000 (15:15 +0200)]
qdoc: Allow empty character literal ''

qdoc's tokenizer was reporting an error for the
empty character literal ''. Now it allows it.
Apparently it makes sense in .js files.

Task number: QTBUG-25775

Change-Id: If407427fad9b65a035c2c4785d53c9e3d5202e62
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoQFont: Fix build with QFONTCACHE_DEBUG
Konstantin Ritt [Thu, 11 Oct 2012 22:19:34 +0000 (01:19 +0300)]
QFont: Fix build with QFONTCACHE_DEBUG

Change-Id: Ifc89af71cdf6a5f9e4114266030cf265042db626
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoQGlyphRun: Fix isEmpty() and boundingRect() didn't work after setRawData()
Konstantin Ritt [Thu, 11 Oct 2012 03:23:32 +0000 (06:23 +0300)]
QGlyphRun: Fix isEmpty() and boundingRect() didn't work after setRawData()

Change-Id: I44a347ef24961493d6b8353abbb215c713ccce52
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoFix QTextBoundaryFinder usage cases in QAccessible2
Konstantin Ritt [Fri, 5 Oct 2012 23:53:44 +0000 (02:53 +0300)]
Fix QTextBoundaryFinder usage cases in QAccessible2

Make the implementation safer and closer to what
http://www.linuxfoundation.org/collaborate/workgroups/accessibility/ia2/ia2_implementation_guide#boundaries
requires us to do.

Change-Id: I00af4697e52a9b6e7f5d7b3f403b29126fa1517b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoUpdate/fix QTextBoundaryFinder simple usage cases in qtbase
Konstantin Ritt [Mon, 8 Oct 2012 13:51:41 +0000 (16:51 +0300)]
Update/fix QTextBoundaryFinder simple usage cases in qtbase

Change-Id: I4d3000558bce86e2de3c32247915868ba18fc8b7
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoReview of documentation.
Michele Caini [Thu, 20 Sep 2012 20:36:05 +0000 (22:36 +0200)]
Review of documentation.

Documentation has been updated to reflect changes in Qt5.

Change-Id: I3d54d1875962bd27c43bb360ae7b3fda0b7702ba
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoMark QTreeView test as significant.
Stephen Kelly [Tue, 9 Oct 2012 14:32:10 +0000 (16:32 +0200)]
Mark QTreeView test as significant.

I can't find any failures in the CI logs, as reported by the bug.

Even if there is still an unstable test here, it is not appropriate
to mark the entire test as insignificant, as that hides regressions
in the entire class.

Task-number: QTBUG-23638
Change-Id: I1aeaf6e725bf28e9ac03c9330a67e51241b9272b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoQTextBoundaryFinder: Fix handling of break opportunities
Konstantin Ritt [Fri, 12 Oct 2012 03:49:27 +0000 (06:49 +0300)]
QTextBoundaryFinder: Fix handling of break opportunities

Add BoundaryReason::BreakOpportunity flag that will be returned by the
boundaryReasons() when the boundary finder is at the break opportunity
position that might be not an item boundary.
This is the same as (StartWord || EndWord) in Grapheme and Sentence modes;
in Word and Line modes, BreakOpportunity flag might occur between the words
or in between of Line boundaries (e.g. in conjunction with SoftHyphen flag).
In other words, the text boundaries are always break opportunities, but not vice versa.

StartWord and EndWord flags has been deprecated by new StartOfItem and EndOfItem
flags which are not about the word boundaries only. In line breaking,
StartOfItem and EndOfItem are set for the mandatory breaks only.

Change-Id: I79bf297e2b988f5976f30cff0c8ca616385f6552
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoFix tst_QTextEdit::fullWidthSelection2() for shadow build
Konstantin Ritt [Thu, 11 Oct 2012 01:00:11 +0000 (04:00 +0300)]
Fix tst_QTextEdit::fullWidthSelection2() for shadow build

Search for the test data files in the test data directory, not in the current dir.

Change-Id: I746e717bae575364102c1bb5c2888332d94c374f
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoFixed cosmetic line drawing where begin and end points are equal.
Samuel Rødal [Wed, 10 Oct 2012 14:14:32 +0000 (16:14 +0200)]
Fixed cosmetic line drawing where begin and end points are equal.

This case has typically required specific work-arounds in other
rendering paths as well.

Task-number: QTBUG-25153
Change-Id: I217e710a30222792ebca3bf297e438d944c32992
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQVarLengthArray: use memory on stack if possible
Peter Kümmel [Tue, 9 Oct 2012 14:52:37 +0000 (16:52 +0200)]
QVarLengthArray: use memory on stack if possible

After allocating memory on the heap it is ATM not possible to use the
memory on the stack again, QVarLengthArray then uses/resizes only
the memory on the heap. But the memory on stack could be used
if it is big enough.

Change-Id: I566003c25dd1093eb6ba8087a1e5378a11712934
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoMake QVarLengthArray exception safe in case of OOM
Peter Kümmel [Wed, 10 Oct 2012 14:17:08 +0000 (16:17 +0200)]
Make QVarLengthArray exception safe in case of OOM

After a exception is thrown in resize(), QVarLengthArray has an
invalid state with ptr == 0. On the next resize call when malloc
returns a valid pointer, oldPtr is 0 and it could crash in
memcpy because the pointer to the source is 0.
The patch ensures the valid pointer isn't overwritten with NULL.
When exceptions are disabled the user must ensure that malloc will
not fail.

Change-Id: Id12a5e3e1eacc551e4d1b64cba8e8414cfebd6e1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix a "warning: 'operator+=' is deprecated" when building with clang
Jocelyn Turcotte [Thu, 4 Oct 2012 12:31:29 +0000 (14:31 +0200)]
Fix a "warning: 'operator+=' is deprecated" when building with clang

Any file including qstringbuilder.h would trigger a warning when
compiled with QT_ASCII_CAST_WARNINGS defined since it implicitely
converts a QString to QByteArray.

Explicitely call toUtf8() to fix the issue.

Change-Id: If20f9d4571c5d1ed789564196c9f1331e1efd1d9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoRemove trivial debug output from QSpiAccessibleBridge
Jocelyn Turcotte [Tue, 2 Oct 2012 11:11:21 +0000 (13:11 +0200)]
Remove trivial debug output from QSpiAccessibleBridge

This information can get noisy when windows get opened/closed frequently
during auto tests.

Change-Id: I2777b51c97b3108be3d784794e12e20985d4d65b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoQt Widgets: Added a landing page
Jerome Pasion [Thu, 27 Sep 2012 13:11:55 +0000 (15:11 +0200)]
Qt Widgets: Added a landing page

-Landing page which lists articles in the module, including:
    -Graphics View, Model/View, Style Sheet, and widget galleries
-Renamed some titles and a whitespace fix.

Change-Id: I84be14d9a425ef380162e9a55ce2742c6812f510
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
11 years agoModularize documenation build
Tor Arne Vestbø [Mon, 8 Oct 2012 15:19:14 +0000 (17:19 +0200)]
Modularize documenation build

qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global
includes, instead of using relative paths. Qt modules will automatically
get a doc target that builds and installs into the right place (including
supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module).

Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoRevert "Handle additional format ranges when itemizing."
Pierre Rossi [Wed, 10 Oct 2012 16:57:05 +0000 (18:57 +0200)]
Revert "Handle additional format ranges when itemizing."

This reverts commit 101d04681f4ceb7410681eae684534a206a9d90a.
That change seems to have introduced a few regressions, and
Creator hits an assertion that it introduced because it assumes
the additionalFormats consists of well-formed ranges
(QTCREATORBUG-7995).

Change-Id: Ic4ae761e6e7f6df8a6b5ca565ceb250647420c15
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoMove QValidator tests to QtGui
Giuseppe D'Angelo [Sun, 7 Oct 2012 15:05:59 +0000 (16:05 +0100)]
Move QValidator tests to QtGui

Q*Validator classes are not in QtWidgets,
so move them where they should stay.

Change-Id: Ie6ea45a026e640fad131002bc9762c575235f3f4
Reviewed-by: David Faure <david.faure@kdab.com>
11 years agoRemove handleSynchronous* functions.
Morten Johan Sorvig [Thu, 27 Sep 2012 08:37:30 +0000 (10:37 +0200)]
Remove handleSynchronous* functions.

There are now two different ways to implement synchronous
event processing. The platform plugins can choose which
one to use.

1) flushWindowSystemEvents()
   Use to flush the event queue at one point, making
   preceding calls synchronous.

2) setSynchronousWindowsSystemEvents(bool enable)
   Makes all handle* functions synchronous, bypassing
   the event queue completely.

Change-Id: I020b80c731fd13f855a377d7c91d06a4e39b6a0b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoDo not handle invalid accessibles in atspi bridge.
Frederik Gladhorn [Mon, 1 Oct 2012 12:09:50 +0000 (14:09 +0200)]
Do not handle invalid accessibles in atspi bridge.

Change-Id: I13a7dd1e190c5d3a5bb8be0ee66c2f18d0d3a1b5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoCentralize place where we ensure qdoc is built before generating docs
Tor Arne Vestbø [Tue, 9 Oct 2012 15:37:23 +0000 (17:37 +0200)]
Centralize place where we ensure qdoc is built before generating docs

Change-Id: Ie0220d3c76990f6052edcd8c738e4e2807f35c71
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoEnsure that Qt.module.docs is set when first creating the module-fwd file
Tor Arne Vestbø [Tue, 9 Oct 2012 14:38:47 +0000 (16:38 +0200)]
Ensure that Qt.module.docs is set when first creating the module-fwd file

This is a follow-up fix to aef441b1.

Change-Id: Ie5e92ecc55ddcbab3e7830a99a77d3748a5568c1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoQGtkStyle: use gtk_widget_get_style()
J-P Nurmi [Mon, 8 Oct 2012 09:45:23 +0000 (11:45 +0200)]
QGtkStyle: use gtk_widget_get_style()

Do not access GtkWidget::style directly, it doesn't exist in GTK3.

Change-Id: I947776848f5dd64011a40446fcdb9079f295f182
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoFix a regression with regards to hfw behavior in QStackedWidget
Jan Arve Saether [Wed, 10 Oct 2012 11:42:07 +0000 (13:42 +0200)]
Fix a regression with regards to hfw behavior in QStackedWidget

This is a regression because we made QStackedWidget actually
support heightForWidth in 4.8. This was done with change
4780f94e391b5e881497c5228661dead42c821fa.

The problem was that heightForWidth was not calculated correctly
because some of the pages were hidden. The hidden pages were
actually not contributing to the hfw of the QStackedWidget at all.
This again caused the QStackedWidget to change its heightForWidth()
value when the current tab changed, which again could cause "jumps"
in the UI when switching tabs (as demonstrated in the task).

The problem was that the patch relied on calling
QWidgetItem::heightForWidth(), and this function would return -1
if the widget was hidden. However, QWidget::heightForWidth() does
not have this magic and returns the proper hfw value regardless
of its visibility.

One could argue about the correctness of this patch, but since
QStackedLayout::sizeHint() disregards QWidgetItem::sizeHint() (it
asks the widget directly), we do the same in
QStackedLayoutHFW::heightForWidth() for consistency.

In addition, QStackedLayout enforces that only widgets can be added
to it, and you cannot add your own QLayoutItem subclasses to it:

  qWarning("QStackedLayout::addItem: Only widgets can be added");

Task-id: QTBUG-24758

Change-Id: I349cf8f4215e4581ea237ef773d53dcdf3db176b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agotst_QMenuBar: remove QSKIP's -> omit whole test cases instead
J-P Nurmi [Thu, 27 Sep 2012 13:50:01 +0000 (15:50 +0200)]
tst_QMenuBar: remove QSKIP's -> omit whole test cases instead

Change-Id: I2cf356c5790fd7f2b27a9032e2effacd098b3d05
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoQTextBoundaryFinder: Introduce BoundaryReason::MandatoryBreak flag
Konstantin Ritt [Thu, 4 Oct 2012 03:52:13 +0000 (06:52 +0300)]
QTextBoundaryFinder: Introduce BoundaryReason::MandatoryBreak flag

that will be returned by boundaryReasons() when the boundary finder
is at the line end position (CR, LF, NewLine Function, End of Text, etc.).
The MandatoryBreak flag, if set, means the text should be wrapped at a given position.

Change-Id: I32d4f570935d2e015bfc5f18915396a15f009fde
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoInvalidate old QImage data if load()/loadFromData() has failed
Konstantin Ritt [Mon, 8 Oct 2012 13:40:13 +0000 (16:40 +0300)]
Invalidate old QImage data if load()/loadFromData() has failed

This guarantees one will never get `!img.isNull()` after
load()/loadFromData() has failed, even if the image was
not null before.
Apply the same fix to QPixmap and QPicture.

Change-Id: Ida1ad6a6f0fc830df8e75ada0c163fc2d3360dea
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAvoid warnings about an unreachable code
Konstantin Ritt [Mon, 8 Oct 2012 15:20:50 +0000 (18:20 +0300)]
Avoid warnings about an unreachable code

Change-Id: I57c2967db4c1bd2c39ecb3eac9b18eb7455c6a50
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoMac: Bring back "Text boxes and list only" tab navigation
Gabriel de Dietrich [Tue, 9 Oct 2012 09:27:01 +0000 (11:27 +0200)]
Mac: Bring back "Text boxes and list only" tab navigation

Added ThemeHint::TabAllWidgets as a mean to access that platform
specific bool. The default implementation returns always true when
querying QPlatformTheme::themeHint().

Several auto-tests had to be updated to reflect for qt_tab_all_widgets'
type change. One XFAIL removed from tst_QApplication::focusChanged().

Task-number: QTBUG-24372
Change-Id: Ie1f0486c19898fe54c53aa4a27e378485075e512
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agotst_QApplication: Make sure the native style is being used
Gabriel de Dietrich [Wed, 10 Oct 2012 10:46:37 +0000 (12:46 +0200)]
tst_QApplication: Make sure the native style is being used

The tst_QApplication::args() auto-test sets the style to windows style
but there is no way to reset the style back to the native one. This
makes tst_QApplication::focusChanged() fail on Mac in some cases,
since not all the styles respond the same way to tab vs. strong
focus changes.

Change-Id: I91e39c1dd0fad4d90f3a13ab50a5e9758922ac28
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoqdoc: Implements the -no-link-errors option
Martin Smith [Mon, 8 Oct 2012 10:49:39 +0000 (12:49 +0200)]
qdoc: Implements the -no-link-errors option

The -no-link-errors flag tells qdoc not to print any link error
messages at all. This is useful for finding and fixing all non-link
errors in a module.

Task number: QTBUG-26870

Change-Id: Id4b0eebb6c0509c57d2f01763b6dedbfb6756a91
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoCocoa: Send keyboard modifiers with mouse events.
Morten Johan Sorvig [Wed, 10 Oct 2012 07:02:51 +0000 (09:02 +0200)]
Cocoa: Send keyboard modifiers with mouse events.

Task-number: QTBUG-27462

Change-Id: Icb9352fcae6f92885d4f1381aa8014fef039149b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoAdded missing keysym to handleExtendedKeyEvent in xcb plugin.
Samuel Rødal [Wed, 3 Oct 2012 06:52:43 +0000 (08:52 +0200)]
Added missing keysym to handleExtendedKeyEvent in xcb plugin.

Now it's propagated to QKeyEvent::nativeVirtualKey() as it should.

Task-number: QTBUG-27353
Change-Id: I40921b99662951decc83d2278e0cd337266dd530
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
11 years agoWindows: Filter out events sent during DestroyWindow().
Friedemann Kleint [Mon, 8 Oct 2012 14:10:14 +0000 (16:10 +0200)]
Windows: Filter out events sent during DestroyWindow().

Task-number: QTBUG-26933

Change-Id: Ie7aaf9f0c9c12a33b059e796a3be161a2d60c64e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoFix scrolldown arrow not showing on popup for QMenu
Miikka Heikkinen [Thu, 4 Oct 2012 13:09:02 +0000 (16:09 +0300)]
Fix scrolldown arrow not showing on popup for QMenu

Scrolldown arrow was not shown when a taller than screen QMenu was
opened because the check to draw it used the size that was already
adjusted to the screen.

Fixed by using the actual menu size in the check. Also fixed the case
where the menu was scrolled, closed, and reopened, in which case the
size hint would return incorrect cached value. This led to scrolldown
arrow not being shown in case the menu was previously fully scrolled
down.

Task-number: QTBUG-27445
Change-Id: Icd8d774071662a9317b3ac53cb05b31cadba96ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDelete the QVariant ctors taking global Qt enum values.
Stephen Kelly [Fri, 28 Sep 2012 15:22:21 +0000 (17:22 +0200)]
Delete the QVariant ctors taking global Qt enum values.

They have unexpected results in Qt 5 (the Qt::GlobalColor one works
as expected in Qt 4, but was removed in Qt 5):

 QVariant v = QVariant(Qt::red);
 qDebug() << v; // QVariant(int, 7)
 v = Qt::red;
 qDebug() << v; // QVariant(int, 7)

The correct way is to use:

 QVariant v = QVariant::fromValue(QColor(Qt::red));

The deleted constructors are the ones for which there is a class
with an implicit constructor taking the enum, and that class is
a built-in metatype.

QLocale::Language and QKeySequence::StandardKey would also fit
the description, but I can't include the header for QKeySequence
as it is in QtGui, and I don't want to include the qlocale header
in qvariant.h. Putting a QLocale::Language is probably very
uncommon anyway.

The QTextFormat test is doing the wrong thing, but the result isn't
being tested. Added new tests which fail before the patch.

Change-Id: Ia38a0784990f4d40ff7457a86daf58aabd4964eb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoQGtkStyle: use gtk_widget_get_parent() and gtk_widget_is_toplevel()
J-P Nurmi [Mon, 8 Oct 2012 12:59:31 +0000 (14:59 +0200)]
QGtkStyle: use gtk_widget_get_parent() and gtk_widget_is_toplevel()

GtkWidget::parent does not exist in GTK3, and GTK_WIDGET_TOPLEVEL has
been deprecated since GTK 2.20 - > use gtk_widget_is_toplevel()
(available since GTK 2.18) instead.

Change-Id: I0f082b2d69a795cadb321802f25c9993029f6865
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoQGtkStyle: use gtk_widget_get/set_allocation()
J-P Nurmi [Mon, 8 Oct 2012 13:59:09 +0000 (15:59 +0200)]
QGtkStyle: use gtk_widget_get/set_allocation()

Do not access GtkWidget::allocation directly, it doesn't exist in GTK3.

Change-Id: I8ce69fab19ce8f3afe35d0d30d4e28b0348fdaf1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoqmake: fix .pc install target dir separators on windows
J-P Nurmi [Tue, 9 Oct 2012 12:47:46 +0000 (14:47 +0200)]
qmake: fix .pc install target dir separators on windows

Task-number: QTBUG-26455
Change-Id: I578345b1676d0d2e812e0ab2e48468b4a8013ee9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoScale icons returned by QIcon::fromTheme.
David Sansome [Thu, 22 Mar 2012 11:28:29 +0000 (11:28 +0000)]
Scale icons returned by QIcon::fromTheme.

The icon engine behind icons that are loaded from QIcon::fromTheme does
not scale any pixmaps that it returns. When using an icon theme with an
incomplete set of icons (for example, only a "128x128" folder),
QIcon::pixmap will always return 128x128 pixmaps even if you ask for
one of size 22x22.

This is contrary to the QIcon::pixmap documentation that says "The
pixmap might be smaller than requested, but never larger."

This patch uses the same code that is in the main QIcon class in the
PixmapEntry QIconLoaderEngineEntry to scale pixmaps if they are too big.

Change-Id: Ic25a3628ac82cfb899574245f658490a2dd49d54
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoCompile fix for when XCB_USE_GLX is not defined.
Samuel Rødal [Fri, 5 Oct 2012 18:31:21 +0000 (20:31 +0200)]
Compile fix for when XCB_USE_GLX is not defined.

Fixes compile failure introduced by 394249616cbb4c0861a032d33f846f.

Change-Id: I5794d22ee87eb18c08ea1de227b943f2e675356c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoOptimise the deletion of a QSharedPointer with no custom deleter
Thiago Macieira [Wed, 23 May 2012 18:26:58 +0000 (20:26 +0200)]
Optimise the deletion of a QSharedPointer with no custom deleter

When QSharedPointer is created with no user-specified custom deleter,
instead of storing a pointer in ExternalRefCount::destroyer to a
static function which, in turn, calls normalDeleter<T> indirectly (via
another function pointer), specialise the CustomDeleter class and make
it not store the pointer, but instead do the deleting directly.

The benefits are:
 - the QSharedPointer's private data is smaller
 - there is no double-indirection via indirect jumps to the actual
 deleter

Change-Id: Ice5653c144912efb1226e432267a047b9799aaca
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agofix links in INSTALL
Joerg Bornemann [Tue, 9 Oct 2012 16:26:10 +0000 (18:26 +0200)]
fix links in INSTALL

Change-Id: I633dc1e2a4af8fbf27ae6ee85878768210197def
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQElapsedTimer: Instead of two ints, store only the clock type
Thiago Macieira [Fri, 10 Aug 2012 14:13:23 +0000 (16:13 +0200)]
QElapsedTimer: Instead of two ints, store only the clock type

We don't need two ints if we can do it with one. We need to store only
the clock type to be used, which is either CLOCK_MONOTONIC or
CLOCK_REALTIME. In addition, we need an invalid value to indicate that
the test hasn't been done yet.

This also gets rid of an atomic that wasn't QBasicAtomicInt.

Disassembly of the compiled code indicates this is the most optimal
solution:
 - one single variable load
 - one test-and-branch to verify that a test is needed
 - straight call to clock_gettime afterwards

Change-Id: I49788e45b50b6b7fcb7ba4e9332e5352a4428933
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoSimplify QDate::addDays() impementation
Jon Severinsson [Tue, 9 Oct 2012 13:44:42 +0000 (15:44 +0200)]
Simplify QDate::addDays() impementation

No need to check for overflows since the change to qint64. as less than
half the qint64 range is a valid julian day, any overflow will be
detected as an invalid date anyway.

Change-Id: I3b6cad24e245ed9418c5804484f846b0b692153a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoChange QDateTime::addSecs() and QDateTime::secsTo() to use qint64.
Jon Severinsson [Tue, 9 Oct 2012 13:15:53 +0000 (15:15 +0200)]
Change QDateTime::addSecs() and QDateTime::secsTo() to use qint64.

addMSecs() / msecsTo() have always used qint64, and when QDate was changed
to use a 64-bit julian day, QDateTime::addDays() and QDateTime::daysTo() was
changed to use qint64 in order to support the full extended range, but
addSecs() and secsTo() seems to have been forgotten.

Change-Id: I3acc35ee2bcc9f353650eb42f97d428f706b2db6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix wheel events in Windows
Miikka Heikkinen [Fri, 5 Oct 2012 11:12:11 +0000 (14:12 +0300)]
Fix wheel events in Windows

Wheel events were always passed to window that got them from native
message loop, which isn't what Qt expects. Changed the receiver to
preferably be the window under cursor, as long as it is not blocked by
modal window.

Change-Id: I4edf0608842fe5b822a7f574abfdae81fa755ee5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDon't try to emit focusObjectChanged if window pointer is zero
Miikka Heikkinen [Tue, 9 Oct 2012 07:35:19 +0000 (10:35 +0300)]
Don't try to emit focusObjectChanged if window pointer is zero

Task-number: QTBUG-27414
Change-Id: I75ad662e0a66d61b49d55d084f29cefc98221b7f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoQDoc/Bootstrap library: fix link error on Windows
Pierre Rossi [Tue, 9 Oct 2012 13:09:34 +0000 (15:09 +0200)]
QDoc/Bootstrap library: fix link error on Windows

QSettingsPrivate on windows requires advapi32.

Change-Id: If4de132827398033c7bb588f6f19bc6fe9619286
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoconfig.tests/glib: remove app_bundle config (mac compatibility)
J-P Nurmi [Tue, 9 Oct 2012 13:30:20 +0000 (15:30 +0200)]
config.tests/glib: remove app_bundle config (mac compatibility)

Task-number: QTBUG-26800
Change-Id: I73cad91062c993898567cf9a267a8f6872ba4d52
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
11 years agoQNX: Add and remove screens dynamically.
James Turner [Mon, 8 Oct 2012 13:29:51 +0000 (14:29 +0100)]
QNX: Add and remove screens dynamically.

Watch for display events from libscreen, and dynamically add and remove QPlatformScreens (and hence QScreens) in response.

Change-Id: I56dc7019a4d4c77798a0a88451d2f3060066f5d2
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoQtPrinterSupport: Fix compilation with QT_NO_PRINTER
Sergio Ahumada [Thu, 4 Oct 2012 09:58:22 +0000 (11:58 +0200)]
QtPrinterSupport: Fix compilation with QT_NO_PRINTER

This seems to be a left over of 80f7a388906f94f58bf765a32b9abbb16f967db2

Task-number: QTBUG-27177
Change-Id: I72a285ed1d64f756d585a86d8401ee23eb4a1ce1
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Indrajit Tapadar <indrajit.tapadar@digia.com>
Reviewed-by: Holger Ihrig <holger.ihrig@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoGenerate ';' separated libraries in prl files for CMake.
Stephen Kelly [Sun, 7 Oct 2012 08:42:36 +0000 (10:42 +0200)]
Generate ';' separated libraries in prl files for CMake.

The generated CMake files need to pass ';' separated libraries to
the IMPORTED_LINK_INTERFACE_LIBRARIES property, otherwise we get errors
such as this:

http://testresults.qt-project.org/ci/QtTools_master_Integration/build_00386/win32-msvc2010_Windows_7/log.txt.gz

(grep for QtCore5.lib.lib)

Rather than a naive and error prone replacement of whitespace, generate
the appropriate ';' separated content directly in the qmake prl file.

Change-Id: I8eb5e233a0318b57ec74b86d910583ff99c29415
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoUpdate the Unicode Data and Algorithms up to Unicode 6.2
Konstantin Ritt [Thu, 27 Sep 2012 22:57:39 +0000 (01:57 +0300)]
Update the Unicode Data and Algorithms up to Unicode 6.2

Version 6.2 of the Unicode Standard is a special release
dedicated to the early publication of the newly encoded Turkish lira sign.
In addition, there are some significant changes to the Unicode algorithms
for text segmentation and line breaking to improve breaking for emoji symbols.

For more details, see http://www.unicode.org/versions/Unicode6.2.0/

Change-Id: I21cfd4f307e41b41a19d36cce87f7a44c2661bc2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQGtkStyle: cleanup unused gdk_drawable_get_depth() (not avail in GTK3)
J-P Nurmi [Mon, 8 Oct 2012 12:43:03 +0000 (14:43 +0200)]
QGtkStyle: cleanup unused gdk_drawable_get_depth() (not avail in GTK3)

Change-Id: Ifc04c768dcadc48d459eeb8dd95325823cc44dcd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoAdd QEvent::StyleAnimationUpdate: style animation target should update
J-P Nurmi [Thu, 4 Oct 2012 13:30:09 +0000 (15:30 +0200)]
Add QEvent::StyleAnimationUpdate: style animation target should update

The event will be sent from the upcoming style animations. This change
merely introduces the new event type and makes both QWidget and
QGraphicsWidget call update() upon receiving the event.

Change-Id: I69bb4d05bacb22f7e3a2512cae68848801e4f4d7
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agotst_qfiledialog: fixed typo causing semi-random completer() failure
Rohan McGovern [Fri, 5 Oct 2012 06:05:33 +0000 (16:05 +1000)]
tst_qfiledialog: fixed typo causing semi-random completer() failure

completer_data() was attempting to find the first folder which did
not begin with a '.' character under QDir::root() for usage during the
test.

However, a typo caused it to find the first folder even if it _did_
begin with a '.'; unless the first folder returned by entryList()
was ".", in which case no folder would be found.

Change-Id: Ie95f1add797973d06a8d5f2fa32935366a008de5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
11 years ago[QTBUG-13230] Make QVariantAnimation non-abstract
Marc Mutz [Thu, 4 Oct 2012 09:12:45 +0000 (11:12 +0200)]
[QTBUG-13230] Make QVariantAnimation non-abstract

The bug report argues convincingly that, but for the pure virtual
updateCurrentValue(QVariant) function, QVariantAnimation is quite
usable as-is.

So add an empty implementation.

Reported-by: André Somers <andre@familiesomers.nl>
Task-number: QTBUG-13230
Change-Id: I689b4a80fc7d5dfae67c2255777f89afb16f9c21
Reviewed-by: Andre Somers <andre@familiesomers.nl>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQMap - remove unused maximumNode() functions
Thorbjørn Lund Martsum [Wed, 26 Sep 2012 13:25:01 +0000 (15:25 +0200)]
QMap - remove unused maximumNode() functions

QMap has 4 different maximumNode() functions, but they are all
unused and just in the way.

Change-Id: I012145cfae32898830ec95e229514d9be838ae2f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
11 years agoRemoved the "tst_QVector::outOfMemory" test.
Christian Strømme [Fri, 5 Oct 2012 14:32:19 +0000 (16:32 +0200)]
Removed the "tst_QVector::outOfMemory" test.

The test is useless as we assert if the requested size exceeds
a certain limit. We could, as an alternative,
throw an exception, but in the end it's the caller's responsibility
to ensure that the requested size is a sane value.

Task-number: QTBUG-27285
Change-Id: I738950a6a2b51671a54e4d25c7e4c3ac0d7f63b8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoconfigure: bump gtk version from 2.10 to 2.18 (sep 2009)
J-P Nurmi [Mon, 8 Oct 2012 13:10:44 +0000 (15:10 +0200)]
configure: bump gtk version from 2.10 to 2.18 (sep 2009)

GTK_WIDGET_TOPLEVEL was deprecated in 2.20 and no longer available in
gtk 3. gtk_widget_is_toplevel() was introduced as a replacement in gtk
2.18 => make that the minimum requirement.

Change-Id: Ie5d2d8bd824af916a9764c66a7046f07a77b1748
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agouic: Map QLCDNumber::numDigits to QLCDNumber::digitCount.
Friedemann Kleint [Mon, 8 Oct 2012 12:22:27 +0000 (14:22 +0200)]
uic: Map QLCDNumber::numDigits to QLCDNumber::digitCount.

QLCDNumber::numDigits was deprecated in Qt 4 and removed in Qt 5.

Task-number: QTBUG-27462
Change-Id: I3772a884f31aeea70121cccd429ac996b2ecbccd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
11 years agoStabilize test qmenu::pushButtonPopulateOnAboutToShow().
Friedemann Kleint [Mon, 8 Oct 2012 09:19:24 +0000 (11:19 +0200)]
Stabilize test qmenu::pushButtonPopulateOnAboutToShow().

Do not leave an allocated menu in member lastMenu behind that
interferes with the consecutive QTBUG7907_submenus_autoselect().

Change-Id: I80fc9de9ca63367264f642023a244c1d7d8ada7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoIntroduce a Tegra2 mkspec to the device specs
Thomas Senyk [Fri, 27 Jul 2012 15:42:25 +0000 (17:42 +0200)]
Introduce a Tegra2 mkspec to the device specs

Change-Id: I16275f2f289a78e3217d765934b999b188005c14
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoSimplify the imx6-device-mkspec
Thomas Senyk [Wed, 1 Aug 2012 09:17:59 +0000 (11:17 +0200)]
Simplify the imx6-device-mkspec

This change is possible due to commit 18654058
As it's now possible to use configure's -sysroot without
gcc's --sysroot, it's possible to use configure's pkg-config setup
(which comes with its -sysroot). This gives the possibility to
simplify the mkspec and be in line with the other device-mkspecs

Change-Id: I0f34ec2c5c7b06334ad3c1605001c0803272b027
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoHandle additional format ranges when itemizing.
Pierre Rossi [Fri, 10 Feb 2012 19:42:13 +0000 (20:42 +0100)]
Handle additional format ranges when itemizing.

This is useful when the additional formats are used on a
text layout using a raw font. It can also come in handy for
input methods operating on a QTextDocument.
We now consider all format range edges to generate the
associated items. The capitalization can be overridden via
the additionnal formats mechanism.

Adds an autotest that checks that this works with font capitalization.

Change-Id: I782d2c48d05b0dfbad480a9ca77198465292b358
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoFix Windows: QStandardPath::findExecutable() to check suffixes.
Friedemann Kleint [Fri, 5 Oct 2012 10:13:54 +0000 (12:13 +0200)]
Fix Windows: QStandardPath::findExecutable() to check suffixes.

Append the Windows executables suffixes from the PATHEXT
environment variable.

The previous code had a bug since the 'break' statement
bailed out of the inner loop only.

Factor search code out into a separate functions, avoiding
repeated invocations of list.constEnd() and variable
assignments in the old code.

Add a static function that is called on Unix and on Windows
for executable names with a suffix.

Call another function applying a candidate list of suffixes
in case an executable name without a suffix is passed.

Lower case the extensions from PATHEXT, streamline code.

Split up the test, add a _data() slot for clarity.

Task-number: QTBUG-27457
Change-Id: I2bf34de52aeadddd3b937ad1e22191c3c850fd26
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoremove superfluous include from echoplugin example
Joerg Bornemann [Mon, 8 Oct 2012 12:36:58 +0000 (14:36 +0200)]
remove superfluous include from echoplugin example

Change-Id: I8a53c5e628e43796d7f4b53c311dd4d200527262
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
11 years agoAdd QT.module.docs variable to the module system
Tor Arne Vestbø [Mon, 8 Oct 2012 10:57:51 +0000 (12:57 +0200)]
Add QT.module.docs variable to the module system

Change-Id: Ibe54ee44a06747453bc09e006e27187cbee30b23
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agodoc: remove old un-used monolithic qdocconf file
Tor Arne Vestbø [Mon, 8 Oct 2012 12:46:45 +0000 (14:46 +0200)]
doc: remove old un-used monolithic qdocconf file

Change-Id: I253fa079928e55e2c3c574e9c98780d2c72086cf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoTools: add QLibraryInfo to the bootstrapped library.
Pierre Rossi [Tue, 2 Oct 2012 17:22:17 +0000 (19:22 +0200)]
Tools: add QLibraryInfo to the bootstrapped library.

For future use by qdoc.

Change-Id: Id9079a6fa581ff16810df9a8f2bb94314ee11ca9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agostyles.pri: tabs to spaces
J-P Nurmi [Fri, 5 Oct 2012 08:41:33 +0000 (10:41 +0200)]
styles.pri: tabs to spaces

Change-Id: I164368222d89ec2dc557bec02840f1d208e8f276
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoFix a bug in how paths are made canonical and relative
Jan Arve Saether [Fri, 21 Sep 2012 13:05:04 +0000 (15:05 +0200)]
Fix a bug in how paths are made canonical and relative

Change-Id: Id9b2de9097cab4520882b48a28fccd382c5e076d
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoImplementation of the BlackBerry Qt Proxy support.
Andrey Leonov [Thu, 4 Oct 2012 23:37:00 +0000 (19:37 -0400)]
Implementation of the BlackBerry Qt Proxy support.

An implementation for BlackBerry devices based on the BPS netstatus API.

Change-Id: I89deed031d2a867bbd6628bee97f61345b58f1ab
Reviewed-by: Peter Hartmann <phartmann@rim.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
11 years agodoc: Brush up QPaintEngine documentation for Qt 5
Eskil Abrahamsen Blomfeldt [Thu, 4 Oct 2012 12:58:32 +0000 (14:58 +0200)]
doc: Brush up QPaintEngine documentation for Qt 5

The paint engine story has changed drastically in Qt 5,
and we no longer need the reference to Qt 3.

Change-Id: I66090582e5c66d2a3cd9de355c34b33a94b67dfe
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agodoc: Update Q*PaintDevice docs
Eskil Abrahamsen Blomfeldt [Thu, 4 Oct 2012 08:55:12 +0000 (10:55 +0200)]
doc: Update Q*PaintDevice docs

Minor syntax typo in QPagedPaintDevice.

Some Qt 5 updates in QPaintDevice (QGuiApplication)
and a couple of other changes:

1. Usually, we say an object is "painted" or "drawn" when it is
drawn on top of another object (like drawEllipse()) not when it
is the destination of the draw commands. To be more consistent I
updated the language here.

2. What's commonly called a 32-bit display has 24 bits of color
information and eight bits of opacity information. This gives a
color count which can be accurately represented by int. To avoid
confusion, the exception in the docs for colorCount() has been
generalized a little.

Change-Id: Iabaaed1f3e4a80e7e14dfd8855da8c3cd8b3012f
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoDoc: Update QThread class ref to reflect changes since Qt 4.4
Sze Howe Koh [Thu, 4 Oct 2012 11:33:39 +0000 (19:33 +0800)]
Doc: Update QThread class ref to reflect changes since Qt 4.4

Remove advice to subclass QThread; promote thinking of QThread as a
thread manager, not a thread; promote event-driven programming over time
micromanagement; warn against common pitfalls.

Result of collaboration in forum (https://qt-project.org/forums/viewthread/20691/)
and mailing list (https://qt-project.org/pipermail/development/2012-September/006738.html)

Task-number: QTBUG-16358
Change-Id: I57e3873976fad489176cbf9f7e680fd6992a8837
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoqdoc: Simplification of target ref construction
Martin Smith [Fri, 5 Oct 2012 12:35:00 +0000 (14:35 +0200)]
qdoc: Simplification of target ref construction

This change is being done to simplify qdoc,
but the motivation was to fix a segfault in
qdoc when running the release version of
qdoc on linux. The change improves qdoc by
simplifying the code whether it fixes the
segfault or not.

Change-Id: I2c865f7f1e2a44763aa7349d1bd739ad562f4029
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoqdoc: Change to debug output
Martin Smith [Wed, 3 Oct 2012 09:08:39 +0000 (11:08 +0200)]
qdoc: Change to debug output

Only print debug output if -debug is used
on the command line.

Change-Id: I2bdfca1a072f728427da61f05b34e6e07d933183
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoqdoc: Change qdoc to use QML terminology
Martin Smith [Wed, 3 Oct 2012 07:53:37 +0000 (09:53 +0200)]
qdoc: Change qdoc to use QML terminology

\since command's output to "This QML type was introduced..."

Task number: QTBUG-24784

Change-Id: I741efb57979eb76f4675915ef1a6b983deb492d9
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoqdoc: Adding a debug function
Martin Smith [Mon, 1 Oct 2012 12:27:45 +0000 (14:27 +0200)]
qdoc: Adding a debug function

qdoc segfaults for one user, when he runs
the release version of qdoc but not the debug
version. This change adds a -debug option to
the qdoc command line options. If set, qdoc
will print debug messages at useful milestones
so we can see where it is when it goes into
the weeds.

Change-Id: I0e826e74399eaf50091817c68c775d02c6b615d2
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agofixing typo in compile fix for MSVC 2008
Thomas Hartmann [Fri, 5 Oct 2012 08:50:55 +0000 (10:50 +0200)]
fixing typo in compile fix for MSVC 2008

Change-Id: If1955395d9c476a49e6d6f2ae14e6ad6c63a7da7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoPrevent crashing on screen deletion.
Samuel Rødal [Mon, 1 Oct 2012 08:10:08 +0000 (10:10 +0200)]
Prevent crashing on screen deletion.

Even child windows need to hook into the screen destroyed signal to
avoid having a dangling screen pointer.

Change-Id: I7b613356c333be6e9dfdf5db45f70a521a9b8fe2
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQApplication::palette missing Q_NO_USING_KEYWORD implementation
Thiago A. Correa [Sun, 7 Oct 2012 05:10:57 +0000 (02:10 -0300)]
QApplication::palette missing Q_NO_USING_KEYWORD implementation

Added inline implementation of QApplication::palette when
Q_NO_USING_KEYWORD is defined.

Task-number: QTBUG-27393

Change-Id: I833efb950a579db28fcb243c931c9e22b28ec431
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoQSqlQuery::value string overload
Thiago A. Correa [Thu, 4 Oct 2012 01:52:59 +0000 (22:52 -0300)]
QSqlQuery::value string overload

Introduce value overload to take field name as a parameter.

This allows for terser application code that avoids explicit
calls to QSqlRecord::value().

Change-Id: I02b6712cd5ec41633b902714315b5716c17d1a9b
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoCocoa: add qWarnining when trying to create 0 width/height CGImages
Teemu Katajisto [Fri, 5 Oct 2012 10:48:43 +0000 (13:48 +0300)]
Cocoa: add qWarnining when trying to create 0 width/height CGImages

Add meaningful warnings when trying to create 0 width/height CGImages.
This way it is easier to track down the place where valid size is not
used.

Change-Id: Id261ddf72d5487afcdb1a2a6d0d9079700888545
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoCocoa: don't animate window transitions for 0 width/height windows
Teemu Katajisto [Fri, 5 Oct 2012 11:20:03 +0000 (14:20 +0300)]
Cocoa: don't animate window transitions for 0 width/height windows

Task-number: QTBUG-26617

Change-Id: I6dfc3f208368ddf6be65259218aee88db9692cfe
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoosx: support for QScreen changes at runtime, and physical dimensions
Shawn Rutledge [Mon, 1 Oct 2012 17:26:36 +0000 (19:26 +0200)]
osx: support for QScreen changes at runtime, and physical dimensions

QScreen's physical size and logical DPI come from the operating system.
Physical DPI is calculated as pixel size / physical size.  Whenever the
user changes the display settings, applicationDidChangeScreenParameters
is called; QScreens are created and destroyed when displays are added
and removed, and each QScreen which continues to exist gets updated
properties from the OS.

Change-Id: I7f2e9e32a3ad53d73ea987f39a0c62fa8dd22b05
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoUse jom in tst_qmake.
Friedemann Kleint [Fri, 5 Oct 2012 08:12:08 +0000 (10:12 +0200)]
Use jom in tst_qmake.

Speed up compiling the tests.

Task-number: 26023

Change-Id: Ib5e872cc6cde09ac90f426a8f6e7cfea509d02e2
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoIncrease tst_qmake more time on Windows.
Friedemann Kleint [Fri, 5 Oct 2012 08:10:46 +0000 (10:10 +0200)]
Increase tst_qmake more time on Windows.

The test compiles examples, which takes a long time.

Task-number: 26023
Change-Id: If794b046aa07737f3076aace8d585dc44027cc6b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoQNX: Fix input lag
Thomas McGuire [Fri, 5 Oct 2012 13:55:43 +0000 (15:55 +0200)]
QNX: Fix input lag

We were breaking out of select() too early with a timeout of -1.

Change-Id: Icd47b307a6f3a9d11c862722759e24f560e72e9e
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoQNX: Remove workaround for BPS bug
Thomas McGuire [Fri, 5 Oct 2012 13:53:44 +0000 (15:53 +0200)]
QNX: Remove workaround for BPS bug

This BPS bug  has been fixed with the latest BB10 release.

Change-Id: I07f86f2d18b1e04f48b95a710d57864c69726c42
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoQNX: Remove the busy loop work around for bps ignoring timeout bug
Sean Harmer [Tue, 28 Aug 2012 14:10:12 +0000 (15:10 +0100)]
QNX: Remove the busy loop work around for bps ignoring timeout bug

This commit should now correctly address the throughput issue too.

Change-Id: Ie75d0e6f44500f2720b7af787a58ed6c0a3c8c9d
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
11 years agoqpa: Fix rendering issue in blitter paint engine
Julien Brianceau [Fri, 5 Oct 2012 13:41:28 +0000 (15:41 +0200)]
qpa: Fix rendering issue in blitter paint engine

Take into account brush transformation for TexturePattern fill.
Example : arrows are not rendered propery in
http://www.youtube.com/leanback website.

Change-Id: I5d4bc7410d1d589a27cf17e84062096cfbdb4d6f
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoQSettings Windows documentation does not match behavior
Thiago A. Correa [Fri, 5 Oct 2012 04:29:34 +0000 (01:29 -0300)]
QSettings Windows documentation does not match behavior

QSettings under windows adds "OrganizationDefaults" to the registry
key path when using QSettings::SystemScope.

commit ee2e497f1c8216a22ddea53ab5ae1fd09bfee363 missed the change
to HKEY_LOCAL_MACHINE

Task-number: QTBUG-27452

Change-Id: I561f4e57b5beda0f9a511de067eb17fc23e3c856
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>