summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Backport a few fixes to the Designer filteredit from CreatorJens Bache-Wiig2010-04-201-4/+10
| | | | | | | First problem is that there are too many animations triggered. Second problem is that it doesnt reflect the disabled state. Reviewed-by: thorbjorn
* Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| | | | | | Linking correct files to the qdocconf files Reviewed-by: Daniel Molkentin
* Quick fix to make the documentation work, needs a proper solution though.kh12010-04-193-4/+23
| | | | Reviewed-by: kh
* Fix the code for estimate whether the project is debug/release only in cetest.Liang Qi2010-04-191-2/+6
| | | | | Reviewed-by: Miikka Heikkinen Reviewed-by: Joerg Bornemann
* qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-194-141/+157
| | | | | | | To generate the offline docs, do nothing. To generate the online docs, add this to your qdocconf file: "online = true"
* Fix compile warning.Friedemann Kleint2010-04-191-1/+1
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1718-89/+1471
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits) Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation Autotest: update to the new values for the locale do not expand variables in read()'s file name remove ability to use break() a block outside any loop don't add -unix to the qmake command line Increase the timeout for the QNAM getter test to 30 seconds Remove unstable hosts from the list qdoc: Output TOC for more class ref pages. Other fixes to the remote network stresstester Fix SSL connection problem. Make sure we don't try URLs that aren't HTTP or HTTPS Fix menu bar visibility. Add SSL remote host tests Split the remote and the local tests in two, in preparation for SSL tests Add tests for remote hosts Change the way we calculate the average transfer rates. Finish renaming Move these tests to tests/manual. Add a QNetworkAccessManager stresstest Add a non-blocking native function too ...
| * don't add -unix to the qmake command lineOswald Buddenhagen2010-04-161-1/+0
| | | | | | | | | | | | it is redundant now and causes warnings from qmake Reviewed-by: mariusSO
| * qdoc: Output TOC for more class ref pages.Martin Smith2010-04-161-10/+6
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1610-179/+107
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1616-78/+1436
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Fix duplicate project entry in visual studio solution file. Doc qdoc: Added the index and fixed images in the extra files list. Speed up qsTr() by caching the translation context Crash while printing from the portedcanvas example on Mac Cocoa. qdoc: Fixed .qdocconf files for assistant. Disable debug-only framework builds on Mac. Compile (with -no-pch) Add missing QT_NO_BEARERMANAGEMENT ifdefs. Introduce a qconfig feature for Bearer Management Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac ...
| | | * qdoc: Added the index and fixed images in the extra files list.David Boddie2010-04-155-27/+30
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | qdoc: Improved TOC for class ref pages.Martin Smith2010-04-162-10/+39
| | |/ | |/|
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-1512-34/+76
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1512-71/+1317
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. ...
| | | * | Fix MOBILITY-404Wolfgang Beck2010-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | (Building Qt in namespace)
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-1411-71/+1315
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. ...
| | | | * | Added missing newline after warning message when using -L with qmlThorbjørn Lindeijer2010-04-141-1/+1
| | | | | |
| * | | | | qdoc: Fixed .qdocconf files for assistant.Martin Smith2010-04-154-4/+113
| | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-143-6/+16
| |\ \ \ \
| | * | | | Revert "Doc: Updating design files."Morten Engvoldsen2010-04-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d88dade723d5ddd86eea70ee4bf636c06b9f3962.
| | * | | | Remove statically allocated pixmaps through the post routineJarek Kobus2010-04-141-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid native pixmap object leaking remove statically allocated pixmaps through the post routine. Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-9815
| * | | | | qdoc: Removed all <table> attributes in favor of using css.Martin Smith2010-04-141-40/+25
| |/ / / /
| * | | | qdoc: Checked for empty title.Martin Smith2010-04-141-2/+4
| | | | |
| * | | | qdoc: Added TOC to class ref pages.Martin Smith2010-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't a full TOC yet. It only includes h1, h2, etc from the Detaled Description part. In many classes, there aren't any of these, so many classes won't have a TOC yet.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-149-26/+1272
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. Fix QTextDocument::undo() cursor positioning
| | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-138-15/+1248
| | |\ \ \ \
| | | * | | | Doc: Updating design files.Morten Engvoldsen2010-04-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | * | | | Doc: Fixing design bugs. Updating the index page and script/style files. ↵Morten Engvoldsen2010-04-138-13/+1246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding some image files. Reveiwed-by: trustme
| | * | | | | qdoc: Added TOC to module pages.Martin Smith2010-04-131-15/+19
| | |/ / / /
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-135-16/+58
| | |\ \ \ \
| | * | | | | qdoc: Changed <ul> elements in TOC.Martin Smith2010-04-131-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Each <ul> is now <ul class="leveli">, where i is 1..n.
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-27/+70
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtGuiu.def tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
| * | | | | | create magic comment messages in "finished" stateOswald Buddenhagen2010-04-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is really no point in marking them "unfinished". later file rewrites would reset the state anyway.
| * | | | | | make QT_TR_NOOP work in static initializersOswald Buddenhagen2010-04-151-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do that by ignoring all equal signs and everything between and including brackets. this makes static initializers look effectively like function definitions, thus creating proper context. Task-number: QTBUG-9276
| * | | | | | make HashString and HashStringList objects smallerOswald Buddenhagen2010-04-151-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qHash(QString) has only 28 bits, so we can use the upper bits for flagging whether the hash is valid. size effect: LP32: align(4, 4 + 4 + 1) = 12 vs. align(4, 4 + 4) = 8 LP64: align(8, 8 + 8 + 1) = 24 vs. align(8, 8 + 8) = 16 P64: align(8, 8 + 4 + 1) = 16 vs. align(8, 8 + 4) = 16
| * | | | | | remove pointless manual assignments from token type enumOswald Buddenhagen2010-04-151-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | making the range discontiguous just makes the switch() jump table bigger or not applicable at all.
* | | | | | | Update examples autotest to use the runtime directlyAaron Kennedy2010-04-152-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the test execution time
* | | | | | | Visual test updates.Michael Brasser2010-04-151-0/+18
| | | | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1413-86/+71
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-1413-86/+71
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
| | * | | | | 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
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | / / | | | | | |_|_|/ / | | | | |/| | | |
generated by cgit v0.12 at 2025-01-08 16:45:41 (GMT)