summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove more unneeded semicolons.Martin Jones2009-05-2612-23/+23
|
* Added no_ast_rewriter to rewriter.pri.Roberto Raggi2009-05-261-2/+7
|
* Don't check the QT_MODULE in the text rewriter, there's no need since it's ↵Roberto Raggi2009-05-262-79/+75
| | | | private code.
* Add qmldebugger sub dir to the pro file.Bjørn Erik Nilsen2009-05-261-1/+1
|
* Made the suffix for CSS literals case insensitve.Roberto Raggi2009-05-261-16/+21
|
* Added missing copyright headers.Roberto Raggi2009-05-266-0/+245
|
* Create a new TextWriter when rewriting the CSS literals.Roberto Raggi2009-05-261-7/+8
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-26102-2024/+3609
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Remove AssignStackObject instructionAaron Kennedy2009-05-265-39/+27
| |
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-261-2/+2
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Do not expect QListModelInterface::data to return ONLY the roles requestedKai Koehne2009-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | It is often convenient to always return the full set of data, even if only some roles are requested. Reviewed-by: Martin Jones
| * | Remove the NoOp instructionAaron Kennedy2009-05-263-22/+2
| | |
| * | Remove unnecessary conditionAaron Kennedy2009-05-261-9/+0
| | |
| * | Remove ResolveFetchObject instructionAaron Kennedy2009-05-264-39/+9
| | |
| * | Remove AssignValueSource instructionAaron Kennedy2009-05-264-43/+5
| | |
| * | Unify the store instructions into the main VME switchAaron Kennedy2009-05-263-273/+249
| | |
| * | Remove AssignObject instructionAaron Kennedy2009-05-266-142/+85
| | |
| * | Remove Try*Object instructionsAaron Kennedy2009-05-264-83/+27
| |/
| * Ensure tests passAaron Kennedy2009-05-266-30/+40
| |
| * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-2686-1332/+3147
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Always treat CSS-like suffix's as bindingsAaron Kennedy2009-05-261-1/+5
| | |
| | * roberto: Added support for CSS like numeric literals e.g. 10pAaron Kennedy2009-05-2614-35/+624
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-2652-846/+715
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Test cleanup.Michael Brasser2009-05-2549-841/+701
| | | |
| | | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-252-4/+13
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Fix compile when paint engine debugging is on.Michael Brasser2009-05-251-1/+1
| | | | |
| | * | | Move canvas scene snapshot out of in-process debuggerAaron Kennedy2009-05-2618-381/+449
| | | | |
| | * | | Add basic client/server debugging supportAaron Kennedy2009-05-2517-158/+1452
| | |/ / | | | | | | | | | | | | The canvas framerate monitor now uses this support.
| * | | correct path docWarwick Allison2009-05-251-3/+0
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-252-4/+13
| |\ \ \ | | | |/ | | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Disable QmlDom debug output by defaultKai Koehne2009-05-251-4/+10
| | | | | | | | | | | | | | | | Only print AST if QML_COMPILER_DUMP is set
| | * | Merge branch 'kinetic-declarativeui' of ↵Julian de Bhal2009-05-25271-5145/+6710
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Update mkspecs for linux-g++-x11Julian de Bhal2009-05-251-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change QMAKE_INCDIR_OPENGL and QMAKE_LIBDIR_OPENGL to QMAKE_INCDIR_OPENGL_QT and QMAKE_LIBDIR_OPENGL_QT so qmake will pick them up.
| * | | Fix with "new" argc/argv.Warwick Allison2009-05-251-7/+7
| | |/ | |/|
* | | Remove extraneous semicolons.Martin Jones2009-05-26113-237/+237
| | | | | | | | | | | | Caused massive number of warnings with winscw
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-24307-5272/+7342
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-243-2/+7
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Use the true metatype of attached properties in the compilerAaron Kennedy2009-05-223-2/+7
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-228-48/+418
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Add canvas framerate monitor applicationAaron Kennedy2009-05-224-2/+328
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-22143-1227/+2970
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Store the type of the attached properties objectAaron Kennedy2009-05-224-46/+90
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-22271-5145/+6710
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h
| | * | Merge commit 'origin/4.5'Samuel Rødal2009-05-206-12/+18
| | |\ \
| | | * | Fix a compile error on MSVC 64bits due to qhash casting a pointer.Thierry Bastian2009-05-201-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I tested it with 32 bits compilation and there is no warning any more. Task-number: 247325 Reviewed-by: ogoffart
| | | * | Fix a wrong compiler define (was a typo).Ariya Hidayat2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
| | | * | Compile on Solaris with broken GL headers.Trond Kjernåsen2009-05-201-2/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | | * | Make the range controls accessibleHarald Fernengel2009-05-201-0/+2
| | | | |
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jedrzej Nowacki2009-05-2013-198/+342
| | | |\ \
| | | | * | Don't draw an arrow for toolbuttons that are text only and have a menu.Norwegian Rock Cat2009-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made this change to make things look a bit better on the mac. However, a toolbutton with text only looks strange and as a bonus the arrow covers some of the text, which no one wants. It seems that similar consructions in Cocoa don't show the arrow for text button, so we shouldn't either. Task-number: 253339 Reviewed-by: Jens Bache-Wiig