summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Bump Qt version to 4.8.2aksalova2012-04-1810-31/+31
| | | | | | | | Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix compilation when QT_NO_CURSOR is definedRomain Pokrzywka2012-04-102-0/+10
| | | | | | | | | | Although the QtDesigner module isn't built by default on embedded platforms, it's sometimes needed, mainly for dynamic form loading. The library contains a couple of setCursor calls which should then be #ifdef'd, as it's often a disabled feature for embedded UIs. Change-Id: I92d91249905848e73ee933e6f057a30b9cacb03c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fixed build failure in tools/qml for HarmattanGareth Stockwell2012-04-051-11/+11
| | | | | Change-Id: I6fb26f2da3ff78dd20d06941ae1aedd059f116ff Reviewed-by: Martin Jones <martin.jones@nokia.com>
* compile without rttiOswald Buddenhagen2012-03-201-1/+1
| | | | | | | | no point in it Change-Id: Id6ad95c197095131c6c100afe37b3d48adb157d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit dc810b81a38a2a4d33f6909ff213809e1bf384ca)
* remove pointless include pathsOswald Buddenhagen2012-03-201-6/+0
| | | | | | | | we rely on a syncqt'd tree anyway Change-Id: I23b288b98a5e9289993b058f7dce02e19564c67a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 946501ab350f0c3dbaf163c03415f459efb8c6bd)
* properly enable stl via qmake instead of hacking compiler flagsOswald Buddenhagen2012-03-201-2/+1
| | | | | | Change-Id: I2c037c9a28043afe53167a766bce7c9d09b8f3a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit cb03577711a7dddd6444c0f6114fbf3785552353)
* build with QT_NO_GEOM_VARIANTOswald Buddenhagen2012-03-201-5/+1
| | | | | | | | saves us some pointless code Change-Id: I24e4fe4107f44ab579c0f951551c4138713a749f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2091d4c33a0f20e44f64ecf9953bb7725ceed287)
* add missing errno.h includeOswald Buddenhagen2012-03-201-0/+1
| | | | | | | | it was masked by the precompiled header Change-Id: I9ba7b0faa716cfa6844b9a9f81fa2a3aa67f5da4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 2b969b89b95317f04bd562aee3528cab227e57b8)
* remove bizarre magic from precompiled headerOswald Buddenhagen2012-03-201-26/+1
| | | | | | | | it doesn't serve any puropse (any more?) and it breaks the mingw build. Change-Id: I02a5e7502586e7e9f5956991498ff602eff66e81 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> (cherry picked from commit 0678a7db8e8eb6997b0acb106dd4347ef8c76fbe)
* Update the links in the titlebar of Online HTML template.Casper van Donderen2012-03-173-6/+6
| | | | | | | | The links were still pointing to old URLs, this change changes the links to point to qt-project.org Change-Id: Ie0b7b5aef693c54174e5400d6a16bdbfb540c763 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fix compiling qvfb on Linux/X11Pasi Petäjäjärvi2012-03-151-2/+0
| | | | | | | | | | | | | Qvfb fails to compile on linux. Fixed by removing duplicate source and header file inclusion from qvfb.pro file when embedded flag is not set in CONFIG. Task-number: QTBUG-19804 Change-Id: I09278c8042204f913ca2c2bbdee4d4163fae213d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix generating the qdoc3 manual in 4.8Casper van Donderen2012-03-142-3/+4
| | | | | | | | There were some qdoc errors when generating the qdoc manual. This change fixes thoise qdoc errors. Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Update the footer for qdoc output for qt-project.Casper van Donderen2012-03-148-116/+114
| | | | | Change-Id: I6518c03715cd485330a6550bd62d385477a45c7a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fixed warnings from configureRobert Loehning2012-03-066-12/+12
| | | | | Change-Id: I509c72c6a54f06cbecef556fd3f4d0bc9d1fc369 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Bump Qt version to 4.8.1Girish Ramakrishnan2012-03-0510-31/+31
| | | | | | | | Change-Id: I117e5dcd45397a9fbd1f033fc745ada00c221721 Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fixed CeTest remotelib build for WinCE 5.jaanttil2012-02-071-1/+1
| | | | | | | | | | WinCE 5 does not have PPN_POWERBUTTONPRESSED but PPN_SUSPENDKEYPRESSED. Newer WinCE version have both, but PPN_POWERBUTTONPRESSED is defined to same as PPN_SUSPENKEYPRESSED, that's why it is safe to use PPN_SUSPENKEYPRESSED in all WinCE versions. Change-Id: Ida0604f86330c3e833a1ad41a88db55aa6a625fa Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove unnecessary codeblock.Casper van Donderen2012-02-071-9/+0
| | | | | | | Fixes: QTBUG-24082 Change-Id: I000e397983d3f26b49ffc9cc61f0d4e20583e6ee Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Add concurrent to QT_CONFIGSamuli Piippo2012-02-061-0/+2
| | | | | | | | cherry-picked from qtbase d21f28956e494baae311dc6d8f9dfbd4448965b5 cherry-picked from qtbase 7c64ab4966e24834768eb1a09b3d2fd08471787a Change-Id: I8f7f9991fa197e737fe7f9af0ab949a5d48e7069 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed cetest build for Windows CE.jaanttil2012-02-061-1/+3
| | | | | | | | | | | | The bootstrap configuration for cetest was missing a few dependencies which broke the build. Added the missing dependencies to cetest bootstrapped.pri. Task-number: QTBUG-22505 Change-Id: Ibf966f9855f7eb8a7e561ea570c17ff447aa057d Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Windows configure: make -mp affect the Qt build itselfJoerg Bornemann2012-02-021-3/+4
| | | | | | | | | | | Before -mp and -no-mp affected only projects built with Qt. There was no way to turn off msvc_mp for the Qt build. Qt projects can add msvc_mp themselves. Task-number: QTBUG-23929 Change-Id: I2f9f038ae64acec545fcd038842bba92a8736af4 (cherry picked from commit 41a5ca35591a735d9f07e2335d5827763d52c1f4) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Disable qmlplugindump build for WinCE.jaanttil2012-02-021-1/+1
| | | | | | | | Task-number: QTBUG-22518 Change-Id: Ief49bcc0895ad70bf2677b03a92caaa78b599340 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Make configure not complain about missing perl for non-dev. builds.Markku Heikkila2012-02-011-5/+11
| | | | | | | | | Fixed so that configure.exe is consistent with unix configure. Task-number: QTBUG-5710 Change-Id: I74f35ea269e9ca6648866542a2bd1a15cda09ac0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add the possibility to patch additional executables.Eike Ziller2012-01-253-22/+50
| | | | | Change-Id: I47ecf04f538e094fe67110e627a5f17a34438df9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Revert "Disable activeqt on win32-g++ (it doesn't build)."Jonathan Liu2012-01-172-2/+2
| | | | | | | | | | the change is bogus; people were actually building it successfully. This reverts commit 0c70be512bfc40e8a2a09f60a66b7ecb114e748e Change-Id: I641fac34b78d6c23ead143d34a8ae15bf191cae3 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Ray Donnelly <mingw.android@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1113-13/+13
| | | | | | | | Manually update strings that did not get fixed by previous search-and-replace. Change-Id: Ie9ff57f08ce0dcf91d28620fa2dc9eeb8e98481e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-111232-1244/+1244
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Also correctly apply stack size difference in MSVC2008Casper van Donderen2011-12-301-2/+2
| | | | | The quotes around the stack size are not parsed correctly in MSVC2008, MSVC2010 accepts both the version with and without quotes.
* Add a default alt attribute to img tags.Casper van Donderen2011-12-301-0/+2
| | | | | | | The output HTML did not pass validation without a default alt attribute. Reviewed-by: Kevin Wright
* Revert variable overwritten by copying from Qt5Casper van Donderen2011-12-221-1/+1
| | | | Reviewed-by: Trust me
* New style sheet for offline (QCH) documentationCasper van Donderen2011-12-222-1/+19
| | | | | This stylesheet makes the Qt Reference docs look the same as the Qt Creator docs.
* Fix a bug where 'int' is not printed in snippets.Casper van Donderen2011-12-191-1/+2
| | | | Reviewed-By: Trust Me
* qmlplugindump: Fix missing flush for objects that don't fit a line.Christian Kamm2011-12-021-2/+1
| | | | | | | | | The missing flush could result in script bindings appearing after the closing brace of an object. Change-Id: If05764619668cc4a86f7364f6cd7feeb0d6f6e32 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> (backported from e01219b77b1e889e70437635905d7ff820568e23)
* qmlplugindump: Avoid reporting types as attaching to themselves.Christian Kamm2011-12-021-2/+6
| | | | | | | Task-number: QTCREATORBUG-6625 Change-Id: I9f778757b490cb5d79249b92f8c7b6d9d1df66e6 Reviewed-by: Leandro Melo <leandro.melo@nokia.com> (backported from 409aecbe1e30aa1319ea72bf830c405827e13d21)
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-12-015-10/+22
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix stack overwrite in QDBusDemarshaller Qt Linguist: Fix crashes fixed error generating wrong introspection string in header output file
| * Qt Linguist: Fix crashesTakumi ASAKI2011-11-304-9/+19
| | | | | | | | | | | | | | | | Fix crash when select translation after close and open file. This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20 Merge-request: 1480 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * fixed error generating wrong introspection string in header output fileRalf Habacker2011-11-301-1/+3
| | | | | | | | | | | | | | | | | | When using dbus introspection files with CRLF encoding the CR is not handled and results into a CR code at a wrong location in the output file Task-number: QTBUG-17634 Merge-request: 1478 Reviewed-by: thiago
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-11-2913-0/+0
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Set execution bits for more scripts. Set execution bits for .test files. Fix more permissions (no execute bit). Fix permission (no execute bit). QGraphicsLayoutItem - bound constraint the minimum and maximum size Notify X11 of its resizable state through MWM Hints.
| * Fix permission (no execute bit).Frederik Gladhorn2011-11-2213-0/+0
| |
* | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-262-2/+2
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-222-2/+2
| |\ \ | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team: Doc: Fixing typo
| | * | Doc: Fixing typoSergio Ahumada2011-08-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reducing the amount of spelling errors from NBN. Change-Id: I9b228bb95b4a757cff57595125009e70b0097d86 Reviewed-by: Rohan McGovern
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-11-231-5/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Sequential reading not supported. DeclarativeDebugServer: Instantiate QPluginLoader on heap Fix failing unit tests. qmlplugindump: Fix dumping empty names for generated QMetaObjects. Fix compile with -qtnamespace Properly protect access to pixmap reader thread with mutex Move tga support from Qt3d to Qt. Move tga support from Qt3d to Qt. Properly protect access to pixmap reader thread with mutex qmlplugindump: Add flush to fix output redirection on windows.
| * | | | qmlplugindump: Fix dumping empty names for generated QMetaObjects.Christian Kamm2011-11-161-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-6543 Reviewed-by: Roberto Raggi
| * | | | qmlplugindump: Add flush to fix output redirection on windows.Christian Kamm2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-5825
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-11-223-0/+39
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (72 commits) Add note to declarative calculator example Help: Add \depends to all declarative examples & demos Declarative Examples: Fall back to local qmlapplicationviewer. Fix qdoc output for <dependency> tag. Change installation location of examples. Add Symbian platform notes. Fix "make install" for declarative examples Add C++11 support and QThreadLocalStorage changes to docs. Update the license in the qmlapplicationviewer. Examples: Add Copright headers, Remove stray file. Compile fix. Fix use of qmlapplicationviewer. Doc: Create relative pathes in Manifest files. Doc: Copy manifest files to the places where Creator expects them. qdoc3: qdoc supports \depends in 4.8 qdoc3: qdoc supports \depends in 4.8 Update qrc files. Update qmlapplicationviewer template, cppextensions/qgraphicslayout example corrections demos/declarative/snake example corrections ...
| * | | | Fix qdoc output for <dependency> tag.Daniel Molkentin2011-11-221-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also prepend relative path if required. Reviewed-By: trustme
| * | | | Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-11-223-0/+22
| |\ \ \ \
| | * | | | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <dependency>$QTDIR/examples/qmlapplicationviewer</dependency> </example> Task-number: QTBUG-22838
| | * | | | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-213-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what you write... /*! \example designer/calculatorbuilder \depends examples/qmlapplicationviewer \title Calculator Builder Example This is what you get... <example name="Calculator Builder Example" docUrl="qthelp://com.trolltech.qt.480/qdoc/designer-calculatorbuilder.html" projectPath="designer/calculatorbuilder/calculatorbuilder.pro" imageUrl="qthelp://com.trolltech.qt.480/qdoc/images/calculatorbuilder-example.png"> <description><![CDATA[The Calculator Builder example shows how to create a user interface from a Qt Designer form at run-time, using the QUiLoader class.]]></description> <tags>calculator,builder</tags> <fileToOpen>designer/calculatorbuilder/main.cpp</fileToOpen> <depends>../../examples/qmlapplicationviewer</depends> </example> Task-number: QTBUG-22838
| * | | | | Compile fix.Daniel Molkentin2011-11-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2024-09-25 08:27:54 (GMT)