summaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Revert "Disable activeqt on win32-g++ (it doesn't build)."Jonathan Liu2012-01-171-1/+1
| | | | | | | | | | 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>
* Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-1/+1
| | | | | Merge-request: 1336 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move qmldump from Qt Creator to Qt.Christian Kamm2011-05-121-1/+4
| | | | | | | | | | | | Also rename it to qmlplugindump. Qmlplugindump is a tool that loads a QML module and prints type information about the types contained in its plugins to the standard output. Reviewed-by: Aaron Kennedy Change-Id: I7c35c34af23adc1c37453393d71e492dedfc6a9b (cherry picked from b5265d4e99e5c90532e190632951070cf1a2b630)
* Don't compile qtconfig on symbianOlivier Goffart2011-02-281-1/+1
| | | | Reviewed-by: Benjamin Poulain
* Remove qt3support dependency of qtconfigOlivier Goffart2011-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | Revert "Revert the integration of the merge request 2286." This reverts commit e3edad83a1e6e99a551d40d4118352435c6dd710. This had been submitted in the Qt 4.7, but reverted because the change was to intrusive to be pushed in a stable branch. Now re-apply the change in master. Conflicts: tools/qtconfig/mainwindowbase.cpp tools/qtconfig/mainwindowbase.h tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.h tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.cpp tools/qtconfig/previewwidgetbase.h tools/qtconfig/previewwidgetbase.ui tools/tools.pro
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-271-0/+4
|\ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.h
| * Fixed compilation and API of meego graphics system helper.Samuel Rødal2010-09-101-0/+4
| |
* | Adding -qpa configure switchJørgen Lind2010-06-241-1/+1
| | | | | | | | also renaming the embedded_lite qmake switch to be qpa
* | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-211-20/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/kernel/qapplication.cpp src/gui/painting/qbackingstore.cpp src/opengl/qgl.cpp src/opengl/qgl_p.h src/plugins/plugins.pro tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir tools/tools.pro
| * 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
| * | | make a partial build of linguist in no-gui configOswald Buddenhagen2010-04-121-1/+2
| | | |
| * | | 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-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | 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
| * | | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-18/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-03-011-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: configure src/gui/egl/qegl.cpp src/gui/kernel/qdnd_p.h
| * | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-1/+1
| | | | | | | | | | | | QDeclarativeXXX.
| * | Remove standalone QmlDebugger. It is now only available through theBea Lam2010-02-161-1/+1
| |/ | | | | | | plugin in the Creator repo.
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-0/+2
|\ \ | |/ | | | | | | | | | | Conflicts: configure src/corelib/global/qglobal.cpp src/gui/dialogs/dialogs.pri
| * make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-041-0/+2
| | | | | | | | | | | | needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-191-0/+1
|\ \ | |/ | | | | | | | | Conflicts: configure src/plugins/graphicssystems/graphicssystems.pro
| * Declarative building infrastructure.Warwick Allison2009-11-041-0/+1
| | | | | | | | Does nothing if no declarative directories installed.
* | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-071-1/+1
|/ | | | | | | | | | | Lighthouse is a lighter, nimbler version of Qt/Embedded, which does not contain a window system. Instead, it uses graphics system plugins to provide the necessary functionality or interface with existing window systems. The first version was written by Rhys. Squashed commit.
* Added trace graphics system for painting performance profiling.Samuel Rødal2009-09-031-1/+2
| | | | | | | | | | When running an application with graphics system trace everything that gets painted to the window surface is proxied through a QPaintBuffer, which is then both streamed to a trace file and replayed on a raster window surface. The trace file can then be replayed with tools/qttracereplay to measure pure painting performance. Reviewed-by: Gunnar Sletta
* Merge commit 'origin/master'Jason Barron2009-08-041-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
| * Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-271-0/+1
| |
* | Merge commit 'qt-mainline/master'Tobias Koenig2009-06-041-1/+1
|\ \ | |/
| * Only build the QWS keymap converter in embedded builds.Robert Griebl2009-05-141-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Add W3C XML Schema validation supportTobias Koenig2009-05-161-1/+1
|/ | | | | | | | | This was done by Tobias Koenig, as part of an internship at Trolltech/Qt Software, started at Wed Oct 1 18:32:43 2008 +0200, and the last commit being part of this commit dating Tue Feb 24 11:03:36 2009 +0100. This is work consisting of about 650 commits squashed into one, where the first commit was 61b280386c1905a15690fdd917dcbc8eb09b6283, in the repository before Qt's history cut.
* Merge branch '4.5'Thiago Macieira2009-04-201-1/+1
|\ | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| | | | | | | | | | | | | | Updated the project files and headers necessary for enabling this. Reviewed-by: Thiago Macieira Reviewed-by: Jens Bache-Wiig
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+30
|
* Keymap support for QWS.Robert Griebl2009-04-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for keymaps to the QWSKeyboardHandler. The keymaps can be generated by the kmap2qmap tool (see tools/ directory). The source keymaps can be standard Linux .kmap files. Changes to Qt: * completely refactored the Tty and Usb (now known as LinuxInput) handlers * removed the LinuxIS plugin (handled by LinuxInput now) * removed support for iPAQ, EBX and Zylonite keypads (obsolete hardware) * removed support for RAW tty mode. This could be re-added, for non-Linux systems by implementing a PC/AT scan-code to Linux keycode converter. New features for Tty and LinuxInput (ex Usb) handlers: * support for keymaps QWS_KEYBOARD=..:keymap=/path/to/x.qmap:.. * support for dead keys and the compose key * support for lock LEDs * support for key repeat rates (in ms): QWS_KEYBOARD=..:repeat-delay=x:repear-rate=y:.. * the default keymap supports latin1 composing via AltGr: QWS_KEYBOARD=..:enable-compose:.. * ctrl+alt+backspace application zapping can be disabled: QWS_KEYBOARD=..:disable-zap:.. * added virtual filter functions to both the Tty and the LinuxInput handlers. (QWSKeyboardHandler::processKeycode should be virtual in the first place, but that would be BIC) Still missing: * extended documentation for QWS_KEYBOARD Reviewed-By: Paul Olav Tvete Reviewed-By: Harald Fernengel
* Long live Qt!Lars Knoll2009-03-231-0/+30