summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-05-0339-571/+719
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/gui/kernel/qguiapplication.h src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow.h tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e
| * Allow qDebug output to be configured by qSetMessagePattern()Kai Koehne2012-04-245-17/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add qSetMessagePattern() to configure the default message pattern. This one can still be overwritten by setting the QT_MESSAGE_PATTERN environment variable. Without this method, there's actually no way to change the default output programatically. Since QT_MESSAGE_PATTERN is evaluated when the first message arrives, setting it via e.g. qputenv might have no effect/be too late. Change-Id: I115e0c30606f128fdbf5c169a951ffa2a6a48517 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Migrate QString over to QArrayDataJoão Abecasis2012-04-242-82/+32
| | | | | | | | | | | | Change-Id: Ieadc60523a2bef61a088920576c65c720b11bfb9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Move QGestureEventPrivate's content to the main classThiago Macieira2012-04-235-49/+20
| | | | | | | | | | | | | | QEvent now checks that the d pointer is unused. Change-Id: Ib0aa97d1692ea55324c4c6f133ffdd5a221f1680 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Make QStringLiteral and QByteArrayLiteral always return the real typesThiago Macieira2012-04-234-73/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up until now, the macros would return an internal type that contained the pointer to the data. This breaks code that tried to use the macros with operators, like QStringBuilder but also when writing: QStringList() << QStringLiteral("a") << QStringLiteral("b"); This change seems to work fine now and I can also verify that this works: const auto str = QStringLiteral("Hello"); Even though it creates a QString, which is non-POD and non-constexpr. Change-Id: Iaf82af9bea4245513a1128ea54f9d2d3d785fb09 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| * Add unit testing for the qdbusxml2cpp toolThiago Macieira2012-04-213-1/+269
| | | | | | | | | | | | | | | | I have not added tests for warnings or other failure to input. This tests only proper output for the moment. Change-Id: Ie01fd2a78adfa57c27bf288a08cd44ae82f51241 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| * Stop using QEventPrivate::d in QWindowStateChangeEventThiago Macieira2012-04-202-13/+4
| | | | | | | | | | | | | | | | We can add a boolean and avoid using the d pointer (which QEvent now checks to be unused). Change-Id: I7367d5410d10ed06441fe9037cac0e3473d62498 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Logging: Change arguments of message handler to avoid conversionsKai Koehne2012-04-208-94/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new QtMessageHandler that takes QString instead of char *: This avoids converting to local8bit , only to convert it back to utf16 for Windows. The old QMessageHandler is kept for a transition period, but will be removed before Qt 5.0. Also fix qEmergencyOut (that is called in OOM situations) to not rely on the default message handler. Change-Id: Iee0ce5838f97175c98788b847964273dd22d4a37 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Remove private classes in QEvent-derived classes.Thiago Macieira2012-04-193-150/+30
| | | | | | | | | | | | | | | | | | | | | | QEventPrivate doesn't exist, so these classes were technically abusing the d pointer. Move the contents of the private classes into the main event classes. Change-Id: If2e894c1fa05f468221a0b43f3ebdf90769298eb Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Add an assertion to deleteLater() before it modifies QEvent::dThiago Macieira2012-04-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deferred deletion functionality stores the event loop level nesting count in the QEvent d pointer. In Qt 4, this d pointer was not usable because we forgot to add a proper copy constructor and assignment operator to it, so the deleteLater() process stored the count here safely. Since Qt 5 now has non-implicit copy methods, the d pointer could be used in the future. If QEvent uses it, this assertion will trigger. Note that it doesn't apply to classes derived from QEvent, though. Change-Id: I8600c8e9379921e32aca166bc0a6c0b4c4ed799f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * Remove QVariant constructor taking Qt::GlobalColor.Jędrzej Nowacki2012-04-196-34/+7
| | | | | | | | | | | | | | | | The constructor is wrong, it creates instance of QVariant encapsulating a QColor instance. QVariant should not implicitly convert data, never. Change-Id: Idc794ecdecb42d8b53fee3f993bf51ddd43f595d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * api: remove QWindow::visible()Girish Ramakrishnan2012-04-183-13/+2
| | | | | | | | | | | | | | | | | | | | | | The correct api is QWindow::isVisible(). Removing the api is safe since QWindow is not even released yet. Only qtdeclarative needed to be fixed with 71c8fe296fe5aa7e79033dd8f5b539852d4276e0. Change-Id: Ie571ed4802fe89132419e402acdb854446f4578f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * api: QGuiApplication::inputMethod should be staticGirish Ramakrishnan2012-04-182-6/+14
| | | | | | | | | | | | | | | | | | Pretty much all methods in QGuiApplication are static. Also adds documentation. Change-Id: I96808dd266922432b92fe3962292e4d5b6a8ab46 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
| * Remove redundant check in QMetaType::typeInfoJędrzej Nowacki2012-04-181-2/+1
| | | | | | | | | | | | | | The check was introduced when void was not a fully defined type. Change-Id: I4df8607999436f8db92be77fc8fd203fc66c2816 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Remove redundant checks in QVariant.Jędrzej Nowacki2012-04-181-6/+0
| | | | | | | | | | | | | | QVariant and QMetaType have aligned type naming implementation. Change-Id: I9eaae1045c492c148e3e9d23f4e04d48272f7ec2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Hide QTypeModuleInfo in a private namespace.Jędrzej Nowacki2012-04-184-18/+18
| | | | | | | | | | | | | | The class is private and shouldn't pollute global namespace. Change-Id: Ib44473fd72e5a70096eeff1662e88b29263d19c6 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* | Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtWidgets]Thiago Macieira2012-05-0330-107/+107
| | | | | | | | | | | | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ie8ac500f2f8ebe99b7525feaa7b39247e641a461 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Simplify the size of the QVarLengthArray buffer.Thiago Macieira2012-05-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | The previous calculation was too complex for no good reason. QVarLengthArray actually doesn't change the size after this change due to padding, but we don't need to include the padding in our own calculation. Task-number: QTBUG-25113 Change-Id: I72ea214f0d96870ecf8ff65737e7ca14e19afc7a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Fix the QByteArray overloads to QString::fromXXXXThiago Macieira2012-05-031-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c951908bc201afa59402967d50fa926212845fae added these overloads, but did not properly use qstrnlen to get the size. This means we get subtle errors because other methods do have them. For example: QByteArray ba("abc\0def", 7); // ba embedding a NUL QString s1(ba); QString s2 = QString::fromAscii(ba); s1 == s2; // FAILS QString s3; s3.append(ba); s3 == s2; // FAILS Tested in an upcoming commit. Change-Id: I22864521a42da789d522d7b75790696928d9ec32 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* | Define P in stringbuilder.cpp, just to help in editing in the editorThiago Macieira2012-05-031-0/+5
| | | | | | | | | | | | | | Otherwise it keeps thinking that we have an error. Change-Id: I8175e34dc6421884b89de9165193e32b6cdf1b62 Reviewed-by: hjk <qthjk@ovi.com>
* | QFtp - implement fast abort for downloadsShane Kearns2012-05-031-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most FTP servers do not support the ABOR command (they don't process control channel traffic until the data channel is finished). Or they require the telnet IP & sync procedure on the control channel (this requires sending TCP urgent data, which we do not support). Following behaviour of most browsers and GUI FTP clients, abort downloads by resetting the data channel. Abort of uploads needs no change, because the client closes the data channel rather than the server. Task-number: QTBUG-25494 Change-Id: I69e7b7c04d709d26def9a4a7081074e1cbf69701 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* | QNetworkAccessManager - ensure abort reaches QFtpShane Kearns2012-05-031-0/+3
| | | | | | | | | | | | | | | | | | Previously, we just disconnected signals from QFtp and allowed it to continue downloading in the background. Task-number: QTBUG-25494 Change-Id: I891c2fff88ef1ee554d1ccf821a3f7998eeb8406 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* | tst_qdnslookup: disabled broken testdataRohan McGovern2012-05-031-0/+4
| | | | | | | | | | | | | | | | The mentioned records for råkat.se cannot be resolved. Note these were marked with a FIXME in the first place. Change-Id: I4ea3bbb0aec8ca1b3487c44656b48a8715228886 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 996672933a61016fdc0ec6d42d536986c5080ac5 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Change-Id: I2d03548fdc492c5e4c4744b636b29df2cefe2acd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Pass configured timeout to callWithCallback too.David Faure2012-05-021-1/+2
| | | | | | | | | | | | | | This was missing in ccf3b9e48b2d773999a9a88e249f79380618cde6. Change-Id: I8bc8239591b893aad361b372a36ed5b9478aff24 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6David Faure2012-05-022-6/+12
| | | | | | | | | | | | | | | | | | I wrote nonsense in that commit. The older methods that take a timeout all take milliseconds, and the comments in the unit test really meant milliseconds, not seconds. 1s is not shorter than 100ms.... Change-Id: Ic18899bb0462d89575dc5a9a311478adc4dea1cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Update QXbWindow orientation APILauro Neto2012-05-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | After orientation handling was split in window orientation and content orientation QXcbWindow remained with the old api. This patch renames setOrientation to handleContentOrientationChange, fixing the issue of double status bar (portrait and landscape) when running Qt5 apps with QtComponents on N9 in portrait mode. (thanks to Simon for pointing out the difference between changing the window and the content orientations) Change-Id: I20d0be0c7f7e4593ac1e3c2ac2518144fc7fed0e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* | Stub out QDnsLookup on Android.Robin Burchell2012-05-022-0/+60
| | | | | | | | | | | | | | | | Android's resolv.h is completely crippled, so we can't use the libc resolver. Change-Id: I07e310e3561c719f4fe0bf08e58b5194f5a76e4a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Android's resolv.h is busted, so stub out QHostInfo::localDomainName().Robin Burchell2012-05-021-1/+1
| | | | | | | | | | | | Change-Id: Idcf5ca7298eed55121b690906885af0eb3fe0b9e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Disable code using if_nameindex on Android.Robin Burchell2012-05-021-0/+5
| | | | | | | | | | | | | | Android doesn't support if_nameindex. Change-Id: Idb0cbf52e6cffb19fe65e30430ef53626e0eeac7 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | Work around Android not having SYS_futex.Robin Burchell2012-05-021-2/+5
| | | | | | | | | | | | | | | | Even though we really shouldn't, we can get away with using __NR_futex instead. Done-with: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I0ba449b740acf2c78825f8093d1515a74f0bc9cd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add implementation of virtual keyboard based on BPS eventsKevin Krammer2012-05-028-53/+353
| | | | | | | | | | | | | | Change-Id: Ida4fa344c54db32b7b22b08a124b8c7b6df8adef Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Windows: Fix a crash in Vista style.Friedemann Kleint2012-05-021-1/+2
| | | | | | | | | | | | | | | | | | Do not query the paintDevice of a backing store that has not received a resize yet. Change-Id: I49bf8f7e85c092c5664e5bc507802bd2cd8b62ea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Remove unused Mac OS X code from QtWidgetsBradley T. Hughes2012-05-025-2171/+0
| | | | | | | | | | | | | | | | | | qcolordialog_mac.mm, qfiledialog_mac.mm, qfontdialog_mac.mm, and qnspanelproxy_mac.mm are unused, remove them. The functionality they used to provide is already included in the Cocoa platform plugin. Change-Id: I2815d119687fd8d8dd421da36563afbd645ee000 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* | Avoid macro re-definition warning for QT_NO_EXCEPTIONSStephen Kelly2012-05-021-1/+3
| | | | | | | | | | Change-Id: I0c4b2d00dd567af17f22b733b93032ff1056fcbd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Avoid undefined macro warning for __GXX_EXPERIMENTAL_CXX0X__.Stephen Kelly2012-05-021-1/+1
| | | | | | | | | | | | | | The GCC use of this is already correct. Change-Id: I28650196c7a325b552117fe2f2014ad7d6b365c2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QDoc: Remove all occurences of 'qdoc3' in source.Casper van Donderen2012-05-022-8/+8
| | | | | | | | | | Change-Id: I7d4e3238a9233d6aab32cc7a3c5a883e718113d5 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* | Add "make docs" target for QtNetwork and sanitize other qdocconfs.Casper van Donderen2012-05-026-60/+156
| | | | | | | | | | Change-Id: Ic9d6384b20162debeb69cb067c96c330c0fd999a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* | fix documentation for QKeySequence::StandardKey "What's This"stockton2012-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | add apostrophe and double-quotes. Task-number: QTBUG-25545 Change-Id: Ib79953731953166ff7d8b999fee6571e62d86d01 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* | Enable QML debugging of qtquick1 with CONFIG+=quick1Kai Koehne2012-05-022-1/+2
| | | | | | | | | | | | | | | | Make the option name align with the name of the module. Change-Id: I29a822b55b3cb52a51592aa2bd0746a53bfe44b9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* | Support mkspecs in subdirs for xcompile under windowsAndreas Holzammer2012-05-021-3/+11
| | | | | | | | | | | | | | | | | | Support mkspecs in subdirectories for cross compilation under windows. Mkspecs in subdirectories are separated by slashes. Change-Id: Id3954cc38df2922b20156589335faad989ec0537 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | mkdtemp() is not included in Android's libcRobin Burchell2012-05-021-2/+2
| | | | | | | | | | | | | | | | Use our own implementation instead. Change-Id: Ic04dd480d52404e03e26cdf4caa1d00e4c3219c7 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: David Faure <faure@kde.org>
* | Allow creation of QOpenGLShaderProgram without a current contextSean Harmer2012-05-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change prevents the qWarning() in QOpenGLFunctions from being triggered when creating a QOpenGLShaderProgram object without a current QOpenGLContext. This is a common case especially when the shader program is a member variable of a class. It now relies upon the QOpenGLShaderProgram::init() function to resolve the GL function pointers when the shader program is first used which of course should be done with an active context. Change-Id: Ib7dc345593f2a70d72ef8f650151cc90001058ca Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Initialize QOpenGLFunctions before using it in QOpenGLShaderProgramSean Harmer2012-05-021-0/+1
| | | | | | | | | | Change-Id: I472e97092b05f1721b7df5759d674c213d6018c6 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Fix compilation of public headers with QT_NO_DEPRECATED definedOlivier Goffart2012-05-0212-44/+51
| | | | | | | | | | | | | | | | | | | | Put the functions in QT_DEPRECATED_SINCE if possible QPluginLoader::staticInstances is not documented as deprecated, and do not reference any alternative use. So I unmarked it as deprecated. Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* | Introduce QObject::isSignalConnected(QMetaMethod)Olivier Goffart2012-05-024-3/+96
| | | | | | | | | | | | | | | | | | This is much more performant than calling QObject::receivers(const char*) Can be used instead of connectNotify in some cases. Change-Id: I19e0933f678f171f515d9a0f69f0ad4fb7d894b4 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* | Don't use obsolete qVariantValue, qVariantCanConvert, etc.Debao Zhang2012-05-0246-589/+589
| | | | | | | | | | | | | | | | | | | | qVariantValue and qVariantCanConvert are Compatibility members, while in Qt4.8 they are marked as Qt 3 Support Members. qVariantFromValue and qVariantSetValue are Obsolete members. Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Make eglfs hooks functionality namespace cognisantDonald Carr2012-05-025-0/+17
| | | | | | | | | | Change-Id: Ie9f86bd0494c0423f50d0f405922ab169b2431e3 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* | Fixed windows platform plugin with -qtnamespace.Rohan McGovern2012-05-022-0/+8
| | | | | | | | | | | | | | Added missing QT_BEGIN_NAMESPACE/QT_END_NAMESPACE Change-Id: I2ffc5ec18d19027c01c81ba9c29f6d7cac5e9619 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* | Fixed QtGui and QtPrintSupport with -qtnamespace and MSVCRohan McGovern2012-05-022-3/+3
| | | | | | | | | | | | | | | | With this compiler, external functions declared inside other functions will end up in the wrong namespace. Change-Id: Ia37283d632dbc2ee0c269aeffa1f045b3e60148e Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:49:25 +0000