summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-2099-1903/+2069
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (22 commits) Fix compilation on HP-UXi: m_volume is a #define WinCE doesn't have sys/types.h Fix compilation: qmlviewer cannot use symbols exported with Q_AUTOTEST_EXPORT in production builds Fix compilation on recent Linux systems: getpid(2) is in unistd.h. Cocoa: calling QEventLoop::exec from mouse up causes problem Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined) Doc: Collected the Declarative UI tutorials together and renamed them. Doc: Simplified Commercial Editions for Qt 4.7. Work around MSVC2008 compiler crash doc: Added "\since 4.7" to a bunch of declarative stuff. Cocoa: event dispatcher eats mouse events Fix an issue about double-click on Mac OS X. qdoc: Finished "Inherited by" list for QML elements. Avoid calling out to public API in the QtScript implementation Move property helper functions to QScriptEnginePrivate Move more script value conversion code to helper functions Cleanup: Move value conversion code to helper functions Move implementation of QScriptValue construction functions to private class Cleanup: Move number conversion functions to QScriptEnginePrivate Move some helper function declarations outside QT_NO_QOBJECT guard ...
| * Fix compilation on HP-UXi: m_volume is a #defineThiago Macieira2010-02-206-20/+20
| |
| * WinCE doesn't have sys/types.hThiago Macieira2010-02-201-1/+1
| |
| * Fix compilation: qmlviewer cannot use symbols exported with ↵Thiago Macieira2010-02-202-2/+2
| | | | | | | | Q_AUTOTEST_EXPORT in production builds
| * Fix compilation on recent Linux systems: getpid(2) is in unistd.h.Thiago Macieira2010-02-201-0/+2
| | | | | | | | | | Newer Linux systems (glibc 2.10, gcc 4.4) are much better at not leaking symbols, so you have to include the proper headers.
| * Merge remote branch 'origin/master'Thiago Macieira2010-02-20783-16234/+102449
| |\ | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * | Cocoa: calling QEventLoop::exec from mouse up causes problemRichard Moe Gustavsen2010-02-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one create e.g. a modal dialog from a mouse up event handler, we qt_button_down global variable was pointing to a widget before the handler returned. This meant that you could not push another button in the window, since the qt_button_down would grab the mouse. This patch clears qt_button_down before sending mouse up events. Reviewed-by: denis
| * | Fix compilation on GNU/Hurd (SA_SIGINFO isn't defined)Thiago Macieira2010-02-191-1/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-7805 Patch-by: Pino Toscano Reviewed-by: Trust Me
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1956-98/+228
| |\ \
| | * | Work around MSVC2008 compiler crashKent Hansen2010-02-192-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "e:\pulse\work\91088\src\script\api\qscriptengine.h(360) : fatal error C1001: An internal error has occurred in the compiler. (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c[0x510A0530:0x00000007]', line 243) To work around this problem, try simplifying or changing the program near the locations listed above." Apparently the compiler doesn't like that a few functions are inlined.
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-192-40/+36
| | |\ \
| | | * | Cocoa: event dispatcher eats mouse eventsRichard Moe Gustavsen2010-02-191-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that the event dispatcher did not flush queued user input events under some circumstances (when adding the exec-flag to processEvents). And this caused problems in the QML-editor in creator regarding focus frames. This patch makes sure that we always flush the queued user input events when calling processEvents. Task-number: QTBUG-8274 Reviewed-by: Prasanth Reviewed-by: cduclos
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Fabien Freling2010-02-19628-2756/+4279
| | | |\ \
| | | * | | Fix an issue about double-click on Mac OS X.Fabien Freling2010-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A test is added when we double-click to verify that both pushed buttons are the same.
| | * | | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-1945-18/+116
| | | |/ / | | |/| |
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-199-845/+1258
| | |\ \ \
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1913-851/+1329
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Avoid calling out to public API in the QtScript implementation Move property helper functions to QScriptEnginePrivate Move more script value conversion code to helper functions Cleanup: Move value conversion code to helper functions Move implementation of QScriptValue construction functions to private class Cleanup: Move number conversion functions to QScriptEnginePrivate Move some helper function declarations outside QT_NO_QOBJECT guard Cleanup: Move exception helper functions to QScriptEnginePrivate qdoc: Added "Inherited by" list to QML elements.
| | * | | | | qdoc: Finished "Inherited by" list for QML elements.Martin Smith2010-02-196-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The listed elements are now links. Task: QTBUG-8153
| * | | | | | Doc: Collected the Declarative UI tutorials together and renamed them.David Boddie2010-02-1912-777/+498
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-1918-192/+23
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Sales and Legal
| * | | | | Avoid calling out to public API in the QtScript implementationKent Hansen2010-02-188-359/+513
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason to construct QScriptValues when JSC::JSValues can be operated on directly. A benchmark showed that ~10% of the time for reading a QObject property from a script was spent just creating and destroying QScriptValue temporaries. It's time to finally get rid of this potential bottleneck, not just in the QObject integration but everywhere. This change refactors the code so that all internal operations are performed on JSC::JSValue (most importantly, conversion from/to Qt types), and the public API functions are just thin wrappers around these. E.g. instead of doing enginePrivate->scriptValueFromJSCValue(jsValue).toQObject() the implementation now does QScriptEnginePrivate::toQObject(jsValue) Other operations are delegated to the engine implementation in similar style. Task-number: QTBUG-8304 Reviewed-by: Jedrzej Nowacki
| * | | | | Move property helper functions to QScriptEnginePrivateKent Hansen2010-02-184-206/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More preparation for operating purely on JSC::JSValue internally. Reviewed-by: Jedrzej Nowacki
| * | | | | Move more script value conversion code to helper functionsKent Hansen2010-02-182-65/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation of operating purely on JSC::JSValue internally. Reviewed-by: Jedrzej Nowacki
| * | | | | Cleanup: Move value conversion code to helper functionsKent Hansen2010-02-183-11/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation of doing this conversion in more places. Reviewed-by: Jedrzej Nowacki
| * | | | | Move implementation of QScriptValue construction functions to private classKent Hansen2010-02-182-91/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation of getting rid of QScriptValue construction internally; the implementation should only call the private functions that operate directly on JSC::JSValues. Reviewed-by: Jedrzej Nowacki
| * | | | | Cleanup: Move number conversion functions to QScriptEnginePrivateKent Hansen2010-02-183-84/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename ToUint{16,32} to ToUInt{16,32} to follow the Qt naming (it takes precedence over the ECMA one). Reviewed-by: Jedrzej Nowacki
| * | | | | Move some helper function declarations outside QT_NO_QOBJECT guardKent Hansen2010-02-181-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not dependent on QObject, I don't know how they ended up inside there. Reviewed-by: Jedrzej Nowacki
| * | | | | Cleanup: Move exception helper functions to QScriptEnginePrivateKent Hansen2010-02-183-35/+35
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Because that's where they belong. Reviewed-by: Jedrzej Nowacki
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1817-106/+270
| |\ \ \ \
| * | | | | qdoc: Added "Inherited by" list to QML elements.Martin Smith2010-02-185-10/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But the listed elements are not links yet, just plain text. Task: QTBUG-8153
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-206-134/+114
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added exception to destdir location for abld and sbsv2. Moved the "sis" target and friends from cpp code to qmake profiles.
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-206-134/+114
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added exception to destdir location for abld and sbsv2. Moved the "sis" target and friends from cpp code to qmake profiles.
| * | | | | Added exception to destdir location for abld and sbsv2.axis2010-02-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | It was supposed to be in my last commit, but I forgot it.
| * | | | | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-196-134/+110
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in order to use the same targets for multiple mkspecs. The "store_build" target of sbsv2 had to remain separate, because it depends on using flms. RevBy: Miikka Heikkinen
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1946-253/+1144
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits) Add convenience function QTextCursor::positionInBlock() Fixed URL in Russian translation. Designer/Resourceview: Suppress warning about QFileInfo on empty path. optimize qstring::simplified() Revert optimizations to QString::append unbreak QList::append() and co. again Implement bookmark manager widget. optimization: use QList::reserve() and QVector::reserve() amend "purge msvc.net and msvc2002 makespecs" Added QPlainTextEditor::anchorAt(const QPoint &pos) Fix memmory leak. Fix spacing. Prevent renaming the bookmarks menu root item, it's just a placeholder. Fix broken set last shown pagen when the last page was about:blank. Move launch with external app in base class. Make sure the bookmarks menu updates on add/ remove as well. Fix broken Drag&Drop, reset and clear the model if we set new bookmarks. avoid double reallocations in appending operations avoid double reallocation in string-growing replace() case optimize qHash() some more ...
| * | | | | Add convenience function QTextCursor::positionInBlock()mae2010-02-192-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a missleading function QTextCursor::columnNumber() since 4.2, which almost never returns what you want. The pattern cursor.position() - cursor.block().position() is used frequently in code using QTextCursor. Reviewed-by: Roberto Raggi
| * | | | | Fixed URL in Russian translation.Robert Loehning2010-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
| * | | | | Designer/Resourceview: Suppress warning about QFileInfo on empty path.Friedemann Kleint2010-02-191-0/+2
| | | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-1842-251/+1115
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) optimize qstring::simplified() Revert optimizations to QString::append unbreak QList::append() and co. again Implement bookmark manager widget. optimization: use QList::reserve() and QVector::reserve() amend "purge msvc.net and msvc2002 makespecs" Added QPlainTextEditor::anchorAt(const QPoint &pos) Fix memmory leak. Fix spacing. Prevent renaming the bookmarks menu root item, it's just a placeholder. Fix broken set last shown pagen when the last page was about:blank. Move launch with external app in base class. Make sure the bookmarks menu updates on add/ remove as well. Fix broken Drag&Drop, reset and clear the model if we set new bookmarks. avoid double reallocations in appending operations avoid double reallocation in string-growing replace() case optimize qHash() some more optimize QList::mid() optimization: use QList::reserve() in QSet::toList() add QList::reserve() ...
| | * | | | | optimize qstring::simplified()Oswald Buddenhagen2010-02-182-23/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - avoid detaching if the string is already simplified - avoid calling isSpace() multiple times on the same character Reviewed-by: joao
| | * | | | | Revert optimizations to QString::appendKai Koehne2010-02-182-42/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 03ac778172b783d26bb1c7c5d92bdedd045fcc92 and commit 02135be18f3c4b1d1525aff6dfe96c9c8521084d. They broke qt on all platforms (e.g. qmake didn't compile on Windows any more).
| | * | | | | unbreak QList::append() and co. againOswald Buddenhagen2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure that the detached object is always at least as big as the original one. that may be somewhat wasteful, but it is no worse than before the detach() optimization. one may consider improvements later. Reviewed-by: joao
| | * | | | | Implement bookmark manager widget.kh12010-02-178-52/+606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some more flexible approach to rename, export and import bookmarks.
| | * | | | | optimization: use QList::reserve() and QVector::reserve()Oswald Buddenhagen2010-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: denis
| | * | | | | amend "purge msvc.net and msvc2002 makespecs"Oswald Buddenhagen2010-02-174-7/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - win32-msvc.net/qplatformdefs.h was included from msvc2003. inline it. - purge references to msvc.net from feature files Reviewed-by: mariusSO
| | * | | | | Added QPlainTextEditor::anchorAt(const QPoint &pos)Thorbjørn Lindeijer2010-02-172-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The equivalent of QTextEdit::anchorAt. Done-with: mae
| | * | | | | Fix memmory leak.kh12010-02-171-0/+1
| | | | | | |
| | * | | | | Fix spacing.kh12010-02-171-0/+3
| | | | | | |
| | * | | | | Prevent renaming the bookmarks menu root item, it's just a placeholder.kh12010-02-172-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck
| | * | | | | Fix broken set last shown pagen when the last page was about:blank.kh12010-02-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ck