summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove bogus commentOswald Buddenhagen2012-01-271-4/+0
| | | | | | | Change-Id: Ibd2d974ac46f80953f628e8d7c93e742e4c8eb23 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* delete handling of dead -base-dir argumentOswald Buddenhagen2012-01-271-4/+0
| | | | | Change-Id: I4f69ea213f996f99d2ad8b00efbaf85882e59e27 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* update readme to current realityOswald Buddenhagen2012-01-271-3/+3
| | | | | | Change-Id: I330702f197c8b558f0a00b90f5e147dbef731abd Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Gives QNetworkCookieJar a virtual API.Jonas M. Gastal2012-01-274-63/+128
| | | | | | | | | | | | | | | | | QNetworkCookieJar now has the following virtual methods: virtual bool validateCookie(QNetworkCookie &cookie); virtual bool insertCookie(const QNetworkCookie &cookie, const QUrl &url); virtual bool updateCookie(const QNetworkCookie &cookie); virtual void deleteCookie(const QNetworkCookie &cookie); Their implementation is such that the behavior the class previously had(in memory storage of the cookies) is mantained. Task-number: QTBUG-23145 Change-Id: I1420894d31e8072eca6903c3c7ffd6f06205a257 Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Reviewed-by: Alexis Menard <alexis.menard@openbossa.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* QWidgets to use QGuiApplication focus object change notificationsPekka Vuorela2012-01-274-30/+22
| | | | | | | | | | | | | Moving away from deprecated QInputPanel inputItem. Small behavioral changes: - On focus proxy widgets, disabling WA_InputMethodEnabled on proxy will no longer disable input method for proxy target. - setEnabled(false) on proxy widget will no longer disable input method for target as a special case. Change-Id: Ifb5b7144d29bd3aefdde7cf4a0bd396db06e67e2 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* QGuiApplication::focusObject() to replace QInputPanel::inputItem()Pekka Vuorela2012-01-2710-5/+204
| | | | | | | | | | | * Deprecated QInputPanel::inputWindow() which is already just returning QGuiApplication::activeWindow() * Deprecated QInputPanel::inputItem() and introduced QGuiApplication::focusObject(). Input methods can check input method support by Qt::ImEnabled query. Change-Id: I70a9c1c3f79aadb75c839d0489a9428f7a221df5 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* QRegularExpression: infrastructure for importing PCRE in 3rdparty/Giuseppe D'Angelo2012-01-273-0/+206
| | | | | | | | | | | | | | | | | Added the necessary files for importing and compiling PCRE under 3rdparty/, including a small shell script to ease the import and the update of PCRE from its dist tarball. PCRE's config.h is used, but it is assumed that a global s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g was run on PCRE source files to avoid polluting QtCore compilation with -DHAVE_CONFIG_H (the aforementioned shell script performs this substitution; therefore, -DPCRE_HAVE_CONFIG_H is added instead to the compiler's command line). Change-Id: Ic0f23526ebf5f770aefdffc8f688e5816c28fd8c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fall back on glXChooseVisual() if glXChooseFBConfig() doesn't work.Samuel Rødal2012-01-275-55/+135
| | | | | | | | | | Some older drivers don't fully support glXChooseFBConfig(). As a bonus, fix some memory leaks here and there. Task-number: QTBUG-21880 Change-Id: Ie306dee27f616927a6aa55fd71601569b828afcc Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Introduced QOpenGLContext::defaultFramebufferObject().Samuel Rødal2012-01-2710-9/+129
| | | | | | | | Also add some debugging helpers to make sure applications are correctly written even on less restrictive platforms. Change-Id: Ie92e497c32e07b2b83662f7ab5540d8f37777fd0 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* "cache" is used only locally, so move it into scopeOswald Buddenhagen2012-01-272-1/+2
| | | | | | | Change-Id: I0ba45d5620a8e5a79fdc6a1854245a0bfcc489f0 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove qDBusNameToTypeId function.Jędrzej Nowacki2012-01-275-26/+13
| | | | | | | | The function is redundant and can be replaced by QMetaType::type(). Change-Id: I131a7fd285a60d8bd0f3b958668a43bd5da2d6c4 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Style fix for QSslCertificate constructor.Jonas M. Gastal2012-01-271-2/+1
| | | | | Change-Id: I1f128eb9f99ef4d25590bd034762cb8a0e68b075 Reviewed-by: Richard J. Moore <rich@kde.org>
* Removing ### that would cause needless SC brekage.Jonas M. Gastal2012-01-271-1/+1
| | | | | Change-Id: Iaa9cfd709c0ca4192760117ba5ec6d3992804d6a Reviewed-by: Richard J. Moore <rich@kde.org>
* Implement QWindow::close()Anselmo L. S. Melo2012-01-272-2/+38
| | | | | | | Implement the public slot QWindow::close() and add the correspondent test. Change-Id: If3f07cce3b26640f06fc52d0e4dca875d9894b3d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Give a more verbose warning during QVariant serialization.Jędrzej Nowacki2012-01-261-1/+1
| | | | | | Change-Id: Ia3c0736284afbd4acd8cc86538f5a5399964a589 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* QRegularExpression: configure support for PCREGiuseppe D'Angelo2012-01-264-2/+113
| | | | | | | | | Added PCRE config.tests, and logic and command line options (-qt-pcre and -system-pcre) for configure and configure.exe. Change-Id: I5da2658191198dbcf48c07d7c5de1be1b884a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix grammar in error messageOswald Buddenhagen2012-01-261-1/+1
| | | | | | Change-Id: I3fe4e0fa6da1467a4572e7f1dec1be7294632e34 Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use warnings instead of -wOswald Buddenhagen2012-01-261-1/+2
| | | | | | | | that way invocation via perl (c.f. syncqt.bat) does not need options. Change-Id: I5d8e0d1f0ffe1b7cf280fe97d4f70968a3dbbb22 Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add mkspecs for Blackberry Playbook NDKRafael Roquetto2012-01-266-0/+357
| | | | | | | mkspecs for QNX qcc, armv7le and x86 targets Change-Id: Ie4b0ec46a8837ad63f5aea8429cfdd516531e09a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QProcess/Win: use asynchronous I/O for reading stdout and stderrJoerg Bornemann2012-01-265-59/+116
| | | | | | | | This saves us from using the 100 ms polling timer to read process output. Task-number: QTBUG-23012 Change-Id: I3f9398d7a4d30826d2d89ac04bd2fd031500ff57 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QProcess/Win: use named pipes for redirecting standard I/OJoerg Bornemann2012-01-261-21/+51
| | | | | | | | Named pipes allow us to make use of overlapped I/O for redirected stdin, stdout and stderr. Change-Id: I50191b036bce696147139b200ddbc6c31c16112b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix a typo in tst_qtreewidget autotest.Jędrzej Nowacki2012-01-261-1/+1
| | | | | Change-Id: I573467c3fdfc4b3d059b216258d39944ac546061 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix virtual keyboard on Harmattan not following window content orientation ↵Simon Hausmann2012-01-262-2/+17
| | | | | | | | | | changes Track the input item's window and notify the input method server when the content orientation changes. Change-Id: I401c4fd677ed2eebd8b85968d4a2b3692517e097 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Made it possible to run tst_qtjson test from shadow build directory.Denis Dzyubenko2012-01-262-8/+13
| | | | | Change-Id: I167737c91e01f055a2ce14db54dfcc6b74ad8c28 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QStandardPaths: remove unused includes (leftovers from qdesktopservices)David Faure2012-01-262-6/+0
| | | | | Change-Id: I6fe23ecd04adc7dd68573dd0d6d01888c0cf71b6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QUrl: Implement a number of ## Qt5 TODOs (merging overloads)David Faure2012-01-262-84/+22
| | | | | Change-Id: I629c20f10e3667937d488ea30f93bf86f980ee1a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Convert tst_qurl.cpp to UTF-8 (to make it editable in QtCreator)David Faure2012-01-261-18/+18
| | | | | Change-Id: I9baa445b11f65b28596e5b88746b72c5cf04fe77 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Send text selection changes for accessibility.Frederik Gladhorn2012-01-261-0/+3
| | | | | | Change-Id: I3c50510ae9f995101d6e2c977c5138713389d71e (cherry picked from commit 2cf1f24f93fa0f3f5bd7d38e160160a2c91d87f5) Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fixed QString::operator<(QLatin1String)Denis Dzyubenko2012-01-264-4/+33
| | | | | | | | | | | | | | QLatin1String now has a constructor that takes explicit length, which makes it possible to create QLatin1String that do not have null-termination character. Fixed QString::operator> and < to be safe in that case. In the same patch fixed qtjson which had operator< implemented in the same way. QString::compare(QLatin1String) is still broken and will be fixed separately. Change-Id: I48ec1183a6f44034129cc17312af854795085408 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove the 'macosx' archBradley T. Hughes2012-01-265-256/+11
| | | | | | | | | | | | | The new atomic implementation chooses which header to include based on what #define's are set by the compiler (i.e. __x86_64__ or __i386__). Because of this, the qatomic_macosx.h header isn't used anymore. This also means that the configure script does not need to use or look for this file anymore, it should just use the normal uname -m detection. Change-Id: Ibf275488735483268286196952299c0e496dfd1f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Mark the single argument containers as movable.Stephen Kelly2012-01-262-0/+53
| | | | | | Change-Id: I1557b9f3c2d3ad805e1ab7bf4d49973f08664a79 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Automated metatype definition for template types.Stephen Kelly2012-01-262-0/+77
| | | | | | | | | | | | | | | | If T is defined as a metatype, then QList<T> is too automatically. So for example, no need to use Q_DECLARE_METATYPE(QList<int>) anymore. This is a source compatible change. Change-Id: I2ee8a7b9e28fe6d4775f6a05cce39aca8563e0c5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Cleanup of QWindowsVistaStyle.Friedemann Kleint2012-01-262-28/+25
| | | | | | | | | | - Remove the limbowidget, try to obtain HWND from a toplevel or the desktop instead. - Clean up handling of the theme map, avoid operator[] and repeated invocation of of map.end() Change-Id: Ic5ea6186508f37aaff782ca304ce577899f7b41c Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* Made QWindow::currentOrientation() a property.Samuel Rødal2012-01-265-9/+20
| | | | | | | | | | | | | | To match the previous QWindow::orientation() property which can be useful to access from QML. Also, removed the automatic translation of Qt::PrimaryOrientation to QScreen::primaryOrientation() on the QWindow level, as it leads to a lot of complexity regarding the QWindow::contentOrientationChanged() signal, and makes it hard to distinguish between the case where the window's orientation follows that of the screen, and the case where the orientation just happens to be set to that of the screen. Change-Id: I6950d1337b7f929815eff1328181855090d8066b Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Wrap unimplemented clang feature in __has_featureOlivier Goffart2012-01-261-4/+13
| | | | | | | | So that when they are actually implemented in future version, the proper defines get defined. Change-Id: I5cc3e3ef64b06facc27e6d697700dcb7a96300d5 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Fix a couple of edge cases for WildcardUnix matchingAndy Shaw2012-01-262-2/+4
| | | | | | | | | | | | | | Fix a couple of cases where WildcardUnix was not matching when the string was just [] or ended with a \. The testWildcardEscaping() test has been extended to account for these two cases too. Integrate 7ce3726aea4be2dfdb57966a4482f66fec6f8f57 from 4.8 Task-number: QTBUG-20897 Change-Id: I7a07ac008473fa7a080db752e189f6404842603f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove QTextControl and QLineControl.Andrew den Exter2012-01-259-5669/+4
| | | | | | | | QtWidgets and QtDeclarative now both have their own versions of these so there's no need to keep them around any longer. Change-Id: I9c2201c8495a0a0816e2af16c8f647fcad991479 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Cleanup mess in public type ids.Jędrzej Nowacki2012-01-25136-55/+212
| | | | | | | | | | | | | | | | | | There is no reason to keep two separated core types sets. It couldn't be fixed before Qt5 because of binary compatibility promise. This patch merges QMetaType core types with ext core types. This "simple" operation consists of: - QDataStream version was incremented, because type ids are saved in QVariant's data stream. - QMetaType LastExtCoreType and FirstExtCoreType were replaced by LastCoreType, FirstCoreType and new QMetaType::HighestInternalId. - New tests checking QVariant data stream for Qt4 and for Qt5 versions were added. Change-Id: I02dd74d29317365c297a789a4eb7c9c5edc3b231 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Fix building of configure.exe.Friedemann Kleint2012-01-251-0/+2
| | | | | | | Add missing files to profile. Change-Id: I72ccbbbef3e036fc0cfe7a0a6df4c19d0474b798 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QAbstractSocket / QSslSocket: add API to pause and resumePeter Hartmann2012-01-259-49/+277
| | | | | | | | | | | | | | | pause and resume is currently only supported upon emitting the QSslSocket::sslErrors() signal. The API was added in QAbstractSocket to also support QAbstractSocket::proxyAuthenticationRequired() in the future. This is the first patch to support that feature on the socket level, another patch will follow to support sslErrors() and authenticationRequired() in QNetworkAccessManager / QNetworkReply. Task-number: QTBUG-19032 Change-Id: Ide2918268590ab9a01454ab26cb7fdca3dc840ab Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Introduce QGuiApplicationPrivate::windowForWidget.Friedemann Kleint2012-01-251-3/+15
| | | | | | | Change getHWNDForWidget() to take a const QWidget *. Change-Id: I6b0d0bce70487304dfcd4e7a6a039fe8c7ca4aae Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Windows Vista Style: Fix drawing of buttons in message boxes.Friedemann Kleint2012-01-253-6/+5
| | | | | | | | | Do not use the HDC of the backing store when drawing to an image (as opposed to 4.8, where the HDC of the paint engine was used). This causes 'ghost buttons' to appear in the dialog box at 0,0. Change-Id: I301b66abf4447a65ee144f09655b68efaf18700d Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* Widgets: Enable Windows styles on Windows.Friedemann Kleint2012-01-251-1/+1
| | | | | Change-Id: I1f1a675ad52da2bfb8988d91012d725469d1cac9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Mark the enumerator QVariant::Type as obsolete.Stephen Kelly2012-01-251-0/+1
| | | | | | | | | | In most cases, QMetaType::Type should be used (contains more entries) and in APIs an int should be used to allow for user-extended metatypes. Change-Id: Iaa768f6d510686da36c61b8aaf5de3ac53a6f463 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* bearer: run the bearer engines in their own worker threadShane Kearns2012-01-253-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | The original architecture of the QtNetwork bearer support hosted the engines in the application's main thread, but this causes some problems. If the QNetworkConfigurationManager is constructed in a worker thread, then it is populated asynchronously without any notification when it is done (the app gets incomplete or missing results) Fixing that by restoring the earlier behaviour of using blocking queued connections to wait for the lists to be populated caused a regression, as some applications deadlock because the main thread is waiting on the worker thread at this time. By introducing a dedicated worker thread for the bearer engines, QNetworkConfigurationManager can be safely constructed in any thread while using blocking queued connections internally. Task-number: QTBUG-18795 Change-Id: Iaa1706d44b02b42057c100b0b399364175af2ddb Reviewed-by: mread (cherry picked from commit 5f879c55e531165cc2569b03c3796d0f33d0a0b7) Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Don't lose the fontDef when setting the size of a raw font.Pierre Rossi2012-01-251-1/+1
| | | | | | | | | QFontEngineFT::cloneWithSize, which is used among other things by QRawFont::setPixelSize, should create a new font engine using the font definition from the current font engine. Change-Id: I9415422bbecc2bf7b7acf105c12c1c83a894526c Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Mark QStringList as movable.Stephen Kelly2012-01-251-0/+2
| | | | | | Change-Id: I27fb523c43ace195d04d729c800669246a1930d7 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed fileiterator issue for WEC7.Janne Anttila2012-01-251-0/+2
| | | | | | | | | | | | | | WEC7 does not support FIND_FIRST_EX_LARGE_FETCH with FindFirstFileEx, but windowsVersion for WEC7 is still resolved as WV_WINDOWS7. If the FIND_FIRST_EX_LARGE_FETCH flag is passed to FindFirstFileEx in WEC7, the method does never find any files from given directory. Changed FIND_FIRST_EX_LARGE_FETCH flag to apply only when Q_OS_WINCE is not defined. Task-number: QTBUG-22503 Change-Id: Ic38cf745cda7ee7b23da67dc390ac0e6d04158cd Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
* Remove use of QT_MODULE from libraryGunnar Sletta2012-01-25561-732/+25
| | | | | | | | | | These defines were there to aid in the commercial licensing scheme we used long ago, and are no longer needed. Keep a QT_MODULE(x) define so other modules continue compiling. Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* moc: Use QMetaType::QVariant as the type for QVariantKent Hansen2012-01-255-15/+20
| | | | | | | | | | | | | | | | | | | QMetaType::QVariant has existed as a proper type for almost two years, but the qvariant_nameToType function was written in 2006. Using QMetaType::QVariant means QVariant can be treated just like any other type. We can get rid of those hacky checks for LastType, and the remaining checks become more readable. The fact that QMetaProperty::{type,userType}() returned LastType (0xffffffff) for QVariants was never documented (LastType itself is internal). But there are other Qt modules that assume so. I'll fix the ones I know about (qtdeclarative, qtscript, activeqt). Change-Id: I799b9079bb8bbb1fe76c132525440b30415cbac5 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>