summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Define QNetworkReply::NetworkSessionFailed errorShane Kearns2012-04-112-0/+4
| | | | | | | | | This is to replace the UnknownNetworkError which occurs when the internal QNetworkSession fails to start (e.g. no usable WLAN available) Change-Id: I2b14577c22e0acf8ff07be7e932f0dfe9ac89c33 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Set ConnectInBackground based on requestShane Kearns2012-04-111-1/+4
| | | | | | | | | | | | | | Set the QNetworkSession attribute to match the QNetworkRequest that triggered it. Currently if there are a mix of normal and background requests queued and background connections are not allowed by policy: - background requests at the head of the queue should fail - first foreground request should successfully start a connection - remaining requests succeed regardless of background attribute Change-Id: If0e3ec0b8a5096e3d7cd6df85884c6f53172d233 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Define BackgroundRequestAttributeShane Kearns2012-04-112-0/+9
| | | | | | | | | This is so that the ConnectInBackground flag can be set on the QNetworkSession internal to QNAM according to pending requests. Change-Id: If0cc62f5117ed8febbbda7b7f6de62b11b274258 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Move QVectorPath::polygonFlags to its own class.Robin Burchell2012-04-112-11/+10
| | | | | | | | Who can say why it was put in QPaintEngineEx's header, but it certainly doesn't belong there. Change-Id: Ieb3b977affcf4b240f621d13b72bdc0e8f8138b9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Move QRectVectorPath into the .cpp of the only file actually using it.Robin Burchell2012-04-112-48/+48
| | | | | Change-Id: I2778b5142ee574f44a9f9489a2752265c6a6c170 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* unite QString::normalized() overloadsKonstantin Ritt2012-04-112-26/+12
| | | | | Change-Id: I27545e599a1831728e491a9fad1e52fa255535fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Deprecate qMemCopy/qMemSet in favour of their stdlib equivilents.Robin Burchell2012-04-1131-61/+48
| | | | | | | | | | | | | | | | | | Just like qMalloc/qRealloc/qFree, there is absolutely no reason to wrap these functions just to avoid an include, except to pay for it with worse runtime performance. On OS X, on byte sizes from 50 up to 1000, calling memset directly is 28-15% faster(!) than adding an additional call to qMemSet. The advantage on sizes above that is unmeasurable. For qMemCopy, the benefits are a little more modest: 16-7%. Change-Id: I98aa92bb765aea0448e3f20af42a039b369af0b3 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: John Brooks <john.brooks@dereferenced.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Mark QObject::disconnect overload constOlivier Goffart2012-04-112-4/+4
| | | | | | | | | Consistency with the non-static connect overload Task-number: QTBUG-23622 Task-number: QTBUG-1772 Change-Id: Ic09df9cca1feaabb6b5cf335f04a0d6d4bbf011f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make reallocData() take (unsigned) size, including nullJoão Abecasis2012-04-114-38/+38
| | | | | | | | | | | | The parameter represents an allocation size and unsigned matches the Q*Data::alloc member it ultimately represents (even if they currently differ in accounting for the null). There's still work up for grabs to ensure we avoid integer overflows when growing. Change-Id: Ib092fec37ec2ceed37bebfdc52e2de27b336328f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Adjust a double leading slash in the path for FTP to /%2FThiago Macieira2012-04-102-2/+16
| | | | | | | | | | | | | | | Some FTP implementations (currently not including QNAM) strip the first slash off the path in an FTP URL so that the path in the URL is relative to the login path (the user's home directory). To reach the root directory, another slash is necessary, hence the double slash. In anticipation of future URL normalisation, which Qt 4 could do, "//" could be rendered to "/", so this extra slash should be "%2F". This operation is done only in QUrl::fromUserInput. Change-Id: If9619ef6b546a3f4026cb26b74a7a5a865123609 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add early-clobbers to the output variables in CPUIDThiago Macieira2012-04-101-3/+3
| | | | | | | | | | | | | | | Without those early-clobbers, the compiler might decide to schedule a register that is also used as output. The existing early clobber in the tmp variable was there so the compiler wouldn't use a register scheduled as input (especially EAX). To be honest, I'm not convinced that the compiler should be allowed to do this. That means that two output variables are scheduled to the same register... still, this fixes a problem found with GCC 4.2 (at least the Mac one). Change-Id: I6cd4676284e9a83d6aac4b439c6e58e347c40106 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Make plugin linking fail if some references aren't presentThiago Macieira2012-04-101-1/+1
| | | | | | | | | | It's better to fail at linking time than to try and figure out later why QPluginLoader refuses to load the plugin. Change-Id: I439bad9dcdbfff9f76efe40381fd7ccfffe738bc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Merge remote-tracking branch 'origin/master' into api_changesOswald Buddenhagen2012-04-10364-10630/+8136
|\ | | | | | | | | | | | | | | | | | | Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
| * Find libssl on linux using paths of loaded librariesShane Kearns2012-04-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The installed path of libssl may include an element describing the architecture, e.g. x86_64-linux-gnu or i386-linux-gnu. In most cases, the libraries already loaded (static dependencies of Qt, such as libc) will include the path where libssl is installed. Use dl_iterate_phdr to find the paths. This is a linux specific function, but it does provide "/lib/<arch>" and "/usr/lib/<arch>" at the point ssl symbols are being resolved when running the qsslsocket autotest (which has less dependencies than a typical Qt app). Task-number: QTBUG-24694 Change-Id: I9af8081f41bb85c2fcff450a2acda5672a7f7518 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * Windows: Use native font engine by default.Friedemann Kleint2012-04-051-3/+4
| | | | | | | | | | | | | | | | | | Turn around the meaning of the command line parameter. The FreeType engine can now be activated by passing freetype. Change-Id: I9da6cd4a127603f9cfb91f0ce8450088c0883faa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Include with qt module to avoid configure warningPekka Vuorela2012-04-051-2/+1
| | | | | | | | | | Change-Id: I8d338f22c4b0dabcca33878b33c6a203828d84c5 Reviewed-by: David Faure <faure@kde.org>
| * Fixed an exit crash that could occur in QQuickPixmap.Charles Yin2012-04-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | The global destructor for the clean up hooks might be called before the global destructor for QQuickPixmapCache objects. This is an additional fix for QTBUG-8681 Task-number: QTBUG-8681 Change-Id: I8694a7a246980f488aef78071c613e3a908c7db3 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Specify generic QPA plugins via env variablesDonald Carr2012-04-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | Introduce a mechanism to load comma separated generic QPA plugins via exported environment variables. (Drastically simplifies QPA usage in custom environments where a variety of plugins could be used and heuristics are consequently a poor fit) Change-Id: I292f3fbfc8b8ad2b4f416984ef0a10b9b59de531 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Don't ignore tst_QWindow on Mac OS XBradley T. Hughes2012-04-042-3/+6
| | | | | | | | | | | | | | | | QTBUG-23059 only affects 2 test functions, not the whole test. XFAIL the 2 failing tests. Change-Id: I87086a9ec573362625bc090038dfd7c79aeb9426 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * device: Add device support for the Broadcom Raspberry PIDonald Carr2012-04-043-0/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add mkspec for the Raspberry PI platform to be used in conjunction with the -device support in configure. This allows you to build Qt with the application libraries provided by the Raspberry PI foundation. The Raspberry PI is described here: http://en.wikipedia.org/wiki/Raspberry_Pi and its use with Qt is documented here: http://wiki.qt-project.org/Devices/RaspberryPi Change-Id: Ib8d11d0a469edaaf34ccc04cf33a42a725fc2bdb Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Change the parameter name of the mutex in a QWaitCondition.Stephen Kelly2012-04-042-16/+16
| | | | | | | | | | | | | | | | IDEs pick up hints like this, so it makes it more clear to the user what they need to pass in. Change-Id: I5de272395fc98391cf43963ce4416a845726bb2c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Revert "Make the CONFIG and QT_CONFIG contents available downstream."Stephen Kelly2012-04-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c2e57e6884c1ef524bb22f0ed6a2be2c97cd46d. This created variables with awkward names and unproven usefulness. In the FindQt4.cmake file they are considered internal. Change-Id: I51443b2a39d4f11817bd13332baf025556dd8ebe Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Windows Vista: Fix painting of item view items.Friedemann Kleint2012-04-042-15/+46
| | | | | | | | | | | | | | | | | | The old QWidget-based treeViewHelper() function silently failed since the widget no longer had a HWND. Use a native Window handle instead. Change-Id: I6902677c565bb165f29b9d1c6fd0d28d9870d567 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Windows: Replace QString keys of XP themes by an enumeration.Friedemann Kleint2012-04-043-141/+254
| | | | | | | | | | Change-Id: I5323e9ed5bc3fe73f278d167acae6fa744b0a299 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| * Update the documentation about the sign in QElapsedTimer::(m)secsToThiago Macieira2012-04-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since all implementations calculate other - *this, if other has a higher value (was started later), then the returned value is positive. The implementations are: generic: return other.t1 - t1 win: return ticksToNanoseconds(other.t1 - t1) / 1000000 mac: return absoluteToMSecs(other.t1 - t1); unix: return (other.t1 - t1) * Q_INT64_C(1000) + fraction... Task-number: QTBUG-25128 Change-Id: Iff0a3460ae9e9d9bdd82fbaad55657fb60e5235a Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * Make sure we create an application before a QWidget.Stephen Kelly2012-04-042-0/+2
| | | | | | | | | | Change-Id: I2e48f9ca59df62ac28d3cecdb6c2b741c59075de Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * eglfs: Introduce hooks for the eglfs pluginGirish Ramakrishnan2012-04-047-8/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EGL provides an api to create a rendering context for khronos APIs on native surfaces. The board initialization and window creation is platform specific. This commit adds platform hooks/extensions to the EGLFS plugin and implements them for the Amlogic 8726M. The hook interface is internal and there are no ABI/API guarantees. EGLFS is now linked with -Wl,-no-undefined to make sure that a hook does not add unresolvable symbols. Change-Id: I7f4fcdb422aacbf00de468f4d8e85ae5368bfacf Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Windows: Fix menu color for Windows, WindowsXP.Friedemann Kleint2012-04-041-1/+1
| | | | | | | | | | | | | | Typo in palette. Change-Id: I8b4c23ef7f75ff3aa3351f15e4af0767a3ccd083 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Add tst_QWindow::windowModality()Bradley T. Hughes2012-04-041-0/+32
| | | | | | | | | | | | | | | | | | This tests that we get the windowModalityChanged() signal as needed, but not unnecessarily either. Change-Id: I2232fa9d45c72e472b324b681859b4b0d574b467 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * Remove/update Qt 5 to-do's that won't be done for Qt 5.Jason McDonald2012-04-043-3/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-23524 Change-Id: Iebf5b78dc2ff27310b5a484bae588862417f693c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Re-enable PPS based rotation handling for blackberry devicesKevin Krammer2012-04-041-2/+0
| | | | | | | | | | | | | | | | | | BPS based event handling not there yet, so make use of the non-blackberry QNX facility until it is. Change-Id: I95cdbfbe36cd23e71710c8cad0b292a5a375c214 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * printing: Make sure window modality works with native print dialogsBradley T. Hughes2012-04-044-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | Make the native QPrintDialogs and QPageSetupDialogs participate in the Qt modality system. Even though we are overriding QDialog::setVisible() and exec() to show the native dialgos, we want to still call into QDialog::setVisible() so that modality state and events are properly handled. We do this by setting the WA_DontShowOnScreen attribute on QPrintDialog and QPageSetupDialog, and call QDialog::setVisible() at the appropriate places. Change-Id: I7d800790c40ba1f467c3315e29abb79a7fa0eb34 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Moved 'qnx' CONFIG definition to common location.Rafael Roquetto2012-04-042-1/+3
| | | | | | | | | | | | | | | | | | Removed the duplicated 'qnx' CONFIG defition from the mkspecs and declared it on the common qcc-base-qnx.conf configuration file. Change-Id: Ie215e3dd794762f20bec9c19afd5936a78a9d963 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| * Removed Qt 5 todo comments from qpalette.hSamuel Rødal2012-04-041-3/+3
| | | | | | | | | | | | | | | | | | The removal won't happen in Qt 5, and there's no great value in making NoRole have the value 0 at the potential risk of breaking existing code. Task-number: QTBUG-25068 Change-Id: I57238f55a23e77a783ebac47b96b4a5e62480add Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * Enable stack smashing protection on QNX and Blackberry platformsSean Harmer2012-04-041-3/+6
| | | | | | | | | | | | | | Change-Id: I2610c8e446a74ee584c5b450e1b872b7cda50813 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Pass autorepeat info to input context key filtering with XCBPekka Vuorela2012-04-031-12/+19
| | | | | | | | | | Change-Id: Ifbb658dde6689543f48ed8fb82109ea07bcf8bd7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * Remove duplicate non-const methods from QProgressBar.Jason McDonald2012-04-032-8/+6
| | | | | | | | | | | | Task-number: QTBUG-23524 Change-Id: I80f7eecb9f892fcd026b3c3f9159958fc99cfe23 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix warnings about signed/unsigned comparisons in QtJson.Friedemann Kleint2012-04-032-5/+5
| | | | | | | | | | Change-Id: I92071ea870bf0ebb740fcb360aff19658380a0cd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix warnings about unused variables.Friedemann Kleint2012-04-034-13/+7
| | | | | | | | | | | | | | | | Fix MSVC warnings about unused q, d where only static functions are used. Change-Id: I239d6fc3c851b0a62434cb09fc0e1967f2e6d031 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix warnings about truncations in constants.Friedemann Kleint2012-04-038-10/+10
| | | | | | | | | | Change-Id: I46872c5b2866454112092c1ec5efbfe15db5af33 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fixing the QNX QPA build for non blackberry targetsKevin Krammer2012-04-031-4/+1
| | | | | | | | | | | | | | Change-Id: I3d0bb33cadae946d21f8b2566840be9b1ae5101a Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * Delete the screen event handler after its last user.Thomas McGuire2012-04-031-1/+2
| | | | | | | | | | | | Change-Id: I2e3c6d08c0dcdd4b954570e9a2198c190c8fffd2 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * QWindow: add windowModality as a Q_PROPERTY()Bradley T. Hughes2012-04-032-8/+23
| | | | | | | | | | | | | | | | This also adds the QWindow::windowModalityChanged() signal. Change-Id: I6e3bc3155d72811d173857c39d36dcb264928334 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * WindowsXP: Fix Item view alternate color being black.Friedemann Kleint2012-04-031-3/+35
| | | | | | | | | | | | | | The theme palette needs to be initialized by the standard palette. Change-Id: I91c2ac9aea122e6ed9c09c96b35dfe0ef18a3ca0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Make API in QPlatformSharedGraphicsCache a little more genericEskil Abrahamsen Blomfeldt2012-04-031-3/+4
| | | | | | | | | | | | | | | | Use EGL extensions for some things to allow serialization instead of the somewhat specialized serializeBuffer() function. Change-Id: I8d15e85bfb80d12fa953ba094564ddfca1aa6d6a Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * qdoc: findNodeRecursive() was called with a null start nodeMartin Smith2012-04-032-2/+14
| | | | | | | | | | | | | | | | | | | | | | This occurred in several places. They have all been corrected to start at the tree root, when the start node passed is null. Task nr: QTBUG-25146 Change-Id: I5d75db0626451d30e8be8de5605036ba168f2a14 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| * Don't require exact IMAP server version in autotestsShane2012-04-031-39/+7
| | | | | | | | | | | | | | | | | | | | The string from the server should begin with "* OK" and end with "\r\n" according to the IMAP specification. Still have a check for "server ready" as this does not change between cyrus versions. Change-Id: Ia01ed8aa054e5726bba8b411d30edc6205cc8465 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fixes a problem with the proxy detection on WindowsThierry2012-04-031-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current scheme is to use IE's default config. If that fails get the winhttp config. That's ok. The problem is that if you run a program as a service getting the IE config will set the fAutoDetect flag. But later the call to WinHttpGetProxyForUrl mightfail with the error code ERROR_WINHTTP_AUTODETECTION_FAILED. this patch just makes sure that we have a fallback winhttp solution in case the IE proxy is not set. The new code detcted if the current process is a service, in which case it will try to default to the system-wide proxy. Change-Id: I57e9082a46a8422c54f8f069715752c271a3a001 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * Move handling of rotation changes from event handler to screenKevin Krammer2012-04-035-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Have the navigator event handler emit the new rotation as a signal argument and let the screen class handle all parts of the change, i.e. also notifying the window system about the geometry change. This also allows to rotate all screens, not just the primary screen, if this should be necessary. Change-Id: I304a80232b84d2d9130e38e955d5a75b1ccad775 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * Corrected filenames to build on case-sensitive Mac filesystemsShawn Rutledge2012-04-032-2/+2
| | | | | | | | | | Change-Id: Ie6f0188e3b2140b80b444dfdf24a078d215e0e87 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>