summaryrefslogtreecommitdiffstats
path: root/src/plugins/plugins.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'refactor'Gunnar Sletta2011-09-131-8/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qws/linux-lsb-g++/qmake.conf src/gui/image/qpixmap_mac.cpp src/gui/painting/qpaintengine_x11.cpp src/gui/painting/qtessellator.cpp src/gui/text/qfontengine_qws.cpp src/gui/text/qfontengine_x11.cpp src/gui/widgets/qlinecontrol.cpp src/opengl/qgl.h src/opengl/qgl_x11egl.cpp src/plugins/plugins.pro Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
| * Add plugin mechanism to load platform input contextsJoona Petrell2011-09-081-1/+4
| | | | | | | | | | | | | | Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee Reviewed-on: http://codereview.qt-project.org/4482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * remove the plugin support for QInputContextLars Knoll2011-06-221-1/+0
| | | | | | | | | | This will be handled through the lighthouse plugin instead.
| * remove the graphicssystem code paths.Lars Knoll2011-05-031-1/+0
| | | | | | | | | | QPA's platform integration layer replaces the graphics system now.
| * QWS removal, part 2Lars Knoll2011-05-021-2/+1
| |
* | Fix -no-guiBernhard Rosenkraenzer2011-09-121-4/+6
|/ | | | | | | | | | | | | | | | | | -no-gui still tried to build the graphicssystem and inputmethod plugins, both of which require QtGui Merge-request: 1215 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit f0ae4f8ebdc6b7c50c163cfa29e686f3f87c8ba5) Conflicts: src/plugins/plugins.pro Change-Id: I74ced5817989604f3beebf1fcc60eabaf1fd8115 Reviewed-on: http://codereview.qt-project.org/4568 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Move QtSvg into a separate repositoryLiang Qi2011-04-271-1/+1
|
* Some changes for qtbaseMarius Storm-Olsen2011-04-271-3/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+17
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12