summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-15Refactored spec file.submit/tizen/20140115.141514submit/tizen/20140115.103852accepted/tizen/mobile/20140116.012320accepted/tizen/ivi/20140115.201737Tomasz Olszak1-41/+3
Removed qt5-qtbase empty package and changed qt5-plugins-platform-inputcontext-compose to qt5-plugins-platforminputcontext-compose Change-Id: I940c7966117ae5f5ba559db094ff171662543ce2 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-01-15Bump package version to 5.2.1Tomasz Olszak1-1/+1
Change-Id: Iddf93c72b2e1688bc2fe896d6998c046e513c49e
2014-01-15GL instead of EGL Used in Mobile.Tomasz Olszak1-3/+15
2014-01-15Temporary removed tizenscim input context plugin.Tomasz Olszak1-4/+4
It bases on 2.2.1 changes which are not merged yet.
2014-01-15spec files adapted for TizenTomasz Olszak1-253/+315
2014-01-15Import from MerTomasz Olszak3-0/+1023
2014-01-15Merge remote-tracking branch 'origin/stable' into wip/tizenTomasz Olszak81-928/+2640
Change-Id: If27e14120e775ea4fcd93ffd015063230ea8a184
2014-01-15Saving physical size changes of screen on WindowsCyril Oblikov1-0/+2
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-14Windows: Use focusWindow() as native dialog parent when 0 is passed.Friedemann Kleint1-0/+2
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-14Stabilize tst_scrollbar.Friedemann Kleint1-41/+52
- 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-14MIPS DSP build system fix and additional optimizations.lpapuga15-10/+2141
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-14Ask qdoc not to parse Q_DECL_UNUSEDThiago Macieira1-0/+1
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-14Correct wordwrapped text handling in QListView icon modeSamuel Gaist2-1/+9
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-13Windows: Do not print test output to both stdout and system debug logKai Koehne2-2/+10
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-13Mac: Remove old unified toolbar implementation.Morten Johan Sørvig8-705/+5
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-13Fix typos in commentsKurt Pattyn1-6/+6
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-12QNX: Fix compiler warning about unused variable.Sérgio Martins1-0/+1
Change-Id: I16e4aa32647793bf36fee60ed94db69a6ae2d8ea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-01-12Mac: remove unified toolbar workarounds.Morten Johan Sørvig1-25/+2
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-12Mac: Update unified toolbar drawing code.Morten Johan Sørvig1-3/+37
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-11Fix Use android theme when definedThorsten Zachmann1-8/+16
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-11Mac: Update PE_IndicatorToolBarHandle drawing.Morten Johan Sørvig1-8/+4
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-11Enable window dragging code in QToolBar on MacMorten Johan Sørvig2-5/+5
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-11QDate - Fix parsing Qt::ISODateJohn Layt2-0/+12
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-11QDateTime - Fix isValid() if invalid QTimeZoneJohn Layt2-0/+16
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-11QLocale - Check day number is validJohn Layt1-0/+3
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-11Fix to comply with Qt coding guidelinesKurt Pattyn1-32/+19
Change-Id: Ie6c62d3107d17e64c94fa01380b3b1d80f24d0de Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2014-01-11Cocoa: Add setContentBorderThickness().Morten Johan Sørvig6-2/+69
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-11Fix kms build with -qtnamespaceSérgio Martins2-3/+5
Change-Id: I6aa3f3bc3c098b96ec0eec369b85a938c552f364 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-01-11make 'AlwaysAsk' if found help determine whether the configuration is ↵Lorn Potter2-1/+8
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-11fix connman QNetworkConfiguration DiscoveredLorn Potter1-5/+7
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-11update the network configuration listLorn Potter4-0/+44
when changes in the networks happen. Task-number: QTBUG-34021 Change-Id: I2bd187e7d04d6876294f18d917c9a384afe5db35 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-10Make qtbase compile with QT_NO_TEMPORARYFILETasuku Suzuki1-1/+4
Change-Id: I0211ed44513723392e3f50b76be10b95c0bcddd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10Make qtbase compile with QT_NO_GESTURESTasuku Suzuki3-0/+9
Change-Id: I90f173265e177ff37ce80da3983080651856259d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10Don't force create the platform window.Morten Johan Sørvig1-5/+0
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-10network proxy tests: adapt proxy authentication to new serverPeter Hartmann1-3/+2
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-10Make qtbase compile with QT_NO_DOMTasuku Suzuki1-0/+1
Change-Id: I98bef84ca9bf86bf7dddd3ca2a3d8210a8e46a16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10Use custom -I,-D and -L flags when building arch-testJürgen Hunold2-3/+21
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-10Remove #ifdef from outside test functionsThiago Macieira2-12/+13
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-10fix memory leaks in MSVC generatorsJoerg Bornemann2-6/+8
Change-Id: I11bfc8259ac4e175c9ecc37d64f1d2e5037f15aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10Fix bug on X11 with WA_TranslucentBackground and native child windows.Gatis Paeglis2-4/+9
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-10Make qtbase compile with QT_NO_XMLSTREAMWRITERTasuku Suzuki1-0/+5
Change-Id: I6d2447ba0875117e8a50d1aa3133bd5ea098d51a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-01-10Don't check if a file exists before opening itThiago Macieira1-4/+2
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-10Fix QtWidget function-unused warnings found by Clang 3.4Thiago Macieira1-9/+0
qwidgetbackingstore.cpp:72:20: error: unused function 'qRectIntersects' [-Werror,-Wunused-function] Change-Id: Ia3afe8f0547fa86804093281db89efabe68b34a1 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2014-01-10Remove unused member m_eglApiThiago Macieira2-3/+2
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-10Fix unused function warnings in qtriangulator.cppThiago Macieira1-7/+2
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-10Fix function-not-used warnings detected by Clang 3.4Thiago Macieira1-6/+6
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-10Fix file descriptor leak in the perf event counterThiago Macieira1-9/+11
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-09Autotest: Fix QDateTime failure if the test got run West of GreenwichThiago Macieira1-2/+42
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-09zlib: rename z_errmsg symbol to avoid name clash when linking staticallyTim Blechmann1-0/+1
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-09QPdfWriter - Fix setting of marginsJohn Layt1-0/+2
The setting of margins wasn't being passed to the base class, so calling margins() wouldn't return the new values. Change-Id: I86c30f28fb0430f4b9d6e180a59cad354b489289 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>