summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into oslo-staging-2/4.7Olivier Goffart2010-08-0917-151/+218
|\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/index.qdoc src/dbus/qdbusconnection.cpp src/gui/s60framework/qs60mainapplication.cpp src/gui/s60framework/qs60mainappui.cpp src/network/access/qnetworkrequest.cpp src/network/bearer/qnetworkconfiguration.h
| * Translation work for 4.7Pierre Rossi2010-08-061-0/+40
| | | | | | | | | | | | | | | | validating and adding some french translations. Plus all the fixes from Gabriel's extensive review. Doc: Fix a typo Reviewed-by: gabi
| * Some french translationsPierre Rossi2010-08-061-5/+17
| | | | | | | | Reviewed-by: gabi
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-061-4/+5
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-063-3/+7
| | |\
| | * | Doc: Fixing validation bugsMorten Engvoldsen2010-08-061-4/+5
| | | |
| * | | doc: Re-introduced next/previous page links in the footer.Martin Smith2010-08-061-0/+55
| | |/ | |/| | | | | | | Task-Nr: QTBUG-12278
| * | doc: Fixed some qdoc errors.Martin Smith2010-08-061-2/+5
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0614-140/+96
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| | * | Designer: Prevent rich text from being copied into style sheets.Friedemann Kleint2010-08-051-0/+1
| | |/ | | | | | | | | | | | | Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com> Task-number: QTCREATORBUG-1952
| | * qdoc: Removed three unused config variables.Martin Smith2010-08-058-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | These no longer do anything in qdocconf files: online = false offline = false creator = true
| | * qdoc: Cleaned up the application option specification and use.Martin Smith2010-08-055-116/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | The flags allowed on the command line are now: -online (default), -base, -assistant (same as -base), and -creator. If you don't specify one of these, you see a warning in the error output telling you that it didn't find an application flag and that it generated online docs by defualt.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-061-1/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/declarative/util/qdeclarativeanimation.cpp
| * | Increase maximum heap size of QML ViewerJoona Petrell2010-08-051-1/+1
| |/ | | | | | | | | Task-number: QTBUG-12029 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0510-11/+294
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-045-4/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
| | * Fix the remote command delimiter, this has cahnged at some point.kh12010-08-042-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
| | * Assistant: Revert previous commit, issue was already fixed.ck2010-08-041-2/+1
| | |
| | * Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBSMark Brand2010-08-042-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-046-6/+272
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Add support for -runtimegraphicssystem configure option runonphone - catch ctrl-c and terminate remote process before exit Skipped rcomp check on Raptor. Fix package header in cases where VERSION doesn't contain all values
| | * Add support for -runtimegraphicssystem configure optionJason Barron2010-08-041-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been requested that we provide a configuration option to specify the default "inner" graphics system that should be used when the runtime graphics system is in use. The argument specified to the option is written to the qconfig.h as QT_DEFAULT_RUNTIME_SYSTEM and this is used to instantiate the default graphics system that will be used by the runtime graphics system. Reviewed-by: Gunnar Sletta
| | * runonphone - catch ctrl-c and terminate remote process before exitShane Kearns2010-08-045-2/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trap SIGINT, SIGTERM, SIGHUP, SIGBREAK, SIGQUIT On receiving one of these signals, we first untrap them (so runonphone can be killed by a 2nd ctrl-c if needed), and send a terminate to the TRK launcher. This will kill the remote process if it's running, then disconnect from TRK cleanly. Task-number: QTBUG-12444 Reviewed-by: axis
| * | Assistant: Include QML docsck2010-08-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Surprisingly, the QML documentation is not integrated into the Qt docs, so it has to be explicitly included. Task-number: QTBUG-12625 Reviewed-by: kh1
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-032-1/+48
| |\ \ | | |/
| * | Doc: removing empty links in bread crumbMorten Engvoldsen2010-08-031-3/+3
| | |
* | | Doc: Fixed qdoc warnings.David Boddie2010-08-051-5/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0469-1964/+1469
|\ \ \ | | |/ | |/| | | | | | | Conflicts: doc/src/examples/qml-examples.qdoc
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-0312-79/+137
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-038-60/+61
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-027-59/+60
| | | |\
| | | | * doc: Fixed many qdoc errors.Martin Smith2010-08-021-0/+1
| | | | |
| | | | * qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconfMartin Smith2010-08-026-59/+59
| | | | |
| | | * | Doc: adding changes to getting started and fixing redirection linksMorten Engvoldsen2010-08-021-1/+1
| | | |/
| | * | Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-034-19/+76
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12142 Reviewed-by: Warwick Allison This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor), portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now works on Symbian, but it's hidden when orientation mode is set to auto-orientation. Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously it only updated values between portrait and landscape. If your application only supports landscape or portrait modes, just don't react to the inverted orientations. Added orientation example screenorientation under examples/declarative. The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows, Linux and Symbian^3.
| * | Made changes to qdoc to allow it to accept a "style level" flagJerome Pasion2010-08-032-1/+48
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-3024-193/+761
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Add missing image Mention scope of id uniqueness Update QML Documents example add license header doc: Add a note about QCoreApplication::applicationDirPath Add license header Add moving and flicking properties to PathView Improve utility of QMLViewer Add missing \l doc commands Document elements that are focus scopes. Remove use of shared NOTIFY signals in QGraphicsScale Remove use of shared NOTIFY signals
| | * add license headerHarald Fernengel2010-07-291-0/+41
| | |
| | * Add license headerHarald Fernengel2010-07-291-0/+41
| | | | | | | | | | | | Fixes the licenseCheck autotest
| | * Improve utility of QMLViewerAaron Kennedy2010-07-2924-193/+679
| | | | | | | | | | | | | | | | | | | | | Adds a startup animation for all platforms, and adds support for file associated and drag and drop on Mac OS X QTBUG-12496
| * | Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-292-8/+8
| |/ | | | | | | QTBUG-11938 and QTBUG-10801
| * Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-07-2612-78/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-231-27/+25
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc: Cleaned up the TOC for QML element pages. qdoc: Cleaned up the Inherits and Inherited by lines for QML elements. doc: Added missing \since 4.7 to effect propertyu.
| | * qdoc: Cleaned up the TOC for QML element pages.Martin Smith2010-07-231-5/+11
| | |
| | * qdoc: Cleaned up the Inherits and Inherited by lines for QML elements.Martin Smith2010-07-231-22/+14
| | |
| * | Make it possible for Qt modules to extend QT_CONFIGSimon Hausmann2010-07-231-0/+2
| |/ | | | | | | | | | | | | | | This is done by reading the module files from within qconfig.pri. Task-number: QTBUG-12379 Rubber-stamped-by: Joerg Bornemann Rubber-stamped-by: Marius Storm-Olsen
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2212-45/+265
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: If the QEventDispatcherGlibc causes warnings, it should say so Remove a warning message that no longer appears after all on Windows Drag & Drop failing in itemviews on Cocoa. qdoc: Removed debug code. qdoc: Fixed reporting of read-only status for QML properties. Fix the smallFont test failure for Mac and Linux Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| | * qdoc: Removed debug code.Martin Smith2010-07-221-1/+0
| | |
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-2233-1632/+169
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-212-3/+3
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| | | | * fix the export macros for the QtDBus moduleRomain Pokrzywka2010-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2439 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
generated by cgit v0.12 at 2024-12-29 04:25:43 (GMT)