summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Bradley T. Hughes2009-11-1329-161/+339
|\ \ \ \ \
| * | | | | doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
| * | | | | Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-1328-155/+331
| |\ \ \ \ \
| | * | | | | tst_qnetworkreply: Test LastModified parsingMarkus Goetz2009-11-111-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Someone complained about it giving wrong values, however this test passes at least here on my Linux box. Reviewed-by: Peter Hartmann
| | * | | | | QNAM: Parse RFC1123 directly and don't go through QLocaleHolger Hans Peter Freyther2009-11-111-8/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDateTimeParser forces at least two QString allocations to convert the Month string into a integer. This makes parsing the date string the most expesnsive operation from within replyHeaderChanged. Use sscanf to parse the RFC1123 header to get a significant speedup. Use a switch case statement to convert the month name to a integer. Reviewed-By: Markus Goetz
| | * | | | | QNAM: Remove some more occurences of toLower on the hot pathHolger Hans Peter Freyther2009-11-113-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toLower will force a memory allocation, and memory allocations are certainly adding a delay. Use qstricmp were this is easily possible. This change makes headerValues et all drop out of the profile. QChar::toLower will now be called more often, specially for loops that do linear searching. In the profile with real web content this is faster than using QByteArry::toLower in the inner loop and the forced memory allocations. Reviewed-By: Markus Goetz
| | * | | | | QNAM: Avoid using toLower for case insensitive comparisionHolger Hans Peter Freyther2009-11-111-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using qstricmp is faster on the desktop than the alloc of QByteArray::toLower and the QByteArray::operator==. QChar::toLower will now be called for the input key from within the loop. In the measurements done this is still a performance improvement over the allocation done by QByteArray::toLower. For more header values this might not be the case anymore. RESULT : tst_Loading::byteArrayTestLower(): 0.00076 msec per iteration (total: 25, iterations: 32768) RESULT : tst_Loading::byteArrayTestCompare(): 0.00028 msec per iteration (total: 37, iterations: 131072) Reviewed-By: Markus Goetz
| | * | | | | utils/qlalr generator: adapt changes to xmlstream and script filesPeter Hartmann2009-11-1111-108/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some changes were made to qxmlstream_p.h and script files directly; however, those files are generated automatically by src/corelib/xml/make-parser.sh and src/script/parser/make-parser.sh, respectively, so the generator would overwrite the manual changes to the files the next time it is run. This patch integrates those changes into the generator rather than into the files directly. Reviewed-by: Roberto Raggi Reviewed-by: Olivier Goffart
| | * | | | | stabilize QNetworkReply autotestPeter Hartmann2009-11-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ioPostToHttpFromSocket was failing from time to time Reviewed-by: Markus Goetz
| | * | | | | QNAM HTTP Code: Start accept-language header with capital letterMarkus Goetz2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP header names are case insensitive, but stick to what all browsers etc. use to work around buggy servers. Reviewed-by: TrustMe
| | * | | | | Merge branch '4.6' into core-4.6Thiago Macieira2009-11-091383-45740/+41718
| | |\ \ \ \ \
| | * | | | | | Let QDBusInterface work even if the introspection failed.Thiago Macieira2009-11-092-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the introspection failed, we won't have a meta object, meaning you cannot connect to signals or invoke methods via the slot mechanism. But you can still make calls. The isValid() functionality is preserved because there is no owner for this object. Reviewed-By: Harald Fernengel
| | * | | | | | network examples: unify the fortune server/client examplesPeter Hartmann2009-11-094-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always use the first non-localhost IP address to listen/connect to, if there is one. Reviewed-by: Markus Goetz
| | * | | | | | QNAM HTTP Code: Also send our locale name as accept-languageMarkus Goetz2009-11-091-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by merge request 2012 by Joel Nordell Reviewed-by: Peter Hartmann
| | * | | | | | Fix annotations added for complex types in signals.Thiago Macieira2009-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signals are badly mishandled in QtDBus. In the spec, they are "in" arguments, but we generate "Out" annotations for them. What's worse, we were using the wrong count. QTBUG-914 is about fixing the directionality. While that task isn't fixed, at least use the right count. Task-number: QTBUG-5563 Reviewed-by: TrustMe
| | * | | | | | Fix enabling of level 2 debugging in QtDBusThiago Macieira2009-11-081-1/+2
| | | | | | | |
| | * | | | | | Autotest: prevent race-condition from causing a test failure.Thiago Macieira2009-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test requires receiving the NameOwnerChanged signal from the bus before the voidSignal we emit ourselves. For whatever reason, the bus apparently delays the emission of that signal, which could cause our signal to be received first. We should actually wait for the signal, but a simple processEvents is enough in my tests.
| | * | | | | | QNAM: Do not emit uploadProgress() when reply was abortedMarkus Goetz2009-11-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | | | | | tst_networkselftest: Also check for SSL supportMarkus Goetz2009-11-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want all our auto test machines to have OpenSSL. Reviewed-by: Peter Hartmann
* | | | | | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-130-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge commit 'c785d92153d23b836451b0643424b9871bcc4be9' into 4.6-upstreamBradley T. Hughes2009-11-132-0/+41
| |\ \ \ \ \ \
* | | | | | | | doc: Removed duplicate qdoc.Martin Smith2009-11-131-10/+1
| | | | | | | |
* | | | | | | | doc: Fixed typo.Martin Smith2009-11-131-4/+0
| | | | | | | |
* | | | | | | | Compile securesocketclient example also with openssl-linkedMarkus Goetz2009-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5742 Reviewed-by: andreas
* | | | | | | | doc: Changed numColors() to colorCount() in the doc.Martin Smith2009-11-131-5/+18
| | | | | | | |
* | | | | | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1332-37/+44
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix typo in license headerAlessandro Portale2009-11-1227-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word 'module' was missing. Reviewed-By: TrustMe
| * | | | | | | Merge commit 'origin/4.6' into 4.6-ceJoerg Bornemann2009-11-12170-21338/+22776
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed searching and copy/paste from PDF documents.axis2009-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously copy and paste from PDFs made by Qt would paste garbage into the target document, and searching was not possible. The bug happened because the internal buffer would open its data stream in truncate mode rather than append mode, thereby losing content, and producing a slightly corrupted PDF. Task: QTBUG-4912 Task: QTBUG-3661 RevBy: Trond Kjernåsen
| * | | | | | | | fix tst_QVideoSurfaceFormat for the qreal == float caseJoerg Bornemann2009-11-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| * | | | | | | | fademessage example: don't use a fixed width for the rect under the textJoerg Bornemann2009-11-111-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its using QFontMetrics::width now. Reviewed-by: thartman
| * | | | | | | | fademessage example: deploy jpeg plugin on Windows CEJoerg Bornemann2009-11-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: thartman
| * | | | | | | | fix crash in QWidgetPrivate::screenGeometryJoerg Bornemann2009-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing null check added. Not really a Windows CE only crash. The following code crashed on all platforms, because the QGraphicsProxyWidget had no scene yet. QPushButton *button = new QPushButton; QGraphicsProxyWidget *buttonProxy = new QGraphicsProxyWidget; buttonProxy->setWidget(button); qApp->desktop()->screenGeometry(button); Task-number: QTBUG-5626 Reviewed-by: Alessandro Portale
* | | | | | | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1227-46/+732
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-1227-46/+732
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/corelib/tools/qscopedpointer_p.h src/gui/widgets/qlcdnumber.cpp
| | * | | | | | | Changes file updatedaavit2009-11-111-0/+2
| | | | | | | | |
| | * | | | | | | doc: Fixed some qdoc errors, numXxx() to xxxCount(), etc.Martin Smith2009-11-111-1/+8
| | | | | | | | |
| | * | | | | | | Update the translations of Qt AssistantBenjamin Poulain2009-11-111-221/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the new translations for the string added by 500e71ab649a5053667ff3f9dc7d87730b565756 Update some translations
| | * | | | | | | Fixing warnings in QScopedPointer test caseJoão Abecasis2009-11-111-1/+2
| | | | | | | | |
| | * | | | | | | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
| | * | | | | | | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Method Documentation and Signal Documentation sections.
| | * | | | | | | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
| | * | | | | | | Def files frozen for 4.6.0 RCShane Kearns2009-11-1120-361/+21660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * | | | | | | Switch on DEF filesShane Kearns2009-11-111-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEF files containing the frozen DLL exports are in use for Symbian OS builds, except developer builds (configured with -developer-build) The reason for this exception is that developer builds export additional private interfaces to allow autotests to inject or monitor the internal data of a class. These autotest exports are not part of the API or the binary interface, so they are excluded from DEF files. Task-number: QTBUG-4436 Reviewed-by: Jason Barron
| | * | | | | | | Rewind def files to betaShane Kearns2009-11-1119-20979/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Espen Riskedal Task-Number: QTBUG-4748
| | * | | | | | | Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-111-2/+2
| | | | | | | | |
| | * | | | | | | Validate the translation of Qt_help by PierreBenjamin Poulain2009-11-111-67/+67
| | | | | | | | |
| | * | | | | | | Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes
| | * | | | | | | Autotest: fix compiling after qscopedpointer.h changed.Thiago Macieira2009-11-111-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCustomScopedPointer was moved to a private header since it's only a helper class. QScopedSharedPointer wasn't necessary since it can be replaced with QSharedDataPointer neatly. Reviewed-by: Jesper Thomschütz
| | * | | | | | | Fixed QGraphicsEffectSource autotest after graphics effect API changes.Samuel Rødal2009-11-111-30/+20
| | | | | | | | |
generated by cgit v0.12 at 2025-09-12 11:12:17 (GMT)