summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-181-4/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make the licenseheader check pass trivial files.
| | | * | | Make the licenseheader check pass trivial files.Thomas Zander2010-02-171-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file that contains so little doesn't have to have the copyright header. A good example usecase is a header file with nothing but an include line to another header. Reviewed-by: Thiago Macieira
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-18649-1964/+13837
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits) Compile. Remove these friend declarations that aren't necessary in 4.7 Added a new flag to fine-tune gesture propagation policy AIX has a #define for hz, so undef it Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib" remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlib remove -lz from OPENSSL_LIBS so as to respect qt-zlib Fix compilation with IBM xlC 7: Fix compilation of Qt Assistant when WebKit isn't built. Mac: QSystemTrayIcon::DoubleClick and midmouse not working add test for toDateTime() using QLocale::LongFormat remove debug info add test case for QTBUG-7898 that QLocale::toDateTime(QString, FormatType) cannot convert value correctly fix QTBUG-7898 QNAM HTTP: More micro optimization in QHttpNetworkRequest QNAM HTTP: Some micro optimization in QHttpNetworkRequest QNAM HTTP: Trivial optimization Revert "Optimized QLocale to access system locale on demand." doc: Added "\sa {QML Basic Types} to each QML basic type page. Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages. ...
| * | | | | 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
|\ \ \ \ | | |/ / | |/| |
| * | | Compile.Morten Johan Sørvig2010-02-184-2/+3
| | | | | | | | | | | | | | | | NSInteger is int/long on 32/64 bit.
| * | | Remove these friend declarations that aren't necessary in 4.7Thiago Macieira2010-02-171-5/+0
| | | |
| * | | Added a new flag to fine-tune gesture propagation policyDenis Dzyubenko2010-02-173-7/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a graphicsobject subscribes to a gesture using the IgnoredGesturesPropagateToParent flag, normal propagation rules do not apply to the gesture, and instead all gestures of the given type that are started over the item will propagate to parent items only. Task-number: QTBUG-7400 Reviewed-by: Andreas
| * | | AIX has a #define for hz, so undef itThiago Macieira2010-02-171-0/+4
| | | |
| * | | Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"Mark Brand2010-02-171-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7228fdef61fd126481574e53d6d022d134219cc3. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlibMark Brand2010-02-172-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be be removed so that zlib will come from -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. This affects building shared Qt. This patch fixes the problem for win32-g++ and also unix. Assumed that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough. Not sure why parallel logic is in src/sql/drivers/drivers.pri but I fixed that too. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | remove -lz from OPENSSL_LIBS so as to respect qt-zlibMark Brand2010-02-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPENSSL_LIBS can introduce -lz. To respect qt-zlib, this must be replaced with -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | Fix compilation with IBM xlC 7:Thiago Macieira2010-02-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier. So move the Q_DECLARE_METATYPE before the use. Reviewed-By: hjk <qtc-committer@nokia.com>
| * | | Fix compilation of Qt Assistant when WebKit isn't built.Thiago Macieira2010-02-174-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | You need to ensure qconfig.h is included before you can check if QT_NO_WEBKIT is defined. Reviewed-by: kh1 <qt-info@nokia.com>
| * | | Mac: QSystemTrayIcon::DoubleClick and midmouse not workingRichard Moe Gustavsen2010-02-174-73/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, we never emit the activation signal of the tray icon with other reasons than triggered. The reason; it was never implemented. This patch connect the dots. Task-number: QTBUG-5770
| * | | add test for toDateTime() using QLocale::LongFormatShenghua Su2010-02-171-20/+5
| | | | | | | | | | | | | | | | | | | | Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | remove debug infoShenghua Su2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | add test case for QTBUG-7898 that QLocale::toDateTime(QString, FormatType) ↵Shenghua Su2010-02-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot convert value correctly Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | fix QTBUG-7898Shenghua Su2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | | 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
* | | QNAM HTTP: More micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-3/+7
| | | | | | | | | | | | Reviewed-by: Zeno Albisser
* | | QNAM HTTP: Some micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-9/+16
| | | | | | | | | | | | Reviewed-by: Thiago
* | | QNAM HTTP: Trivial optimizationMarkus Goetz2010-02-171-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reorder switch. Directly return instead of having a null QByteArray, using append and then returning it. Reviewed-by: Peter Hartmann
* | | Revert "Optimized QLocale to access system locale on demand."Denis Dzyubenko2010-02-174-149/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change introduces regression in QIntValidator and QInputDialog, which needs to be addressed before pushing the change again. Also reverted the following two compile fixes: Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)" Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)" This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9. This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e. This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6. Reviewed-by: trustme
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-171-1/+4
|\ \ \
| * | | Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages.Prasanth Ullattil2010-02-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the coordinates passed in the LPARAM parameter, the pt passed with the MSG is not always correct. Task-number: QTBUG-7637 Reviewed-by: Denis
* | | | doc: Added "\sa {QML Basic Types} to each QML basic type page.Martin Smith2010-02-171-0/+17
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-16639-1880/+13662
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| * | doc: Fixed some qdoc errors.Martin Smith2010-02-167-8/+9
| | |
generated by cgit v0.12 at 2025-08-21 14:26:12 (GMT)