Commit Graph

16424 Commits

Author SHA1 Message Date
Sergio Ahumada
f15d730589 test: tst_qhostinfo requires `private_tests' set
Otherwise you get:

  undefined reference to `qt_qhostinfo_clear_cache()'

Change-Id: I32313f290b9e4236440ae01afe12285d4539be60
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
2014-01-15 16:18:44 +01:00
Mitch Curtis
fd37c9a9d1 Document QAbstractItemModels::roleNames() better.
List all of the default role names, and mention that the function
must be overridden if the model is used within QML.

Change-Id: I6ced5ac74143dcb97c527da2a6a23aa9d21f70e5
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2014-01-15 16:18:25 +01:00
Eskil Abrahamsen Blomfeldt
110d36fee8 REG: Fix make install on library projects on Android
This is a partial revert of 39e04b0222.
The original change moved the special make install target path logic
into the logic for the app template to make it possible to remove the
condition that excluded builds inside the Qt directory. This was
to make it possible to build examples in the Qt directory for Android
without moving them. However, this broke user library projects,
specifically when they were part of a subdirs project and should
have been automatically installed into the Android package. This
patch brings back the logic but only enables it for library projects,
meaning that the only examples inside Qt which cannot be built
correctly are library projects (which didn't work anyway).

[ChangeLog][Android] Fixed regression in "make install" on
library projects on Android so they can be used inside subdirs
projects again.

Task-number: QTBUG-34781
Change-Id: Iabf53ed68845b2ddd4ae66656e1372c96185660e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2014-01-15 16:08:57 +01:00
Kurt Pattyn
a695edef56 Fix some typos
Change-Id: I673ad09e458438b921fa093190bd983e8f9749b4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-15 15:59:47 +01:00
Jędrzej Nowacki
3558c0cd74 Minor optimization use QString midRef instead of mid.
It doesn't create a temporary string.

Change-Id: If5c540422f69e573107d1f5a886ac7174ae99853
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-15 15:58:00 +01:00
Simon Hausmann
a6c79344f7 Fix typo in QTextEdit documentation
Task-number: QTBUG-36077

Change-Id: I5cd9ad3fe309e5dd2e5e5d67d6c7561182e65c25
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-01-15 15:40:57 +01:00
Kurt Pattyn
3169863ace Clear read- and write buffers
Added calls to clear the write and read buffers when
- setSocketDescriptor is called
- abort is called

Removed clears the read and write buffers from
the documentation of resetSocketLayer.

Added documentation to setSocketDescriptor
describing that read and write buffers are cleared.

Task-number: QTBUG-28914
Change-Id: I25a4b679708bdea0b259c50f1d10a3e9271dabb9
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
2014-01-15 08:57:19 +01:00
Sze Howe Koh
7c11e7ec19 qdocconf: Remove nonexistent dependency
Change-Id: I9d2f36102691a2bd8ab0697d20f6eac59d59a84f
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-01-15 08:57:19 +01:00
Cyril Oblikov
6233f006df Saving physical size changes of screen on Windows
On windows (tested on win7) physicalSizeMM is changed after changing
screen resolution. We need to save new size.

Change-Id: I1b38d9ba2af9679812a973737a724c9a9c5395da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-15 06:47:02 +01:00
Friedemann Kleint
73a98ccc46 Windows: Use focusWindow() as native dialog parent when 0 is passed.
A parent is required, otherwise the application gets deactivated when
the dialog closes. The same is done in Qt 4.

Task-number: QTBUG-36039

Change-Id: I56688b3259f1d207edd1bec499afd1365ae511dc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-01-14 22:33:43 +01:00
Friedemann Kleint
122ae7142b Stabilize tst_scrollbar.
- Use a separate widget for each test.
- Replace hard-coded timeouts by qWaitForWindowExposed.
- Center windows on screen.

Change-Id: I45ae306fd23348ee5dec3849e64ec98843e8bf32
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-01-14 22:33:19 +01:00
lpapuga
f10356ead1 MIPS DSP build system fix and additional optimizations.
Changed MIPS DSP portion of the mkspecs/features/simd.prf file in order
to fix the corrupted build system for MIPS platforms.

List of the additionally optimized functions

from file src/gui/painting/qdrawhelper.cpp:
- qt_blend_rgb16_on_rgb16
- qt_fetchUntransformed_888
- qt_fetchUntransformed_444
- qt_fetchUntransformed_argb8565

from file src/gui/image/qimage.cpp:
- convert_ARGB_to_ARGB_PM_inplace

from file src/corelib/qstring.cpp:
- ucstrncmp
- toLatin1_helper
- fromLatin1_helper

Change-Id: I5c47a69784917eee29a8dbd2718828a390b27c93
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-14 18:52:14 +01:00
Thiago Macieira
48caaee170 Ask qdoc not to parse Q_DECL_UNUSED
We have it on function declarations and it gets a bit lost...

Change-Id: I19ba2e760f3714c26e78c3d8fd2570af3dcd136e
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-01-14 18:52:14 +01:00
Samuel Gaist
a761be2fb2 Correct wordwrapped text handling in QListView icon mode
Currently a QListView with wordwrapping activated will wrap the text
only to the width of the icon even if the grid size is bigger. With this
patch the option rect is now updated to match the grid size if valid
and the style uses it to determine the correct size when wrapping

[ChangeLog][QtWidgets][QTBUG-4714] Use the grid size for wordwrapping
when available in icon mode
Task-number: QTBUG-4714
Change-Id: I2cb63809d3ee8bd262f38bc11de91df9ff5cf237
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2014-01-14 15:10:21 +01:00
Kai Koehne
7fab8eb56b Windows: Do not print test output to both stdout and system debug log
Avoid piping the test output to both the Windows system debugger, and
stdout. This fixes duplicate output in Qt Creator, which displays messages
from both sources.

[ChangeLog][QtTestLib] The (default) plain text logger on Windows now
logs to either the system debug log (in case no console is open), or
stdout, not both.

Task-number: QTBUG-34630
Change-Id: I35fe9f4a50cc660d79fad7dffa6d19659b2102ae
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-13 09:44:40 +01:00
Morten Johan Sørvig
e1330ecfdc Mac: Remove old unified toolbar implementation.
This has been dead code in Qt 5 since WS_MAC isn't
defined any more.

The new implementation is far less intrusive and does
not require a separate layout.

Task-number: QTBUG-34411
Change-Id: I91bf2294086cb7334a0f56eb1bb97464d8d7b2e3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-01-13 07:54:18 +01:00
Kurt Pattyn
ba507f6690 Fix typos in comments
Comments contained some typos. Comments have been replaced with
the ‘official’ description from
http://msdn.microsoft.com/en-us/library/8x5x43k7.aspx.

Change-Id: I25dda0911735b4a0d4f306bc95bc984be0080e2f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-01-13 07:15:32 +01:00
Sérgio Martins
50b36f2181 QNX: Fix compiler warning about unused variable.
Change-Id: I16e4aa32647793bf36fee60ed94db69a6ae2d8ea
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-12 07:04:42 +01:00
Morten Johan Sørvig
4a7f27ea53 Mac: remove unified toolbar workarounds.
QMainWindow::unifiedTitleAndToolBarOnMac() will
again return true, but the new implementation is
much more similar to the cross platform one so these
workarounds are not needed.

Task-number: QTBUG-34411
Change-Id: Ic95f491af94354776385dc984f1a00c64429a3f0
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-01-12 01:25:55 +01:00
Morten Johan Sørvig
b3d642e71e Mac: Update unified toolbar drawing code.
Fill the toolbar background with transparent
pixels to allow the view background to shine through.
Draw a separator line using HITheme.

Task-number: QTBUG-34411
Change-Id: I57732564a67a5a9d1eb7fd9038382b2b65be50a4
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-01-12 01:25:41 +01:00
Thorsten Zachmann
055591750a Fix Use android theme when defined
It is possible to define the theme to use for android in the AndroidManifest.xml.
If it is defined in the activity qt itself should not overwrite it. The change uses
the defined style in case it is given in the AndroidManifest.xml.
This seems to fix also QTBUG-35151.

Task-number: QTBUG-35050
Change-Id: I8b55c02ca1ecd7baa5f2f9460d154095aacf015f
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-01-11 22:13:19 +01:00
Morten Johan Sørvig
459ad9e018 Mac: Update PE_IndicatorToolBarHandle drawing.
Smaller, rounder, darker toolbar handles. Works
especially well in unified toolbar mode.

Task-number: QTBUG-34411
Change-Id: I41eafdf0bb1dbbb4ed96d7bd799eb6f53bccbf7d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-01-11 22:13:19 +01:00
Morten Johan Sørvig
cd5ae8fb21 Enable window dragging code in QToolBar on Mac
Allows moving the window by dragging the unified
title and toolbar area.

Task-number: QTBUG-34411
Change-Id: Idd85c0031895b5afd7dfdc8616e4452c47935af2
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-01-11 22:13:19 +01:00
John Layt
684ebc6648 QDate - Fix parsing Qt::ISODate
Fix parsing of ISO Date from being totally lenient to being semi-strict
by requiring the separator positions to be non-numeric.

[ChangeLog][Important Behavior Changes] Parsing of Qt::ISODate by
QDate::fromString() and QDateTime()::fromString() is not as lenient as
before, the date component separators are now required to be
non-numeric.  This means a string like "2000901901" will no longer be
recognized as a valid ISO Date, but "2000/01/01" will still be even
though it doesn't strictly meet the ISO format of "2000-01-01".

Task-number: QTBUG-34141
Change-Id: I0e481144136c60d4cac61364b9b2c1d2cd1e78fc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-11 20:45:22 +01:00
John Layt
a41a5f6671 QDateTime - Fix isValid() if invalid QTimeZone
Explicitly check that the QTimeZone is valid before trying to use it.

Change-Id: Iec415a2cb07071502fe71ee5ac92a7657e818f99
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-11 20:45:22 +01:00
John Layt
46de0c4765 QLocale - Check day number is valid
Check day number falls in valid range before using as array index.

Change-Id: I8d7c203b97988633fe4c345d5e7002bba9c2c68b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-11 20:45:22 +01:00
Kurt Pattyn
f2f2e4e53e Fix to comply with Qt coding guidelines
Change-Id: Ie6c62d3107d17e64c94fa01380b3b1d80f24d0de
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2014-01-11 19:17:05 +01:00
Morten Johan Sørvig
0caaf9966a Cocoa: Add setContentBorderThickness().
Add setContentBorderThickness() to the Cocoa platform
plugin. This functions requests that the platform
plugin draws a gradient in the unified title and toolbar
area and/or the status bar area.

The background gradient is drawn before and under
the Qt backing store content. It is expected that
parts of the backing store will be filled with transparent
pixels to allow the  gradient to be visible. To facilitate
this the backing store image is created with an alpha
channel.

Task-number: QTBUG-34411
Change-Id: Iadc5e64ee9b9b42e92fb84a615817fdffd7a8802
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-01-11 10:48:40 +01:00
Sérgio Martins
79b0780783 Fix kms build with -qtnamespace
Change-Id: I6aa3f3bc3c098b96ec0eec369b85a938c552f364
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-01-11 06:30:39 +01:00
Lorn Potter
fa7451043e make 'AlwaysAsk' if found help determine whether the configuration is Discovered or not.
Since bearer has no idea about user interaction, we just do this,
and make the roaming/always ask scenario unavailable.

Change-Id: Id509a4d3346cdbb9367ddb465364c3500fc62fdf
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-11 03:30:57 +01:00
Lorn Potter
1db89eb5a4 fix connman QNetworkConfiguration Discovered
Make Discovered depend on autoconnectable service

This stops seemingly automatic use of a non autconnectable service,
and allows the connection dialog to popup.

Change-Id: Idea9a22eb4bbfb4fefeca7867526a2ddc3954376
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-11 03:30:52 +01:00
Lorn Potter
c28763d83c update the network configuration list
when changes in the networks happen.

Task-number: QTBUG-34021

Change-Id: I2bd187e7d04d6876294f18d917c9a384afe5db35
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-11 03:30:44 +01:00
Tasuku Suzuki
67cf8bf9a8 Make qtbase compile with QT_NO_TEMPORARYFILE
Change-Id: I0211ed44513723392e3f50b76be10b95c0bcddd5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 21:57:34 +01:00
Tasuku Suzuki
f568e43e10 Make qtbase compile with QT_NO_GESTURES
Change-Id: I90f173265e177ff37ce80da3983080651856259d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 19:36:47 +01:00
Morten Johan Sørvig
263fdd15da Don't force create the platform window.
This causes all sorts of unintended side effects and
is generally a bad idea.

Task-number: QTBUG-32988
Change-Id: Iebdae34764be4cfd9ced47aa93789871e0455ab3
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-01-10 17:15:21 +01:00
Peter Hartmann
6fd205d579 network proxy tests: adapt proxy authentication to new server
The tests pass with the new test server image. Once we are using the
new test server we can remove the test for the host not found error.

Change-Id: Iac8ba6d8ce31b0865b33a003086aac0339afe338
Reviewed-by: Richard J. Moore <rich@kde.org>
2014-01-10 17:14:29 +01:00
Tasuku Suzuki
2dc04430ba Make qtbase compile with QT_NO_DOM
Change-Id: I98bef84ca9bf86bf7dddd3ca2a3d8210a8e46a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 17:14:29 +01:00
Jürgen Hunold
c6b91576a6 Use custom -I,-D and -L flags when building arch-test
Needed for using alternate stdlib implementation like libc++ with clang.

Change-Id: I1782f62f5e2ea95e6cff8a1ed646362c0a31645c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 17:14:29 +01:00
Thiago Macieira
9598448758 Remove #ifdef from outside test functions
It's usually a bad idea to surround slots or signals with #ifdef since
moc may not parse it the same way the compiler does.

Change-Id: I6a3623ed7cb9fbc1b966df9d60f71b7fdf91acfe
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-01-10 17:14:29 +01:00
Joerg Bornemann
e1f89037c3 fix memory leaks in MSVC generators
Change-Id: I11bfc8259ac4e175c9ecc37d64f1d2e5037f15aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 17:14:29 +01:00
Gatis Paeglis
b088e4827f Fix bug on X11 with WA_TranslucentBackground and native child windows.
The native child windows need to inherit the parent's visual in order
to have a translucent background as well.

Surface with type QSurface::OpenGLSurface should not be forced to use
the parent window's visual - the parent visual for instance, might not
even be GL capable.

Changing WA_TranslucentBackground during runtime is not supported, for
two reasons:

1) Other platform plugins seem not to support it
2) It would require recreating X windows.

