summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-103-38/+61
| | | | | | | | | | | | | | in the property browser solution. Reviewed-by: Trond Kjernåsen <trond@trolltech.com> Task-number: QTBUG-8046
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-1020-152/+755
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add the download URI for smart installer package to documentation Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053 rename trk -> symbianutils Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b Fixed defect in handling of expose events for Symbian Added qwidget test case which displays a native child widget Fix tst_QAbstractItemView::task250754_fontChange and tst_QAbstractItemView::QTBUG6407_extendedSelection for Symbian & 5800
| * Catch up symbianutils to creator 3efdb87682a5785bac7b90f9f9a8bb819a1cb053Shane Kearns2010-02-099-32/+520
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3efdb87682a5785bac7b90f9f9a8bb819a1cb053 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Mon Feb 8 14:10:51 2010 +0100 S60/Trk: Make the port a property of TrkDevice. Associate the port with the device instead of passing it to open for better handling. commit 76872c6ed8a1477f1914266d6917ee4aad6ff7e9 Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Fri Feb 5 17:34:02 2010 +0100 S60: Move serialdevicelister.cpp to symbianutils/symbiandevicemanager.cpp
| * rename trk -> symbianutilsShane Kearns2010-02-0917-1/+3
| | | | | | | | | | | | | | | | commit 9c2676167a3aaeb99024a22343c3d998f191a75f Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Fri Feb 5 12:32:32 2010 +0100 src/shared: Rename trk to symbianutils
| * Catch up TRK library to creator f2b3e9f2dfbc580389b9b683a3e46e5a8422f55bShane Kearns2010-02-0916-120/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the last SHA before trk directory is renamed. Note the \\.\ is prepended to windows com ports inside the library now, so main.cpp no longer has this windows specific code. commit f2b3e9f2dfbc580389b9b683a3e46e5a8422f55b Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Fri Feb 5 12:24:46 2010 +0100 S60/Trk: Change trkutils to be a library of its own. To be able to share TrkDevices between Debugger and Qt4ProjectManager. commit 61c3a260b59433abf8c3ef481ec536af88f8026c Author: Sarika Kamisetty <sarikak11@gmail.com> Date: Thu Feb 4 09:57:54 2010 +0100 Fix to App TRK connection with 'high COM port' does not work Merge-request: 111 Reviewed-by: hjk <qtc-committer@nokia.com> commit 2fd8b2d7ffa2ac032bfe3a17efe7d152c4cef14d Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Mon Feb 1 12:43:56 2010 +0100 Fix some code scanning issues. QString: Use QChar where appropriate. commit 805b0a9cc165ef6cd596bd8f5e59f650cd0eebb2 Author: hjk <qtc-committer@nokia.com> Date: Mon Feb 1 11:45:44 2010 +0100 debugger: trk log output cosmetic commit 75b42f18d886b59dbf3380dd12f39f40005ef08b Merge: 4320314 a6ca348 Author: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Date: Fri Jan 29 22:49:55 2010 +0100 Merge remote branch 'origin/1.3' Trailing whitespace removal re-applied manually. commit a6ca348636dd92ab1445cff2286b3293163f5cea Author: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Date: Fri Jan 29 21:33:57 2010 +0100 remove trailing whitespace doing it in 1.3 as well to avoid possible later conflicts commit 4ec51219ed5c2150e164473b9c5326b6c68d096a Author: Friedemann Kleint <Friedemann.Kleint@nokia.com> Date: Thu Jan 28 17:04:05 2010 +0100 Trk: Fix source code scanning tool issues. showing up in Qt.
* | Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..Friedemann Kleint2010-02-095-21/+25
| | | | | | | | | | Reviewed-by: Trond Kjernåsen <trond@trolltech.com> Task-number: QTBUG-8046
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-082-18/+32
|\ \ | |/ |/| | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: generate code which does not break QT_USE_FAST_CONCATENATION with old gcc drastically improve load time of TS files
| * drastically improve load time of TS filesOswald Buddenhagen2010-02-082-18/+32
| | | | | | | | | | | | | | | | it isn't such a good idea to insert rows one by one into the model. so instead batch the "announcement" of new data. unloading single models is still slow, but that's a corner use case, so don't bother fixing it now, especially as it is harder to do it.
* | Remove the installer from the Qt sources.Thiago Macieira2010-02-0830-4972/+0
|/ | | | | | This copy of the installer doesn't work anymore. Reviewed-By: TrustMe
* don't use QKeySequence::mnemonic() after allOswald Buddenhagen2010-02-051-6/+23
| | | | | it wastes cpu cycles, and it started flooding the console with irrelevant messages.
* don't use stylesheet for just making labels boldOswald Buddenhagen2010-02-052-4/+6
|
* remove the rounded extra frame around the main message editorOswald Buddenhagen2010-02-051-4/+0
| | | | | | | | for one, it just added visual noise. second, it did not respect the color scheme, which made it unusable with light-on-dark colors. Task-number: QTBUG-7778
* Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-041-1/+3
| | | | | | | | | | | | | | | | | | | | Fix bug where all target types, including apps, plugins and static libraries were getting DEFFILE statements - now it's just libraries that get it. Fix bug where duplicate DEFFILE blocks were being added to projects that manually specified their own DEFFILE - this now tests for the qmake variable "defBlock" being set, and doesn't add additional DEFFILE statements if it is. NOTE: This means that adding DEFFILE statements to MMP_RULES manually should be done by creating a variable called defBlock, and adding that to the MMP_RULES (ie. MMP_RULES += defBlock) Fix bug in configure.exe, where using -nokia-developer for Windows builds would warn about Symbian DEF file usage (or lack thereof) Reviewed-by: Janne Koskinen Reviewed-by: Jason Barron
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-0228-77/+80
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant examples: Fix missing QLatin1String. Added Czech translations. Webkit: Fix missing namespace. qmake: subdirs template: make distclean target use QMAKE_DISTCLEAN qmake: fix warnings qmake: Remove macro and simplify string expression previously using it qmake: use isActiveConfig() instead of hand-crafting comparisons Fix missing namespace. Assistant: Fix spelling mistakes. Assistant: Use const references in foreach loops. optimization: get rid of QString::fromUtf16() usage document QString::fromUtf16() slowness remove duplicated calculation of length remove pointless conditionals micro-optimization optimize qhash() Designer/uic/related examples: Fix source code scanning issues II.
| * Added Czech translations.Pavel Fric2010-02-024-0/+4
| | | | | | | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Assistant: Fix spelling mistakes.ck2010-02-016-16/+16
| |
| * Assistant: Use const references in foreach loops.ck2010-02-0111-46/+46
| | | | | | | | Reviewed-by: kh1
| * optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
| * Designer/uic/related examples: Fix source code scanning issues II.Friedemann Kleint2010-02-0110-14/+13
| | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* | Revert "Update default FPU flags on Symbian to be softvfp+vfpv2"Iain2010-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | RVCT2.2 build 686 crashes when compiling the drawhelpers with VFPv2 enabled. Until compiler workaround found, back out the change. This reverts commit 297e84fcfed524687455d3d94161bf2a32f62d37. Conflicts: configure.exe
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-011-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Documented limitations of add/setLibraryPath(s) on Symbian OS Deployed QtMultimedia.dll on Symbian Fixed the URL of known issues wiki page in docs Fixing benchmark to be runnable on Symbian device Fixing test to be runnable on Symbian devices. Fixed no-timeout case for QProcess::waitForFinished in Symbian Add visibility-inlines-hidden for GCCE on Symbian OS Catch by reference rather than by value Fixing benchmark for Symbian Remove warning about Symbian DEF files when running configure for Windows List item margins are too small due to invalid pixel metric value Remove left over forward declarations Avoided the loss of preedit text when losing focus on Symbian. Added support for ifdeffing for manufacturer in generated pkg files Shortening and fixing previous fix for QTBUG-6371 Update default FPU flags on Symbian to be softvfp+vfpv2 Using RunFast mode for RVCT
| * Remove warning about Symbian DEF files when running configure for WindowsIain2010-01-291-1/+1
| | | | | | | | | | | | | | | | Move SYMBIAN_DEFFILES definition in the dictionary into the Symbian specific section of configure Task-number: QTBUG-6556 Reviewed-by: Simon Hausmann
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove left over forward declarations Avoided the loss of preedit text when losing focus on Symbian. Added support for ifdeffing for manufacturer in generated pkg files Shortening and fixing previous fix for QTBUG-6371 Update default FPU flags on Symbian to be softvfp+vfpv2 Using RunFast mode for RVCT
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-281-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove left over forward declarations Avoided the loss of preedit text when losing focus on Symbian. Added support for ifdeffing for manufacturer in generated pkg files Shortening and fixing previous fix for QTBUG-6371 Update default FPU flags on Symbian to be softvfp+vfpv2 Using RunFast mode for RVCT
| | | * Update default FPU flags on Symbian to be softvfp+vfpv2Iain2010-01-281-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Aleksandar Sasha Babic
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-011-10/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Fix unintended tr context change.
| * | | | Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c Contributed-by: Ritt Konstantin
* | | | audiodevices example: no devices availableKurt Korbatits2010-02-011-1/+4
|/ / / | | | | | | | | | | | | | | | | | | audio-backend option was not being written out to qconfig.pri Task-number:QTBUG-7782 Reviewed-by:Justin McPherson
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-2846-70/+68
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Fix source code scanning issues.
| * | Designer: Fix source code scanning issues.Friedemann Kleint2010-01-2846-70/+68
| | | | | | | | | | | | | | | Fix spelling errors, foreach()/QString usage, explicit constructors. Reviewed-By: Joerg Bornemann <joerg.bornemann@trolltech.com>
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-281-3/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a regression: icons with slightly wrong ICO header did not load. Fixed an endless loop if printing web pages. don't build unneeded QtDesigner parts on Windows CE Better support for user-generated binary shaders
| * | don't build unneeded QtDesigner parts on Windows CEJoerg Bornemann2010-01-281-3/+1
| |/ | | | | | | | | | | | | | | | | | | We just build uitools like on Symbian. The following subdirs have been removed from tools/designer/src/src.pro tools/designer/src/lib tools/designer/src/components Reviewed-by: mauricek
* | don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-272-13/+14
| | | | | | | | normalize the user input first
* | add directories with sources to list of project rootsOswald Buddenhagen2010-01-271-3/+12
| | | | | | | | | | | | | | | | if the pro file for the translations lives in a sibling tree of the actual source tree, messages from included headers wouldn't have been collected, as they were not considered part of the project. Task-number: QTBUG-7495
* | add -codecfortr optionOswald Buddenhagen2010-01-271-2/+17
| | | | | | | | this has always been kind of an omission ...
* | sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-271-95/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | previously, the semantics of nesting projects were pretty bizarre: the list of TS files grew ever as the subdirs were visited. the source files otoh were cleared for every project. this meant that some TS files were updated over and over again, each time with different data. this is obviously total nonsense, so there is no compatibilty to keep. so here come the new semantics: - each project is scanned separately. it has separate include paths and may override the inherited CODECFORSRC. - the messages from all sub-projects are merged - if a sub-project has a TRANSLATIONS entry, it is "detached" from its parent project, thus starting an own merged translator. it is also possible to name an empty set of TS files to simply exclude the sub-project. - CODECFORTR can be specified in each project with TRANSLATIONS - if TS files are specified on the command line, they override TRANSLATIONS from the top level project and stop processing of detached projects alltogether. if multiple top-level projects are specified, they are all merged. this is somewhat slower, as now includes are re-scanned per project, while previously all sources were simply accumulated and scanned as one project. this can be fixed retroactively if needed.
* | unshare pro post-processing codeOswald Buddenhagen2010-01-275-216/+73
| | | | | | | | | | lrelease needs only the TRANSLATIONS value anyway, so there is hardly anything to share for real
* | complain if both sources and projects are given on the cmdlineOswald Buddenhagen2010-01-271-0/+4
| |
* | still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-271-7/+7
| |
* | do not sort the TS filesOswald Buddenhagen2010-01-272-3/+1
| | | | | | | | really no point in doing so ...
* | fix bogus warning messageOswald Buddenhagen2010-01-271-4/+1
|/
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Pulse Build System2010-01-272-2/+5
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1: Designer: Add lower/raise to context menu.
| * Designer: Add lower/raise to context menu.Friedemann Kleint2010-01-272-2/+5
| | | | | | | | Task-number: QTCREATORBUG-592
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-272-8/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: (33 commits) Compile with no-webkit - add missing semi-colons. Fixes visibility update missing when doing setParentItem on graphicsitem Stabilize tst_QGraphicsScene::polishItems2 (new test) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor ...
| * | Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-2/+2
| | | | | | | | | | | | Reviewed-by: Sarah Smith
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-261-6/+22
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (30 commits) Fixed an infinite loop that could occur when reading invalid BMP images. Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. ...
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-251-6/+22
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (29 commits) Updated docs regarding QGLWidget::renderText() limitations. Added optimization flag to QGraphicsItemPrivate. Fixed child items with graphics effects not inheriting opacity. Made the trace replayer handle limited resolution cases better. Small optimization in raster paint engine. Another ASSERT while deleting spans Implement QDirectFBPixmapData::scroll Potential crash when adding items from QGraphicsWidget::polishEvent(). QGraphicsWidget is painted twice on the inital show. Fix QPainter::redirection() to pass autotest. Re-added the Close button in QPrintPreviewDialog for Mac/Carbon. revert parts of 10392eef4fd4f9 Fix y-inverted pixmaps properly. Fix rendering with simple shader in GL2 engine removed a debug trace Fix documentation bug in QColor Don't use a mutex lock in QPainter::redirection unless strictly required Only send QGraphicsItem::ParentChange(d) notifications from setParentItem. Pass value as const void *const to QGraphicsSceneIndex::itemChange. Optimize QGraphicsItem::setFlags. ...
| | | * Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-251-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | Simply skip the updates that are outside the replay widget's bounds. Reviewed-by: Gunnar Sletta
* | | | Updates to new Symbian DEF file systemIain2010-01-261-7/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in qbase.pri, where it tested QT_CONFIG instead of CONFIG to see if DEF files were enabled, when setting the DEF file path Fix bug in configure.exe implementation, where SYMBIAN_DEFFILES was defined when testing for its value, due to incorrect use of QMap::operator[] Tidy up configure.exe help for new def files option Task-number: QTBUG-6556 Reviewed-by: Jason Barron Reviewed-by: Janne Koskinen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-252-36/+67
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Use HighlightAllOccurrences to have highlighting after full text search.
generated by cgit v0.12 at 2024-11-25 21:55:20 (GMT)