summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-1338-46/+329
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: tests/auto/declarative/qmlparser/tst_qmlparser.cpp
| * More testsAaron Kennedy2009-05-132-0/+15
| |
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-13273-13288/+2977
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Disable code that triggers a crash at exit.Aaron Kennedy2009-05-121-3/+5
| | | | | | | | | | | | This is a hack. We should fix it properly.
| * | More testsAaron Kennedy2009-05-128-1/+31
| | |
| * | Remove accidentally commited CXX flagsAaron Kennedy2009-05-122-2/+2
| | |
| * | CrashAaron Kennedy2009-05-121-2/+2
| | |
| * | Remove QWidget hackAaron Kennedy2009-05-121-5/+1
| | | | | | | | | | | | We no longer have any QWidget bindings, so we don't need this hack. Will have to solve the problem properly when we reintroduce QWidget support.
| * | More testsAaron Kennedy2009-05-1225-32/+272
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-12270-13271/+2947
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-12259-13224/+2878
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Fix compilation due to an internal change in QObjectAlexis Menard2009-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | This patch fix the compilation after the change 386c640d9c0cc0984f33225b72e6d46e3718dcf7
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Alexis Menard2009-05-12258-13223/+2877
| | |\ \ | | | | | | | | | | | | | | | kinetic-declarativeui
| | | * | The editor geometry in item views is not correctly updated when 1stThierry Bastian2009-05-122-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shown The problem is that it gets the previous geometry of the cell whereas its own sizeHint might lead to change the geometry of the cell. Task-number: 253109 Reviewed-by: ogoffart
| | | * | Fixed dumping so that we dump both q_yy and q_xx instead of q_yy twice.Jan-Arve Sæther2009-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | That code is only executed if the environment varible QT_GRAPHICSLAYOUT_DEBUG is set to1
| | | * | tst_qsslsocket: Added assertions that make test fail if certs not foundMarkus Goetz2009-05-121-0/+2
| | | | |
| | | * | QSsl: Renamed testConnection to startHandshakeMarkus Goetz2009-05-122-7/+7
| | | | |
| | | * | Small documentation fix for QSslSocketMarkus Goetz2009-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kavindra
| | | * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-1236-76/+73
| | | | | | | | | | | | | | | | | | | | We introduce this new enum, we should be using it.
| | | * | Don't overwrite q_yy with q_xx when we are dumping the layout.Jan-Arve Sæther2009-05-121-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Luckilly, that bug was only there if you had QT_GRAPHICSLAYOUT_DEBUG set as an environment variable.
| | | * | Work around a limitation in QFormLayout - 0 width content marginsTrond Kjernaasen2009-05-121-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | aren't really supported. Also set the default focus to be the preview widget itself.
| | | * | Make the QPrintPreviewDialog use a QMainWindow with a proper QToolBar forTrond Kjernaasen2009-05-121-79/+56
| | | | | | | | | | | | | | | | | | | | its buttons.
| | | * | Draw the shadow before the page background to avoid antialiasing overlapsTrond Kjernaasen2009-05-121-22/+22
| | | | | | | | | | | | | | | | | | | | when the paper is drawn.
| | | * | Add the chart utility from qtestlib-tools.Morten Sørvig2009-05-1214-20/+1489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible run the benchmarks with "-chart" to generate charts for benchmarks that produce chartable data. See examples/qtestlib/tutorial5 for an example. This patch has minimal inpact on QTestLib itself. Most of the functionality is implemented in a separate tool which QTestLIb calls after detecting the chart command line option.
| | | * | Add a AA_MacDontSwapCtrlAndMeta application attribute.Norwegian Rock Cat2009-05-117-83/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help undo the some magic that is in the Qt/Mac port. Qt automatically flips the Meta and Control keys on Mac. This is a "feature" that makes porting older programs that don't use standard shortcuts easier as Ctrl and Command usually map to the same shortcuts in the application. The upshot of this is that I need to strip the text() out of key events if they contain the Control or Meta modifier. This causes much headache for anyone writing a terminal emulator. Though they would still have to write special code because the keys are swapped anyway. This allows people to write the terminal emulator where hitting the Control key will really send a Control key modifier. We've also done the extra work to ensure that standard shortcuts work correctly regardless of what the value of the attribute is. That is, if you specify QKeySequence::Cut for a shortcut you can always hit Command+X and things will work.
| | | * | Add QKeySequence::Quit and QKeySequence::Preferences for standard keys.Norwegian Rock Cat2009-05-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are handy to have and make it possible for people to not have to remember the specific sequences on the different platforms, though some don't have any. Reviewed-by: Jens Bache-Wiig
| | | * | Merge branches 'master' and 'master' of git@scm.dev.nokia.troll.no:qt/qtNorwegian Rock Cat2009-05-11174-12989/+984
| | | |\ \
| | | | * | Remove a warning on gcc.Alexis Menard2009-05-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need Q_D if we don't use the d pointer. Reviewed-by:TrustMe
| | | | * | Add a benchmark to measure performance on QGV with caching.Alexis Menard2009-05-113-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add an benchmark to allow testing performance with cache enable or not. It covers different use cases with item rotating, moving and so on. Reviewed-by:bnilsen
| | | | * | Add support for CMYK colors for the native QColorDialog on Mac OS X.Benjamin Poulain2009-05-112-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native color picker on Mac supports CMYK colors but this was not available with QColorDialog because the colors were systematically converted to RGB. The color are now initialized with QColor and the result from the color panel is converted to the right format. Task-number: 253272 Reviewed-by: nrc
| | | | * | compilation fix for LinuxThierry Bastian2009-05-111-1/+1
| | | | | |
| | | | * | compilation fix for LinuxThierry Bastian2009-05-111-2/+2
| | | | | |
| | | | * | Merge branch '4.5'Thiago Macieira2009-05-119-15/+371
| | | | |\ \
| | | | | * | Clarifying docs for QTextTable::splitCell()Morten Engvoldsen2009-05-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarifying details about QTextTable::splitCell() regarding splitting and merging over several rows and columns Task-number:193732 Rev-by: Geir Vattekar
| | | | | * | Update the --help output of qdbusxml2cpp.Thiago Macieira2009-05-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't say we produce output when no options are passed if we don't. Task-number: 222778 Reviewed-by: Trust Me
| | | | | * | Don't crash at runtime with when relaying a signal.Thiago Macieira2009-05-111-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have this function called qDBusInterfaceFromMetaObject that calculates the interface name from a given meta object. There's no need to duplicate the code here (and not do it right). All tests still pss. Task-number: 236955 Reviewed-by: Trust Me
| | | | | * | Document that we don't support NTLM version 2.Thiago Macieira2009-05-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 236925 Reviewed-by: Tor Arne Vestbø
| | | | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Andy Shaw2009-05-1168-12678/+347
| | | | | |\ \
| | | | | | * | Add a test for UTF-8 conditionsThiago Macieira2009-05-112-0/+312
| | | | | | | |
| | | | | | * | Don't leak memory when assigning scriptvalue to iteratorKent Hansen2009-05-112-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The d-pointer was not deleted as it should be. Reviewed-by: Harald Fernengel
| | | | | * | | Fixes a code snippet for QPainter::xFormDev()Andy Shaw2009-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * | | | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-1113-16/+14
| | | | | | | |
| | | | * | | | Compilation for debug buildsOlivier Goffart2009-05-111-12/+11
| | | | | | | |
| | | | * | | | Merge branch '4.5'Thiago Macieira2009-05-1164-12676/+0
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | Clean up old Qt 3 stuff.Thiago Macieira2009-05-1164-12676/+0
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | | * | | Merge branch '4.5'Thiago Macieira2009-05-1181-108/+365
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Make sure syncqt creates the Phonon/Global file.Thiago Macieira2009-05-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The standard Phonon package has this file and it points to phononnamespace.h
| | | | | * | Add a license file for the XML Conformance Testsuite.Thiago Macieira2009-05-111-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The source of the license text is http://www.w3.org/Consortium/Legal/copyright-software-19980720 Reviewed-by: Trust Me
| | | | | * | Only link against opengles .LIB files if on WinCETom Cooksey2009-05-111-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 251685 Reviewed-by: mauricek
| | | | | * | Fixes qt3support unit tests generating compile failures when Qt is notRohan McGovern2009-05-1153-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured with qt3support. The build system knows when qt3support was turned off, so let's just skip these tests in that case. That makes more sense than individually configuring each autotest machine to skip these tests when the configuration is known to turn off qt3support, which is what's done previously. Reviewed-by: Lincoln Ramsay