Task-number: QTBUG-29625

Change-Id: Ic1474dd2de99069027481c7db6bf865f9b8d616d
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-01-10 15:37:51 +01:00
Tasuku Suzuki
eb5c0f4b12 Make qtbase compile with QT_NO_XMLSTREAMWRITER
Change-Id: I6d2447ba0875117e8a50d1aa3133bd5ea098d51a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 04:53:36 +01:00
Thiago Macieira
e0a21c71f4 Don't check if a file exists before opening it
If the file doesn't exist, open() will fail. But open() might fail
even if the file exists(), which would lead to bad follow-up code. In
any case, this saves one unnecessary stat(2).

Change-Id: Ic99507c9dc07a4387ee6a4fe9c24830fca54e095
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-10 02:35:21 +01:00
Thiago Macieira
47a0d64dcf Fix QtWidget function-unused warnings found by Clang 3.4
qwidgetbackingstore.cpp:72:20: error: unused function 'qRectIntersects' [-Werror,-Wunused-function]

Change-Id: Ia3afe8f0547fa86804093281db89efabe68b34a1
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-10 02:33:50 +01:00
Thiago Macieira
52441ecd44 Remove unused member m_eglApi
It's not used anywhere. Found by Clang 3.4:

qeglplatformcontext_p.h:80:13: error: private field 'm_eglApi' is not used [-Werror,-Wunused-private-field]

