summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* clarify wording of warning messageOswald Buddenhagen2010-05-201-1/+1
| | | | Reviewed-by: joerg
* close scope while inside assignment only if the last char is a closing braceOswald Buddenhagen2010-05-201-1/+1
| | | | | | the code assumed it anyway and would make a mess if it was wrong Reviewed-by: joerg
* deprecate undocumented -E optionOswald Buddenhagen2010-05-201-0/+1
| | | | Reviewed-by: joerg
* use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
| | | | Reviewed-by: joerg
* unify QMAKE_QMAKE path separator fixingOswald Buddenhagen2010-05-202-8/+6
| | | | | | | | | | | the value of the variable in Option is only ever accessed via the project variable, so there is no point in early fixing. as it happens, this fixes mingw+sh generating makefiles with the wrong separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was read back into Option. Reviewed-by: joerg
* simplify arcane conditional, once againOswald Buddenhagen2010-05-201-1/+1
| | | | Reviewed-by: joerg
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-20908-59997/+21750
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-2080-223/+1441
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X QApplication::closeAllWindows() should ignore windows being closed Examples: Fix compilation with namespace. Use QApplication::arguments() to check for command line args Added support for .rc files on VS2010. Doc: Updating CSS and JS Docs: added an intro for qml, Quick for Beginners. Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
| | * Removed a change from the 4.7.0 change log.Kim Motoyoshi Kalland2010-05-201-6/+0
| | | | | | | | | | | | The change belongs in the 4.6.3 change log.
| | * Improve look and feel of itemviews on macJens Bache-Wiig2010-05-201-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These fixes are neccessary and requested by Qt Creator and should go into 4.7.0. The fixes involved is: - positioning of disclosure arrow in treeviews - spacing between icon and text label - added 2 pixel spacing between item view items Note that native cocoa views tend to use 3 pixel spacing. We considered this and decided on leaving it at 2 which is what you see in finder list views, XCode among other places. It also makes the change a bit less radical. Reviewed-by:cduclos Task-number:QTBUG-10190
| | * doc: Fixed many broken links.Martin Smith2010-05-2016-64/+63
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-2017-22/+173
| | |\
| | | * update 4.7.0 changesKent Hansen2010-05-201-2/+0
| | | | | | | | | | | | | | | | | | | | Mistakenly added something that was fixed for 4.6.3 (it's been moved to changes-4.6.3 in a different branch).
| | | * QPushButton's click area exceeds the button area by far on Mac OS XCarlos Manuel Duclos Vergara2010-05-205-16/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is the "rounding" of buttons in OSX. To achieve this we add some padding to the buttons, therefore creating an inner rect for the widget. The common hitButton(...) method found in QAbstractButton just checks the normal rect of the widget. What this patch does is to reimplement hitButton(...) in QPushButton, but only for the Mac case. In this reimplemented method I calculate the inner rect and check if the hit point is inside that rect or not. Task-number: QTBUG-10401 Reviewed-by: Richard Moe Gustavsen
| | | * QApplication::closeAllWindows() should ignore windows being closedBradley T. Hughes2010-05-202-3/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is very common to display a dialog in response to a close event. Closing the window again will result in QWidget::close() returning true. This confuses QApplication::closeAllWindows(), since the window is still visible even though it was closed (or is closing). Solve this by ignoring windows that have the is_closing flag set in their widget data. Task-number: QTBUG-7635 Reviewed-by: Denis Dzyubenko
| | | * Examples: Fix compilation with namespace.ck2010-05-209-1/+22
| | | |
| | * | doc: Fixed many broken links.Martin Smith2010-05-2030-66/+65
| | |/
| | * Use QApplication::arguments() to check for command line argsHarald Fernengel2010-05-205-26/+11
| | | | | | | | | | | | | | | Use the Qt way to look up command line args, remove 5 lines of code per example. Also clean up badly indented code.
| | * Added support for .rc files on VS2010.Martin Petersson2010-05-201-2/+37
| | | | | | | | | | | | Reviewed-by: Thierry
| | * Doc: Updating CSS and JSMorten Engvoldsen2010-05-203-8/+25
| | | | | | | | | | | | Fixed bugs on index page, moved JS from template to script file.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-208-23/+1042
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Docs: added an intro for qml, Quick for Beginners. Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Peter Yard2010-05-202-23/+73
| | | |\
| | | | * Fix crash on exit in native wifi plugin on Vista+ when run in debugger.Aaron McCarthy2010-05-202-23/+73
| | | | | | | | | | | | | | | | | | | | Close the wlanapi handle before main function returns.
| | | * | Docs: added an intro for qml, Quick for Beginners.Peter Yard2010-05-206-0/+969
| | | |/
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2013-13/+64
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs with correct property name Fix incorrect merge Work around rendering bug in Rectangle. Remove warnings. Test e75088323ae15604139ddfd66b85cc3b8d43abeb Add XmlListModel::errorString() Fix dynamicscene example Update old keyword in docs
| | * | Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| | | |
| | * | Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | | | | | | | | | | | | | | Didn't actually notice the name change of that function
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-20210-3892/+4443
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/toys/dynamicscene/qml/itemCreation.js
| | | * | Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10765
| | | * | Remove warnings.Warwick Allison2010-05-202-3/+0
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10816
| | | * | Test e75088323ae15604139ddfd66b85cc3b8d43abebWarwick Allison2010-05-202-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10820
| | | * | Add XmlListModel::errorString()Bea Lam2010-05-203-2/+37
| | | | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| | |\ \ \
| | * | | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all the renaming (presumably) the moon broke, now fixed. Also made it slightly smaller, to be friendlier to desktop systems with small screens (and the fixed size qtdemo)
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19590-58544/+17061
| | |\ \ \ \
| | * | | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) Be consistent in conversion from string (eg. color, int rounding). Simplify code to make next change clearer. Stop warnings. Improve error messages when tests fail. Stop highlight animators for highlightFollowsCurrentItem: false Ensure valuetype enums can be assigned from JS Improve testcase Rename Component::errorsString() -> errorString() (and also for Fixes for docs, example code Make test more stable Autotest (XFAIL) for QTBUG-10822 Add return value for resolveTypeInNamespace Fix test Fix test. Missed files. Missing break Create overview page for examples for Extending QML in C++ Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer ...
| | * | | | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10820 Reviewed-by: Michael Brasser
| | * | | | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| | | | | |
| | * | | | Stop warnings.Warwick Allison2010-05-202-11/+11
| | | | | |
| | * | | | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| | | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| | |\ \ \ \
| | | * | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10803
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeComponent)
| | | * | | | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| | | | | | |
| | * | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10830
| | * | | | | Improve testcaseAaron Kennedy2010-05-202-1/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | As the default was AllUppercase, the tests weren't actually testing anything other than that assigning enums had no errors
| | * | | | Make test more stableAaron Kennedy2010-05-201-2/+3
| | | | | |
| | * | | | Autotest (XFAIL) for QTBUG-10822Aaron Kennedy2010-05-202-0/+22
| | | | | |
generated by cgit v0.12 at 2024-10-26 04:40:43 (GMT)