summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-053-8/+19
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-058-142/+149
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-0563-241/+411
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-05778-9041/+21256
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Position items in the correct orderAlan Alpert2009-11-042-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Nearly fixes QT-2241, but still waiting for a signal to appear in QGraphicsItem which allows up to reposition items after a change.
| * | | | Avoid crashing on faulty call to createQmlObjectAlan Alpert2009-11-031-0/+5
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-054-52/+40
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: tests/auto/declarative/valuetypes/testtypes.cpp
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-052-28/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | qmlsystempalette autotestsYann Bodson2009-11-052-28/+11
| | | | | |
| * | | | | Add test for GridView, and fix bug.Martin Jones2009-11-052-24/+29
| |/ / / /
* | | | | value types autotestAaron Kennedy2009-11-051-10/+10
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-0563-241/+411
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/graphicsitems/qmlgraphicsloader.cpp
| * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Fix signal overriding.Michael Brasser2009-11-051-1/+1
| | | | |
| * | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-0567-466/+212
| |\ \ \ \ | | |/ / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-051-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-053-214/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | into kinetic-declarativeui
| | | * | | more borderimage autotestsYann Bodson2009-11-051-1/+1
| | | | | |
| | * | | | Remove "to" limit on minor version.Warwick Allison2009-11-0556-144/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-053-214/+0
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-045-102/+60
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Remove property-order sensitivity.Warwick Allison2009-11-043-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fixes autotest.
| * | | | | Particles cleaned up and placed in in qmlgraphics/Alan Alpert2009-11-055-90/+258
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API changes: Removed bool streamIn Added int emissionRate Added int emissionVariance Added void burst(count, emissionRate=-1) While rewriting the internals to accomodate this, all other outstanding particles bugs were believed fixed. Task-number: QT-2392 QT-2391 QT-2390 QT-2406
* | | | | Fix flicking endpoint adjustment with variable height items.Martin Jones2009-11-052-48/+56
| | | | |
* | | | | Loader cleanup and testing.Martin Jones2009-11-053-42/+53
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-045-102/+60
|\ \ \ \ | | |/ / | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Missing file for 48ea5a5c74620f9811debc6bf1e49bf095d30722Aaron Kennedy2009-11-041-3/+3
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-04767-8717/+21165
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | testsAaron Kennedy2009-11-043-85/+38
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-11-047-8/+64
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Improve qmllanguage test caseAaron Kennedy2009-11-041-14/+19
| | | | |
* | | | | Remove IntegerModel. model properties accept an integer.Martin Jones2009-11-043-214/+0
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Yann Bodson2009-11-04749-8660/+21076
|\ \ \ \ | | | | | | | | | | | | | | | into kinetic-declarativeui
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-04762-8693/+21124
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-041-0/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Remove support for removed effects.Warwick Allison2009-11-041-97/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See d576d770b9b8251f1b5b4808a84045af33e62dba
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-0414-43/+65
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-04746-8553/+21056
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
| | | * | | | | Implement internal support for property interceptors (used by declarative).Michael Brasser2009-11-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen Reviewed-by: Aaron Kennedy
| | | * | | | | QGtkStyle refactoringRobert Griebl2009-11-0313-1350/+1455
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| | | * | | | | Re-apply change fa1856bcb2eff41dadf0900202dd43f44ddb2343 by Joerg BornemannJoerg Bornemann2009-11-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | Re-apply change 71913d435213188959441a89454de6308fd76484 by Jocelyn TurcotteJocelyn Turcotte2009-11-031-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete the tst_QWebFrame::setHtmlWithBaseURL test until its fixed upstream. Reviewed-by: TrustMe
| | | * | | | | Re-apply change 6bc9ef388590b4bfb281d2e1510dc7c3d1837349 by Shane KearnsShane Kearns2009-11-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix to 8e0fbc2caa3edefb78d6667721235b783bc1a850 This version of the fix will set the def file only if defblock is enabled in qbase.pri. That means that def files don't get turned on for webkit but not for the whole project (avoids build failures in the continuous integration system when other teams change the exported symbols) Reviewed-by: Jason Barron
| | | * | | | | Re-apply change 6f36d0aafaccbb9affe8ac1b82c225d985aa7491 by David BoddieDavid Boddie2009-11-031-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Added internal or hidden placeholder documentation. Reviewed-by: Trust Me To-be-completed-by: QtWebKit developers
| | | * | | | | Re-apply change e2ef97128c006ac2a5c99c67bb54eebaa3b45720 by Thiago MacieiraThiago Macieira2009-11-031-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement symbol hiding for JSC's JIT functions. These functions are implemented directly in assembly, so they need the proper directives to enable/disable visibility. On ELF systems, it's .hidden, whereas on Mach-O systems (Mac) it's .private_extern. On Windows, it's not necessary since you have to explicitly export. I also implemented the AIX idiom, though it's unlikely anyone will implement AIX/POWER JIT. That leaves only HP-UX on PA-RISC unimplemented, from the platforms that Qt supports. It's also unlikely that we'll imlpement JIT for it. Reviewed-by: Kent Hansen (this commit was 26d0990c66068bfc92a2ec77512b26d4a0c11b02, but was lost during a WebKit update)
| | | * | | | | Re-apply change 3f7a99565de7ed17d7ac4c0a25b02997b094b1a9 by Thiago MacieiraThiago Macieira2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linking of WebKit on Linux 32-bit. It was missing the ".text" directive at the top of the file, indicating that code would follow. Without it, the assembler created "NOTYPE" symbols, which would result in linker errors.
| | | * | | | | Re-apply change 0e917ae9587aa0727e6b26ba3eb0157362748fb7 by Jocelyn TurcotteJocelyn Turcotte2009-11-032-107/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct line ending chars imported from webkit. Reviewed-by: TrustMe
| | | * | | | | Re-apply change 37dc859e7e2e0f135e4c40bc7f6f824fcdb21e86 by David BoddieDavid Boddie2009-11-032-7/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Fixed and synchronized QWebView related documentation. Reviewed-by: Trust Me
| | | * | | | | Re-apply change 4ce556b952545494a8adb96f628c219a38406562 by Oswald BuddenhagenOswald Buddenhagen2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix line ending
| | | * | | | | Re-apply change cef1901dbd96be81fc4139b50b094dfae5223e6f by Martin SmithMartin Smith2009-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin Smith doc: Changed Trolltech to Nokia
generated by cgit v0.12 at 2024-10-21 11:32:09 (GMT)