summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-145-12/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-135-12/+11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-135-12/+11
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (48 commits) build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix Safeguard ourselves against corrupt registry values for cleartype gamma fix cetest build properly qdrawhelper: optimize the fetch transformed bilinear functions Compile fix for WinCE Make sure the selectionChanged signal is not called too much ...
| | | * fix cetest build properlyJoerg Bornemann2010-04-122-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f5b19c173109c53bf3d8167573f7276cf39262d2 broke the build for cetest. Reverting my initial naive attempt to fix this bd5d323373dbaf9d827126b77895da253128c1e5. We're introducing a new define for building qmake without generators. QT_QMAKE_PARSER_ONLY is used for cetest and the qmake COM wrapper of the Visual Studio Add-in. Reviewed-by: ossi
| | | * Merge commit 'internal-qt-repo/4.7' into oslo-staging-2/4.7Tom Cooksey2010-04-124-60/+242
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/ds9/mediaobject.cpp
| | | * | Build fix for mingwThierry Bastian2010-04-092-9/+7
| | | | |
| | | * | Make configure.exe compatible with mingw 64Thierry Bastian2010-04-081-1/+1
| | | | |
* | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-04-141-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Revert change 07c347f54 from 4.6. Implement some changes to the AIX xlC mkspec suggested by IBM. Fixed app freeze if switching to offline in middle of HTTP transaction. Document Symbian platform security requirements on Qt APIs Fixed app freeze if switching to offline in middle of HTTP transaction. CSS: fixes border only affecting the first widget. Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch. fix closing state in QLocalSocket on Windows Fix segfault, if QPixmap::loadFromData() fails Don't build QtXmlPatterns' command line tools on Symbian.
| * \ \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-1/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Don't build QtXmlPatterns' command line tools on Symbian.Frans Englich2010-04-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Brought up by Espen. Reviewed-by: Espen Riskedal
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-147-73/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix writing duplicate headers' properties in designer. Fix dealing with the default dynamic properties of string type. Use unifiedToolBarOnMac, by default don't show some tool action.
| * | | | | | Fix writing duplicate headers' properties in designer.Jarek Kobus2010-04-132-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Designer has written verticalHeaderVisible property in ui file twice: once done implicitly while saving the fake properties and once done explicitly inside QDesignerResource by calling saveWidget(QTableView/QTreeView). The latter is removed as it is redundant now. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9351
| * | | | | | Fix dealing with the default dynamic properties of string type.Jarek Kobus2010-04-131-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed showing, changing and resetting of default dynamic properties of string and keysequence type. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9603
| * | | | | | Use unifiedToolBarOnMac, by default don't show some tool action.Jarek Kobus2010-04-134-1/+43
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tool actions are hidden by default (undo/redo, cut.copy.paste), the user can bring them back by using View|Toolbars|Configure Toolbars dialog. Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * | | | | Make compile on SymbianThomas Zander2010-04-121-1/+1
| |/ / / /
* | | | | Assistant: Handle forward/backward mouse buttons on press on Linux.ck2010-04-135-16/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Written-by: kh1 Reviewed-by: ck
* | | | | qdoc: Fixed some TOC links.Martin Smith2010-04-131-1/+0
| | | | |
* | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-138-30/+82
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1328-95/+491
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| | * | | | make a partial build of linguist in no-gui configOswald Buddenhagen2010-04-122-2/+3
| | | | | |
| | * | | | make the code less of a trapOswald Buddenhagen2010-04-121-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not very wise to use += first, and then to overwrite everything with =. use proper scoping instead. Reviewed-by: joerg
| | * | | | Partially revert MR 543 changes to Linguist.Thiago Macieira2010-04-122-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whatever this is doing, it breaks the build on Windows CE/Mobile. This has stopped oslo-staging-1 from integrating for over a week now. Not reviewed. This patch is a blind attempt at fixing the issue.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-127-15/+63
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits) Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes Start documenting coding conventions Adds missing qml file to qdeclarativeflipable autotest Revert "Better reporting of extension plugin loading errors." Doc Fix graphicswidget auto-test. Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. ...
| | * | | | WarningAaron Kennedy2010-04-121-1/+1
| | | | | |
| | * | | | Read Maemo orientation at startupAaron Kennedy2010-04-121-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | QT-2695
| | * | | | Add Mac OS X bundle description for qml runtimeKai Koehne2010-04-092-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, it's now Qml.app instead of qml.app. An icon is still missing. Reviewed-by: con
| | * | | | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-091-2/+2
| | | | | |
| | * | | | Tune plugin import mechanismmae2010-04-083-5/+36
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In shadow build environments, we cannot enforce that shared library objects for plugins are located in the same directory as the qmldir file. This makes it hard for Creator to support mixed projects (qml/c++). In order to gain more flexibility, the patch introduces a pluginPathList to QDeclarativeEngine, which completes the existing importsPathList. The pluginPathList defaults to ["."], which indicates the directory where the qmldir file is located in. The qml viewer tool gains a command line option -P to add to the pluginPathList. For consistency, the -L option ("Library") has been renamed to -I ("Import"). QDeclarativeEngine::importExtension() has been renamed to QDeclarativeEngine::importPlugin(). The documentation has been adjusted accordingly. Done with erikv. Reviewed-by: erikv
* | | | | qdoc: Added new table of contents for non-class ref pagesMartin Smith2010-04-133-3/+76
| |_|/ / |/| | | | | | | | | | | This feature is not complete in this commit.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1228-95/+487
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * | | Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too.Thiago Macieira2010-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ossi is right: on WinCE, _setmode is different from regular Windows and the docs... Reviewed-by: ossi
| * | | the _setmode() prototype is different on win ceOswald Buddenhagen2010-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | ... both from windows and the wince doc ... Reviewed-by: joerg
| * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-094-11/+30
| |\ \ \
| | * | | fcntl.h doesn't seem to exist, either - contrary to an example on msdnOswald Buddenhagen2010-04-091-2/+2
| | | | |
| | * | | fix compile on winceOswald Buddenhagen2010-04-091-2/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| | * | | remove CONFIG += ordered againOswald Buddenhagen2010-04-091-1/+0
| | | | |
| | * | | Assistant: Check namespace and virtual folder syntax of help projects.ck2010-04-081-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4519 Reviewed-by: kh1
| | * | | Fix build after MR 543 merged.Thiago Macieira2010-04-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmlviewer is now called simply qml, and the debugger is not in Qt sources anymore. Reviewed-by: Bradley T. Hughes
| * | | | qdoc: Changed qdoc to output the new doc format.Martin Smith2010-04-0919-45/+351
| |/ / / | | | | | | | | | | | | Very cool.
| * | | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-073-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * | | Fix missing natively supported mime types for help viewer.kh12010-04-073-19/+61
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9651 Reviewed-by: ck
| * | | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0736-1433/+2
| | | | | | | | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
| * | | qdoc: Added many png, js, and css files for new format.Martin Smith2010-04-0737-0/+1438
| | | | | | | | | | | | | | | | | | | | | | | | Coming soon! Task: QTBUG-9504
| * | | qdoc: Added <div> elements to some html output for Fake nodes.Martin Smith2010-04-061-4/+8
| |/ / | | | | | | | | | Task: QTBUG-9504
* | | Add --download option to runonphoneShane Kearns2010-04-071-36/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runonphone --download <remote file> <local file> Can be used to copy files from the phone to the PC. Typical use would be to get a test log, for example: runonphone -s tst_qdir.sis -d c:\data\log.txt c:\temp\log.txt tst_qdir.exe -o c:\temp\log.txt Reviewed-by: Thomas Zander
* | | Implement download support to TRK LauncherShane Kearns2010-04-073-24/+200
|/ / | | | | | | | | | | | | | | | | | | | | Use the TRK protocol to copy a file from the phone to PC after running the executable. This can be used for example to download a log file containing test results. Submitted upstream as commit 9b65c244d7027d78f0b40450961eab68680d6269. Reviewed-by: Friedemann Kleint
* | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-051-5/+0
| | | | | | | | | | | | | | This of course requires installing libdbus compiled for Windows CE too. Task-number: QTBUG-9582 Patch-by: Romain Pokrzywka (from KDAB)
* | Fix compilation: Linguist uses QtDeclarative .cpp and private headersThiago Macieira2010-04-021-1/+1
| |
* | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-019-42/+222
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/proxywidgets/proxywidgets.pro examples/declarative/widgets/mywidgets.pro examples/declarative/widgets/widgets.pro
generated by cgit v0.12 at 2024-12-29 06:20:53 (GMT)