summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix a bug in syncqt.Liang Qi2011-05-111-22/+22
| | | | | | | | | | | | | | | | | | | | | Move the generation of version header file before the sync of header files. Reviewed-by: TrustMe
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-1184-60/+192
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: tests: fix private header inclusion in qtbase autotests tests: disable tests in qtbase which depend on qtsvg tests: make benchmarks compile or disable those which don't compile tests: remove references to benchmark directories which don't exist tests: enable compilation of autotests for qtbase by default tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change tests: mark some tests as using private API
| * | tests: fix private header inclusion in qtbase autotestsRohan McGovern2011-05-1162-38/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | Any test which needs private headers from some Qt module must do: QT += modulename-private Reviewed-by: Jason McDonald Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
| * | tests: disable tests in qtbase which depend on qtsvgRohan McGovern2011-05-112-2/+3
| | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: I2416d34b5c262e20ee18f7121e8745327d5614f8
| * | tests: make benchmarks compile or disable those which don't compileRohan McGovern2011-05-1113-9/+26
| | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d
| * | tests: remove references to benchmark directories which don't existRohan McGovern2011-05-111-3/+1
| | | | | | | | | | | | | | | Reviewed-by: Jason McDonald Change-Id: I14d0981c9f962c4eb048ca426a8ba19aa7ea66de
| * | tests: enable compilation of autotests for qtbase by defaultRohan McGovern2011-05-112-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Tests are now treated like examples and demos: compiled by default, unless you configured with `-nomake tests'. (They are still not installed by default, however.) Reviewed-by: Jason McDonald Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
| * | tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API changeRohan McGovern2011-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | Broken by 051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4 Reviewed-by: Jason McDonald Change-Id: Ia8589aba1bfb71d000d8fad455d90e704ba28972
| * | tests: mark some tests as using private APIRohan McGovern2011-05-114-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | These autotests are all using private symbols, available only when Qt is configured with -developer-build. So, gracefully disable them when the private symbols are not available. Reviewed-by: Jason McDonald Change-Id: Iafd1c7af486feeee810110bc021e75984827f78a
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-111-0/+2
|\| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Prevent crash in wayland mimedata in case there is no offer.
| * | Prevent crash in wayland mimedata in case there is no offer.Laszlo Agocs2011-05-101-0/+2
| | |
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-stagingQt Continuous Integration System2011-05-1112-0/+81
|\ \ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging: Add QT_xxx_VERSION macros for each library in qtbase
| * | Add QT_xxx_VERSION macros for each library in qtbaseLiang Qi2011-05-1012-0/+81
| | | | | | | | | | | | | | | | | | | | | Provide version info for each library like QTCORE_VERSION and etc. Task-number: QTMODULARIZATION-44 Reviewed-by: axis
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-101-0/+3
|\ \ \ | | |/ | |/| | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Prevent having Status undefined in xlib platform plug-in.
| * | Prevent having Status undefined in xlib platform plug-in.Laszlo Agocs2011-05-101-0/+3
| | | | | | | | | | | | | | | | | | Commit 4b75ceea08815c096ec35a077c5c1e3bfca0e5ed changed qcoreapplication_p.h to include qsettings.h, which undefines Status. This breaks the xlib platform plug-in (and its includes).
* | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-stagingQt Continuous Integration System2011-05-10155-2302/+3578
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (142 commits) ifdef out mac/no_coreservices path more cleanly fix build on symbian Allow different text for undo actions and items in QUndoView Allow using not only prefixes for undo command text QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case Massively update the hurd-g++ mkspec. Do not allow multiple threads to acquire a QMutex Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget. don't crash in QProcessEnvironment::systemEnvironment() HTTP backend: do not load resources from cache that must be revalidated Compile fix for QLocale on Symbian. Added Kazakh language to the QLocale mapping table on Symbian. Added support for QLocale::uiLanguages on Symbian. Fix drawing text in item view: Add enablers for Symbian App Booster Don't rely on uninitialized data Don't realloc user-provided buffer qmake: Introduce new template type Make autotest more resilient against network timeout (cherry picked from commit 50be38737507f5c23b4d050e635a200024164a13) Do not filter adhoc clients (cherry picked from commit 4fe5307af44a76b99cc8c70aa330180c1985eabc) ...
| * | Merge remote-tracking branch 'staging/master'Olivier Goffart2011-05-105-22/+262
| |\ \
| * | | ifdef out mac/no_coreservices path more cleanlyOswald Buddenhagen2011-05-101-3/+2
| | | | | | | | | | | | | | | | | | | | the symbian path was also dead (cherry picked from commit 76ac26383922b4c452592a9175e7f3b9b3fd2513)
| * | | fix build on symbianOswald Buddenhagen2011-05-101-0/+5
| | | | | | | | | | | | | | | | | | | | provide dummy implementation of QProcessEnvironment::systemEnvironment() (cherry picked from commit e4920a4b4bc454ad309324a62db0e9257bba7367)
| * | | Allow different text for undo actions and items in QUndoViewAlexander Potashev2011-05-104-10/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the texts used for undo actions and for items in QUndoView can be set separately. This introduces an extended format of text that can be passed to QUndoCommand::setText or QUndoCommand constructor. The action text can now contain two strings separated by a "\n". The first string (that goes before "\n") is then returned by QUndoCommand::text() and used as name of item in QUndoView. The second string (that goes after "\n") is returned by QUndoCommand::actionText() and used when the text properties of the undo and redo actions are updated. If the text passed to QUndoCommand does not contain "\n", everything works as before, and both QUndoCommand::text() and QUndoCommand::actionText() return the same string. Even though action text in English usually does not need different forms for undo actions and QUndoView item, translators can employ this new command text format, for example to adjust the grammatical case used in command text to match the context of "Undo %1"/"Redo %1". Merge-request: 2610 Reviewed-by: ossi (cherry picked from commit 9b784789c75d59b27530bbf1d12676cc44f64f46)
| * | | Allow using not only prefixes for undo command textAlexander Potashev2011-05-107-17/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action text templates "Undo %1" and "Redo %1" if no custom prefix was provided. This makes more flexible translations possible. The surrounding text (like "Undo" and "Redo") can now be suffixed to the command name as German and Korean languages require ("%1 rueckgaengig machen" for German). Also, now the default action text (when no command can be undone) can be translated differently from the prefix. For example, it can be translated as "Undo action", not just "Undo". When a non-empty prefix is passed to QUndo*****::create****Action(), those functions work as before, and the features described above become unavailable. Task-number: QTBUG-14442 Merge-request: 1212 Reviewed-by: ossi (cherry picked from commit 213c25ad24e4f3b0a44f82f23d34746cd294f8d6)
| * | | QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the ↵Pino Toscano2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no-PATH_MAX case ... in the same way as done in the other code path. This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd). Merge-request: 1218 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit c8812fe6e642520532d65744caefcea790d59de8)
| * | | Massively update the hurd-g++ mkspec.Pino Toscano2011-05-101-72/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring it to the same level as linux-g++: - copy the defines from common/linux.conf - use the common gcc/g++ .conf files - keep the trick of linking the pthread library everywhere - leave out the wayland variables, which are not useful for Hurd Merge-request: 1219 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 027605f67f73c8021c1ae604adad298599785a79)
| * | | Do not allow multiple threads to acquire a QMutexBradley T. Hughes2011-05-101-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the mutex optimizations on Mac, we did not handle the case where semaphore_wait() could return KERN_ABORTED. Under heavy contention, this happens, and when running in release mode, the assert in qmutex.cpp is not executed. The code silently allows multiple threads to continue as if it had acquired the mutex exclusively. Fix this by checking for KERN_ABORTED from semaphore_wait(), and retry the wait. We do not handle KERN_ABORTED for timed waits, simply return false and let the code doing the tryLock() handle it how it deems best. Reviewed-by: joao (cherry picked from commit b54af0a9d6406356616889826e31925d2fa05718)
| * | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-103-18/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This case may be triggered in the (admittedly slightly abnormal) case where a user wishes to embed the calendar widget in a layout or, for whatever reason, do something else that will change its ownership. We work around this by detecting when it is deleted and recreating the widget. This will also have a positive side effect if setCalendarWidget() is called with a widget which is then subsequently deleted, returning the default widget instead of a pointer to (now deleted) memory. Reviewed-by: Denis Dzyubenko Merge-request: 2568 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> (cherry picked from commit 124ec3200f8453142717fcfe7a4aa0a55164aaa6)
| * | | don't crash in QProcessEnvironment::systemEnvironment()Oswald Buddenhagen2011-05-102-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as the implementations moved to platform-specific files, the QSharedDataPointer<QProcessEnvironmentPrivate>::detach() specialization needs to go to the private header. Reviewed-by: thiago (cherry picked from commit c79246683a5033f605acd59d1c37d68381383a06)
| * | | HTTP backend: do not load resources from cache that must be revalidatedPeter Hartmann2011-05-101-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header field "Cache-Control: must-revalidate" is a strict requirement for loading the resource from the server, and not reading it from the cache without revalidating first. With this patch, PreferCache will load such from the network instead of loading them from the cache, and AlwaysCache will throw a ContentNotFound error. Reviewed-by: Markus Goetz Task-number: QTBUG-18983 (cherry picked from commit 0e449f38894b1bd2dbb2f14206a011424679f063)
| * | | Compile fix for QLocale on Symbian.Denis Dzyubenko2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous change added new ELangEnglish_India that doesn't necesserally present in all SDKs. Reviewed-by: trustme (cherry picked from commit 154ab1cb4c4cdf34f21fc93b078f91cc79048bd4)
| * | | Added Kazakh language to the QLocale mapping table on Symbian.Denis Dzyubenko2011-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme (cherry picked from commit c6808af66d45541546b30c8e6de155b9812b4ef9)
| * | | Added support for QLocale::uiLanguages on Symbian.Denis Dzyubenko2011-05-101-70/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended the mapping table that matches symbian device languages to a locale name and language code. Task-number: QTBUG-7329 Reviewed-by: trustme (cherry picked from commit 93233fc811920002d5b5b8272d9b5b8d5d3e2b98)
| * | | Fix drawing text in item view:Olivier Goffart2011-05-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back code that was removed by mistake in e8019cf8feb402303e6d253f5ca58bebfda42679 Task-number: QTBUG-18998 (cherry picked from commit bbbd4b8f3949b58d4fd21854241cb46cbc024a80)
| * | | Add enablers for Symbian App BoosterSimon Frost2011-05-102-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use the Symbian App Booster, a registration file (matching the filename of the executable, eg helloworld.applite) must be copied to the import folder within QtAppBooster's private directory. The appropriate library (qdeclarativebooster) must also be linked against. With this change, the required actions are carried out by adding "CONFIG += symbian_appbooster" to the application's .pro file. Task-number: QT-4892 Reviewed-by: Miikka Heikkinen (cherry picked from commit ae128aef03d246c9f89bed015092b1c5a925bcbc)
| * | | Don't rely on uninitialized dataJoão Abecasis2011-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HB_GetCharAttributes used to require a zero-initialized array for attributes, as it selectively sets relevant bits for each character. We ease that requirement by always initializing the attributes buffer explicitly with memset. Task-number: QT-4911 Reviewed-by: Ritt Konstantin (cherry picked from commit 4cb9db404224c55859713c282aa90409e375c372)
| * | | Don't realloc user-provided bufferJoão Abecasis2011-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QTextBoundaryFinder doesn't own the buffer, don't realloc it and get a new one instead. Reviewed-by: Ritt Konstantin (cherry picked from commit 320f172c851a4720299297c8b3b757eb1202c568)
| * | | qmake: Introduce new template typeChristian Kandeler2011-05-104-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The template type "aux" is intended for projects that do not require building anything, but may need to install stuff (e.g. applications with QML entry point). Reviewed-by: Joerg Bornemann (cherry picked from commit 56443421cb5e537e60abd7ced42c9ebf587683fe)
| * | | Make autotest more resilient against network timeoutaavit2011-05-103-6/+9
| | | | | | | | | | | | | | | | (cherry picked from commit 50be38737507f5c23b4d050e635a200024164a13)
| * | | Do not filter adhoc clientsaavit2011-05-101-2/+2
| | | | | | | | | | | | | | | | (cherry picked from commit 4fe5307af44a76b99cc8c70aa330180c1985eabc)
| * | | Lancelot: Add configurable client filtering to baseline serveraavit2011-05-102-10/+32
| | | | | | | | | | | | | | | | (cherry picked from commit d499f7ca995e40f7a75f913ff0f07d9a73fa3559)
| * | | Improve error reporting on failure to connect to baseline serveraavit2011-05-102-1/+2
| | | | | | | | | | | | | | | | (cherry picked from commit 9d75ff6fa8f8844ff6599b68618821cd8c501757)
| * | | Fixed bug in X11 backend when creating translucent windows.Samuel Rødal2011-05-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We forgot to send the ParentAboutToChange event, which meant QGLWidget didn't destroy the old EGL surface. This could cause two EGL surfaces to be created for the same QGLWidget, which leads to undefined behaviour on some platforms. (cherry picked from commit 5a834d7141cc7d29d022911ccec16e628d94acf1)
| * | | Fix the tst_QPluginLoader::loadCorruptElf on 64 bitOlivier Goffart2011-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message do not match Reviewed-by: Arvid Ephraim Picciani (cherry picked from commit 383f57dd2669b71fd14cf9b6b56213423a3d2d01)
| * | | Clarified sendCustomRequest documentation to include HTTPSJanne Anttila2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-By: mgoetz (cherry picked from commit 16b8c940dac02ec77e6ff9fe4150c32db1811e74)
| * | | Fix compilationOlivier Goffart2011-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b (cherry picked from commit 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58)
| * | | no environment on WinCEOswald Buddenhagen2011-05-101-0/+4
| | | | | | | | | | | | | | | | (cherry picked from commit 62e73a463cb7035192acdce6538c5b0248e643d4)
| * | | fix Widestring vs. Ansi mixupOswald Buddenhagen2011-05-101-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit 4dcb4a41022085aa82f25f7e0a2ce9e92510f4ae)
| * | | fix potential crash in QProcessEnvironment::systemEnvironment() on windowsOswald Buddenhagen2011-05-101-10/+11
| | | | | | | | | | | | | | | | | | | | GetEnvironmentStrings() can theoretically return null (cherry picked from commit 443608952d7df9a5146317be992320ba232d2cf9)
| * | | Only cleanup share widget if it has been created.Armin Berres2011-05-101-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change a not yet created share widget is created once qt_destroy_gl_share_widget() is called. As creating the widget also triggers a call to qt_cleanup_gl_share_widget() once QApplication is destroyed a QApplication created afterwards cannot use a share widget anymore. This functionality is needed for Harmattan. Merge-request: 2609 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> (cherry picked from commit 8680d831fb7066feae07690a4a6bc8e908a84e5a)
| * | | Fix the build of configure.exe.Liang Qi2011-05-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qlocale functions were splitted in severl files, just add them back. Task-number: QTBUG-18932 Reviewed-by: TrustMe (cherry picked from commit 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf)
| * | | Update the source file of configure.exe to enable QtConcurrent for SymbianLiang Qi2011-05-101-2/+0
| | | | | | | | | | | | | | | | (cherry picked from commit 8769c84663943fda853f5aa248fa95391594347e)
| * | | Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.Liang Qi2011-05-101-18/+0
| | | | | | | | | | | | | | | | | | | | Because Qt doesn't support that feature before. (cherry picked from commit c12ed14fb38ae77be194e19a27545190aded830b)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 01:58:24 +0000