Change-Id: I37ce240a9d07ef570e0814de366dbb7cd13ad714
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-10 02:33:45 +01:00
Thiago Macieira
17da13baaa Fix unused function warnings in qtriangulator.cpp
qIntersectionPoint with ints wasn't used, qDot was only used in debug
mode. Found by Clang 3.4.

Change-Id: I4b5699f75eb88331df54bf5a289133914d80b299
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
2014-01-10 02:33:41 +01:00
Thiago Macieira
f4d3196e4f Fix function-not-used warnings detected by Clang 3.4
These functions have been turned to static (although inline), which
means they need to be used or marked as possibly unused.

qglobal.h:712:37: error: unused function 'qFuzzyCompare' [-Werror,-Wunused-function]

Change-Id: Ie2ee713d26c86e0574b579c1ea42b9404c3d2035
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10 02:33:37 +01:00
Thiago Macieira
bbcdfb324b Fix file descriptor leak in the perf event counter
We opened the counter at every start(), even if we had already started
before. Some of the benchlib's options caused it to start() and stop()
over and over again, like -minimumvalue and -minimumtotal, which could
leak to fd exhaustion (EMFILE).

Change-Id: Ifeb7cca65c758877be600dc22928bea74f499934
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
2014-01-10 02:33:32 +01:00
Thiago Macieira
eaedc04d90 Autotest: Fix QDateTime failure if the test got run West of Greenwich
There was a comment about the test failing for max() because of an
overflow. That happens if you're at UTC or ahead of it (to the East of
the Prime Meridian), which is how this test usually gets run (UTC,
Europe/Oslo, Europe/Helsinki, Pacific/Auckland). But if you're behind
UTC (to the West of the Prime Meridian), then the overflow happens for
min().

Change-Id: Iebba49d1303e9f18f5038f5cf23c77bf83e5fd4b
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-09 22:49:23 +01:00
Tim Blechmann
c8a8e0fb18 zlib: rename z_errmsg symbol to avoid name clash when linking statically
Task-number: QTBUG-35301
Change-Id: I298fba7270ee49d4e2dfc624b18aa13ce25864be
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-09 20:14:48 +01:00