summaryrefslogtreecommitdiffstats
path: root/src/plugins/qpluginbase.pri
Commit message (Collapse)AuthorAgeFilesLines
* Add partial upgrade rules for Qt's pluginsShane Kearns2011-03-311-0/+19
| | | | | | | Allows testing of plugins such as bearer without needing to reinstall all of Qt. Equivalent to the rules in qbase.pri for the normal DLLs Reviewed-by: Miikka Heikkinen
* Long live Qt 4.8!Jason McDonald2010-04-221-1/+1
|
* Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
| * Bump version to 4.6.3.Jason McDonald2010-02-151-1/+1
| |
| * Bump version to 4.6.2.Jason McDonald2010-01-191-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Bump version to 4.6.1Jason McDonald2009-12-011-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Missing version number fixesJason McDonald2009-09-021-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Finish bumping version number to 4.7.0Jason McDonald2009-09-021-1/+1
|/ | | | Reviewed-by: Trust Me
* Trailing whitespace and tab/space fixes for src/pluginsJanne Anttila2009-08-041-1/+1
|
* Started suppressing some rather pointless warnings from RVCT.axis2009-07-061-0/+1
|
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-291-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
| * Bump Qt version number.Jason McDonald2009-06-251-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Remaining support for selfsigned Qt libs packages removed.Miikka Heikkinen2009-05-061-5/+1
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| * Change Qt version number to 4.5.2Thiago Macieira2009-04-241-1/+1
| | | | | | | | Reviewed-By: TrustMe
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+15
|
* Long live Qt for S60!axis2009-04-241-0/+24