summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qmake/MinGw: Link statically for Qt Creator to be able to detect it.Friedemann Kleint2010-03-042-2/+2
| | | | | | | | | Qt Creator detects Qt versions by running qmake. This fails if no MinGw setup is in the path as is usually the case when starting it from the menu. Make it possible to run qmake without setup. Strip executable. Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com> Reviewed-by: mariusSO <qt-info@nokia.com>
* Enable two fast path for blend_tiled_rgb565Benjamin Poulain2010-03-041-1/+1
| | | | | | | | Blending ARGB8565 and RGB16 on top of RGB16 is common on system with 16 bits color depth. The faster blending functions can be used instead of blend_tiled_generic. Reviewed-by: Tom Cooksey
* Avoid QString reallocation for smallcaps fonts in Itemizer::generate()Andreas Kling2010-03-041-1/+1
| | | | Reviewed-by: Simon Hausmann
* Make QLabel::text a reloadable propertyJarek Kobus2010-03-043-2/+15
| | | | | | | | | | | | | In this way we can correctly load / reload a label in case it contains a rich text with a reference to the image taken from resources. Since QLabel::setText() ignores the call in case we try to set the same text, we force the reload by setting the empty string in between. For performance reasons we do it only in cases when the text value contains :/ (only in this case it might have a reference to the resources). Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-8347
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0480-368/+1159
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (53 commits) remove non wifi interfaces from being handled. Disable auto-uppercasing and predictive text for password line edits. Avoid QString reallocation in QTextEngine::itemize() Remove the Qt 4.7 #if guards that were needed for 4.6 Always redraw the complete control when an input event comes in. Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5) Fix compilation: include QString in order to use QString. Fix compile Block the Maemo5 window attribute values from being assigned to something else on other platforms. be more verbose when warning about incompatible libraries Introduce a setAttribute_internal helper Do not reset state too early on RMB click Fix for QRadioButtons and QCheckBoxes drawn incorrectly when a style sheet is set. Speed up creation of the pixmap cache key Optimize QGtkStyle fix qmake -project mode test qlist some more fix include Don't print a warning when passing an empty string to QColor Stabilize QWidget ...
| * remove non wifi interfaces from being handled.Lorn Potter2010-03-041-22/+1
| | | | | | | | | | handled by generic engine. also fix release crash
| * Disable auto-uppercasing and predictive text for password line edits.Robert Griebl2010-03-031-0/+5
| | | | | | | | Reviewed-by: axis
| * Avoid QString reallocation in QTextEngine::itemize()Andreas Kling2010-03-031-3/+1
| | | | | | | | | | | | | | Calling QString::utf16() will cause reallocation (for null-termination) if the string was created via fromRawData(). Reviewed-by: Benjamin Poulain
| * Remove the Qt 4.7 #if guards that were needed for 4.6Robert Griebl2010-03-032-9/+0
| | | | | | | | Reviewed-by: TrustMe
| * Always redraw the complete control when an input event comes in.Robert Griebl2010-03-032-4/+4
| | | | | | | | | | | | | | | | | | The problem here is that a pre-edit string won't be detected by updateDisplayText(), so the control thinks nothing has changed when a new pre-edit string is set. Reviewed-By: Simon Hausmann (cherry picked from commit 16f30906f6eea3e00351478555f153697a6e186d)
| * Make sure not to crash if createStandardContextMenu() returns 0 (e.g. on Maemo5)Robert Griebl2010-03-031-3/+4
| | | | | | | | Reviewed-by: Harald Fernengel
| * Fix compilation: include QString in order to use QString.Thiago Macieira2010-03-031-0/+4
| | | | | | | | It doesn't happen on my system, but the CI system complains, so I guess it's a namespace issue.
| * Fix compileJens Bache-Wiig2010-03-031-0/+1
| |
| * Block the Maemo5 window attribute values from being assigned to something ↵Robert Griebl2010-03-031-0/+8
| | | | | | | | | | | | else on other platforms. Reviewed-By: Harald Fernengel
| * be more verbose when warning about incompatible librariesHarald Fernengel2010-03-031-1/+2
| |
| * Introduce a setAttribute_internal helperHarald Fernengel2010-03-031-21/+29
| | | | | | | | | | | | | | | | This allows to switch certain attributes on or off without copy/pasting lots of code. Used to switch off mutually exclusive attributes, e.g. the Mac*Size attributes, or Maemo's portrait/landscape attributes. Reviewed-by: Robert Griebl
| * Do not reset state too early on RMB clickHarald Fernengel2010-03-031-1/+4
| | | | | | | | | | | | | | | | When long-tapping on a spin box, a context menu event would stop incrementing the spin box since we called reset() too early. Call reset only if it's clear that there's a context menu. Also don't crash if menu is 0. Reviewed-by: Robert Griebl
| * Fix for QRadioButtons and QCheckBoxes drawn incorrectly when a style sheet ↵Robert Griebl2010-03-031-4/+11
| | | | | | | | | | | | | | | | | | | | is set. Maemo 5 draws these controls very differently, so we can't rely on QWindowStyle handling CE_RadioButton/CE_CheckBox. Task-number: QTBUG-8356 Reviewed-by: ogoffart
| * Speed up creation of the pixmap cache keyHarald Fernengel2010-03-031-9/+55
| | | | | | | | | | | | As discussed with Jens and Joao Reviewed-by: Robert Griebl
| * Optimize QGtkStyleHarald Fernengel2010-03-034-129/+252
| | | | | | | | | | | | | | Use latin1 literals instead of QString to prevent one malloc/memcpy/free per rendered table cell. Reviewed-By: Robert Griebl
| * fix qmake -project modeOswald Buddenhagen2010-03-031-0/+11
| | | | | | | | | | | | | | the mode is a big hack, and consequently needs hacks to get started as well ... Reviewed-by: mariusSO
| * test qlist some moreOswald Buddenhagen2010-03-031-0/+34
| |
| * fix includeHarald Fernengel2010-03-031-1/+1
| |
| * Don't print a warning when passing an empty string to QColorThorbjørn Lindeijer2010-03-031-2/+2
| | | | | | | | | | | | | | | | Qt 4.6 didn't used to warn about this, and it should be a valid way of setting a color to invalid. QColor::isValidColor has been adapted to still return false when passed an empty string. Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
| * Stabilize QWidgetHarald Fernengel2010-03-031-2/+3
| | | | | | | | | | | | Fix for some corner cases observed on Maemo 5 Reviewed-by: Robert Griebl
| * Fix focus behavior bug on Mac OS X.Fabien Freling2010-03-031-1/+4
| | | | | | | | With the Full Access Keyboard enabled, the focus could sometimes be stolen by the window.
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-0327-109/+324
| |\
| | * don't have every generator duplicate the QMAKE_QMAKE logicOswald Buddenhagen2010-03-0310-25/+12
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * make the fallback value of QMAKE_QMAKE absoluteOswald Buddenhagen2010-03-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | inspired by the pbx generator. currently this has no effect, as all generators build their own fallbacks anyway. Reviewed-by: mariusSO
| | * Application menu is not translated in Mac OS X CocoaPrasanth Ullattil2010-03-036-9/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The application menu is loaded from the qt_menu.nib which only has English strings. These will now be translated using Qt's own translation mechanism. Every time a new translator is installed, the menu will now try to get the new string. Modification of qt_xx.ts files are done in a different patch. Task-number: QTBUG-4463 Reviewed-by: MortenS
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0348-113/+631
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits) Mac: Select Carbon when using the 10.4u SDK. fix connecting to an ID. make the value of QMAKE_QMAKE somewhat less magic Assistant: Don't warn for non-existing English to English translations. Assistant: Un-watch files at shutdown. Help system: Build search index with low priority. Fixed a regression in the syntax highlighter Add a template specialisation for QArgument when T is a reference. Always run syncqt if using a Git checkout. Added comment about usage of strncpy_s function in VC++ > 14.00 Compile. OS X 10.4 compile error; required casting int to GLint. QtDeclarative: Fix compiler warnings Implement alien widgets on Mac/Cocoa. QDeclarativeView: Add a Designer plugin. QDeclarativeView: Make usable in Designer minor optimization: don't mark contents as dirty if nothing was changed minor optimization: ignore invalid preeditAreaPosition/preeditAreaText remove unused code minor clean-ups and styling fixes ...
| | | * Mac: Select Carbon when using the 10.4u SDK.Morten Johan Sørvig2010-03-031-0/+9
| | | |
| * | | qdoc3: Trying to find a bug that causes a crash.Martin Smith2010-03-032-8/+7
| | |/ | |/| | | | | | | | | | | | | | | | | | | It doesn't crash on OS X, but it does on some other platforms. If you run into this crash running qdoc3, you can work around it by commenting out line 1539 in tools/qdoc3/htmlgenerator.cpp The line to comment out is: generateQmlInheritedBy(qml_cn, marker);
| * | fix connecting to an ID.Lorn Potter2010-03-031-1/+1
| | |
| * | make the value of QMAKE_QMAKE somewhat less magicOswald Buddenhagen2010-03-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | the generators change the value of QMAKE_QMAKE, so it is unwise to "redirect" it to a hidden builtin which is reset each time. in particular, this fixes qmake generating makefiles without an absolute path to qmake itself - the initial quoting of the filename will make the variable "real", so contains() will start working for it.
| * | Assistant: Don't warn for non-existing English to English translations.ck2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | They usually don't exist, so we'd just be adding noise otherwise. Reviewed-by: kh1
| * | Assistant: Un-watch files at shutdown.ck2010-03-021-0/+7
| | | | | | | | | | | | | | | | | | | | | Not strictly needed, but it seems nicer to have a removePath() for every addPath(). Reviewed-by: kh1
| * | Help system: Build search index with low priority.ck2010-03-022-2/+2
| | | | | | | | | | | | Reviewed-by: kh1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0242-108/+611
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits) Fixed a regression in the syntax highlighter Add a template specialisation for QArgument when T is a reference. Always run syncqt if using a Git checkout. Added comment about usage of strncpy_s function in VC++ > 14.00 Compile. OS X 10.4 compile error; required casting int to GLint. QtDeclarative: Fix compiler warnings Implement alien widgets on Mac/Cocoa. QDeclarativeView: Add a Designer plugin. QDeclarativeView: Make usable in Designer minor optimization: don't mark contents as dirty if nothing was changed minor optimization: ignore invalid preeditAreaPosition/preeditAreaText remove unused code minor clean-ups and styling fixes don't even try to rehighlight invalid or alien block don't cancel the scheduled complete rehighlight from rehighlightBlock() replace temporary disconnection with a very simple statemachine compile Extended gesture autotest. Fix compilation with namespace. ...
| | * | Fixed a regression in the syntax highlighterThorbjørn Lindeijer2010-03-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by merging an old version of merge request 481. This patch updates it to the latest version. Merge-request: 481 Reviewed-by: Ritt Konstantin <ritt.ks@gmail.com>
| | * | Merge remote branch 'staging/master' into 4.7Thiago Macieira2010-03-021-0/+2
| | |\ \
| | | * | Fix compilation with namespace.ck2010-03-012-3/+4
| | | | |
| | * | | Add a template specialisation for QArgument when T is a reference.Thiago Macieira2010-03-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't form references to references, so this is the proper solution. Though apparently GCC figures out somehow to work without it... Task-number: QTBUG-8592 Reviewed-By: Olivier Goffart
| | * | | Always run syncqt if using a Git checkout.Thiago Macieira2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | | Added comment about usage of strncpy_s function in VC++ > 14.00Zeno Albisser2010-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | | Compile.Morten Johan Sørvig2010-03-021-0/+1
| | | | |
| | * | | Merge remote branch 'berlin/4.7' into 4.7Oswald Buddenhagen2010-03-0216-25/+57
| | |\ \ \
| | | * | | compileHarald Fernengel2010-03-011-4/+4
| | | | | |
| | | * | | Introduce optional qdoc_bootstrapped qmake flagHarald Fernengel2010-03-0115-21/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows building documentation even when cross-compiling. Note that for official documentation, you should always use your host's qdoc3 binary. This qmake option is for testing whether you introduced new qdoc warnings even if you don't have a native build around.
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-0221-78/+531
| | |\ \ \ \
generated by cgit v0.12 at 2024-09-24 18:28:38 (GMT)