summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QNAM: Add direct access to the RawHeaderHolger Hans Peter Freyther2009-11-112-0/+9
| | | | | | | | Provide direct access to the header fields. This makes QNetworkReplyHandler::sendResponseIfNedded drop out of the profile on the loading_standalone test case. Reviewed-By: Markus Goetz
* Merge branch '4.6'Thiago Macieira2009-11-101524-47728/+47640
|\ | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * Qt covers BC break in SymbianAlessandro Portale2009-11-101-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround: fntstore.h has an inlined function 'COpenFont* CBitmapFont::OpenFont()' that returns a private data member. The header will change between minor SDK versions, thus break BC. But Qt has to build on any SDK version and run on other versions of Symbian OS. Also Qt does not want to deliver that BC to Qt based apps. This hack performs the needed pointer arithmetic to get the right COpenFont* pointer, no matter if the 'Flexible Memory Model' is already supported or not. The author is not proud of this commit. Task-number: QT-2250 Reviewed-by: Iain Reviewed-by: Shane Kearns modified: src/gui/text/qfontdatabase_s60.cpp
| * Removed unused public Api from QS60StyleAlessandro Portale2009-11-106-85/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style::setStyleProperty() and QS60Style::styleProperty() were intended as generic property setter/getters, but are not needed anymore. Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h modified: src/gui/styles/qs60style_s60.cpp modified: src/gui/styles/qs60style_simulated.cpp modified: src/s60installs/eabi/QtGuiu.def
| * Changelog updateJedrzej Nowacki2009-11-101-1/+40
| | | | | | | | | | | | | | Changelog update contains all major changes in QtWebkit, QtScript and brief information about the state machine framework. Reviewed-by: Simon Hausmann
| * Removed mention of purged graphics effects from the documentation.Samuel Rødal2009-11-101-3/+3
| |
| * Added some changes to changes-4.6.0.Samuel Rødal2009-11-101-0/+13
| |
| * linguist changesOswald Buddenhagen2009-11-101-4/+34
| |
| * french translation of qt_helpPierre Rossi2009-11-103-1/+397
| |
| * Document change of qdoc3 binary location.Daniel Molkentin2009-11-101-1/+6
| | | | | | | | Reviewed-by: TrustMe
| * Doc: remove graphics for effects that are no longer in scope.Volker Hilsheimer2009-11-106-5/+15
| |
| * Add my changes to the 4.6.0 changelogJørgen Lind2009-11-101-0/+4
| |
| * Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-1040-350/+593
| |\ | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| | * Designer: Use toolbar in Signal/Slot editorFriedemann Kleint2009-11-101-9/+10
| | | | | | | | | | | | | | | | | | as in the other tool windows. Reviewed-by: Jarek Kobus <jkobus@trolltech.com> Task-number: QTCREATORBUG-239
| | * Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-099-90/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| | * Code in gui/* should be completely namespacedhjk2009-11-091-4/+5
| | | | | | | | | | | | And not rely on random QT_USE_NAMESPACE being pulled in from *.moc files.
| | * Assistant: Add missing initialization of member variable.ck2009-11-091-0/+1
| | | | | | | | | | | | Reviewed-by: kh1
| | * Fix Assistant losing font settings across invocations.kh12009-11-092-62/+67
| | | | | | | | | | | | | | | Task-number: QTBUG-5333 Reviewed-by: ck
| | * Fix some warnings.kh12009-11-091-3/+2
| | | | | | | | | | | | Reviewed-by: ck
| | * Assistant: Fix bugs related to setting the current filter remotely.ck2009-11-093-10/+14
| | | | | | | | | | | | | | | | | | 1. Filter combo box now gets updated on remote setCurrentFilter. 2. Argument to remote setCurrentFilter now gets checked. If there is no such filter, we reject it.
| | * record id-based messages even if they have an empty sourceOswald Buddenhagen2009-11-068-20/+41
| | | | | | | | | | | | | | | | | | this makes sense if one uses lupdate only for validation purposes, i.e. to find out if the code uses only ids which are defined in some external specification.
| | * handle messages with ids (more) correctlyOswald Buddenhagen2009-11-0613-53/+239
| | | | | | | | | | | | | | | when comparing two messages which both have ids, compare only the ids. this affects finding/reporting duplicates and merging.
| | * kill TranslatorMessage::operator==() and qHash(TranslatorMessage)Oswald Buddenhagen2009-11-065-29/+27
| | | | | | | | | | | | preparation work ...
| | * eliminate TranslatorMessagePtr from the Translator apiOswald Buddenhagen2009-11-066-48/+51
| | |
| | * improve ordered message insertionOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | in a ts file, the top level categorization are the contexts, so it makes no sense to make messages adjoint by file when the context is different. a more clever algorithm which tries to order the entire contexts is conceivable. that would be advantageous for files which use multiple contexts subsequentially if each context appears in only one file.
| | * eliminate Translator::contains()Oswald Buddenhagen2009-11-063-11/+11
| | | | | | | | | | | | replace the one use case with something more efficient
| | * eliminate Translator::replace()Oswald Buddenhagen2009-11-063-17/+3
| | |
| | * use right method to record new messagesOswald Buddenhagen2009-11-061-1/+1
| | | | | | | | | | | | consistent with all other source parsers
| | * do not consider plural source in comparisonsOswald Buddenhagen2009-11-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | two messages with identical singular but different plural sources simply make no sense. this should be quite a bit faster, as it saves lots of QHash<QString,...> lookups.
| | * remove unused TranslatorMessage::operator<()Oswald Buddenhagen2009-11-062-12/+0
| | | | | | | | | | | | it was once needed for QMap, but we don't use that any more
| | * cut code dupe ...Oswald Buddenhagen2009-11-061-12/+5
| | | | | | | | | | | | ... with gotos :)
| | * don't construct a new message for look-up purposes onlyOswald Buddenhagen2009-11-063-13/+5
| | |
| * | My changeJarek Kobus2009-11-101-0/+4
| | |
| * | Improvements to graphics effects API after review round.Samuel Rødal2009-11-1019-217/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen
| * | Some 4.6.0 changes.Trond Kjernåsen2009-11-101-23/+35
| | |
| * | Add my changes to the 4.6.0 changelogLeonardo Sobral Cunha2009-11-101-4/+11
| | |
| * | BT: JavaScriptCore makes applications crash on leopardRichard Moe Gustavsen2009-11-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScriptCore checks the Mac OS version when building, and uses symbols only defined in i e.g.snow leopard when building on snow leopard. This means that if you build Qt on snow leopard and later move it to leopard, applications will crash looking for a missing symbol (pthread_setname_np in particular). In Qt, we garuantee that you can run your applications on 10.4 and up for Carbon, and 10.5 and up for Cocoa. So using compile time checks this way is not a proper soulution. Result: In Qt, never use symbols not defined on all supported OS versions, or at least implement run-time checks. Rev-By: Simon Hausmann Rev-By: Tor Arne Rev-By: MortenS
| * | Doc: fix typo in linkVolker Hilsheimer2009-11-101-1/+1
| | |
| * | Changelog: part 2Thiago Macieira2009-11-101-25/+41
| | |
| * | fix WebKit build on Windows CE 6Joerg Bornemann2009-11-106-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | Again, we have fun with the C time functions on Windows CE. On Windows CE 5: the functions are declared but not defined. On Windows CE 6: the functions are neither declared nor defined. Reviewed-by: Simon Hausmann
| * | Add my changes to the 4.6.0 changelog.Bradley T. Hughes2009-11-101-2/+56
| | |
| * | Added my changes in Qt 4.6.0 to the change log.Kim Motoyoshi Kalland2009-11-101-2/+5
| | |
| * | Added my changelog entries.axis2009-11-101-0/+5
| | |
| * | Add some of my changes to changes-4.6.0Eskil Abrahamsen Blomfeldt2009-11-101-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changes-4.6.0 with relevant changes. Reviewed-by: Trond Conflicts: dist/changes-4.6.0
| * | Added my changes to changes-4.6.0.Kim Motoyoshi Kalland2009-11-101-0/+23
| | |
| * | Changelog: My changes.Thiago Macieira2009-11-101-15/+58
| | | | | | | | | | | | Also reorganise some things I saw wrong.
| * | Updated changelog with my changesBenjamin Poulain2009-11-101-0/+15
| | |
| * | Richards changes into the changelogRichard Moe Gustavsen2009-11-101-0/+17
| | |
| * | Re-apply change e53c26b52c890f242491e0dfed4201313d98f720 by Marius Storm-OlsenMarius Storm-Olsen2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API review: Rename functions numColors(), setNumColors() and numBytes() QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| * | Re-apply change 2a9596d85a6c44fe1eba98447ab95ca913f10e29 by Joerg BornemannJoerg Bornemann2009-11-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 62923e7edacf6a1d28accaff70cbdc0176890d62 by Joerg Bornemann Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg Bornemann WebKit compile fix for Windows CE Not sure if this is right fix. We could also disable PLUGIN_PACKAGE_SIMPLE_HASH. But this is automatically enabled when NETSCAPE_PLUGIN_API is disabled. Reviewed-by: thartman