summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers and add new license filesv5.4.0-alpha1Jani Heikkinen2014-08-2626-1100/+715
| | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Ib9c4cfb6651a523e2da710f0a71586ec84538007 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* Fix cmake test.Friedemann Kleint2014-08-261-1/+1
| | | | | | | | The shared source file axutils.cpp uses a function from the widgets module, thus it needs to be added. Change-Id: I5e4dab48d9c0ae286ef003105db832330529070c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I383077c8b6d6d353037917ebc620af7175180f13 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-06-261-4/+4
|\
| * Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-06-261-4/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I960f1a6f538f71b8511e21c8e87066353904da10
| | * Don't use QT_STATIC_CONST herev5.3.2Thiago Macieira2014-06-201-4/+4
| | | | | | | | | | | | | | | | | | | | | It makes no sense. Let's get rid of the macro. Change-Id: I82d56cd506cc041767889f6693e46aa44ed8eb7a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * Bump versionOswald Buddenhagen2014-06-181-1/+1
| | | | | | | | | | | | Change-Id: I5854f37c7c98c6948e6f5ecc4164946d951ea186
* | | Skip OpenGL 1.x example in dynamic GL buildsLaszlo Agocs2014-06-261-1/+1
|/ / | | | | | | | | Change-Id: I06b98ef9dbabbcdddcd77d4fd6f4400e54d90b0c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-090-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7a53a0601021edff1cb5acb3e2f7924512a27e3c
| * Bump MODULE_VERSION to 5.3.1v5.3.1Sergio Ahumada2014-04-221-1/+1
| | | | | | | | | | Change-Id: I966aae81ff0901ab81b96e0e69ffcbfe2acb7ea1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-111-1/+1
|\| | | | | | | Change-Id: Iecfdb8ade389de76c49e556dc4d8925c9100dd13
| * Doc: Fix filter name for Assistantv5.3.0-rc1v5.3.0Topi Reinio2014-04-031-1/+1
| | | | | | | | | | | | | | | | Use bookcase for the Active Qt documentation filter, like the reset of the modules do. Change-Id: I4de24a79308d877dacb146704adbff651af0be5b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-249-17/+232
|\| | | | | | | Change-Id: I5280698b889fb43d0461793f83855c0d97d5caa2
| * Hide internal type and function of QAxBase from qdoc.Friedemann Kleint2014-03-241-0/+10
| | | | | | | | | | Change-Id: Ie41eb82d0c781e54296d92016a8d6f465be7fe5c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Polish the webbrowser example.v5.3.0-beta1Friedemann Kleint2014-03-044-11/+216
| | | | | | | | | | | | | | | | | | | | Update address edit when the browser finishes loading. Add some rudimentary bookmark/history functionality. Add relevant default bookmarks and make qt-project.org the start page. Handle URLs passed on the command line. Change-Id: I21efeb5b4d2a05941407d308a96df7b024100f19 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Fix some typosSergio Ahumada2014-03-034-6/+6
| | | | | | | | | | Change-Id: I662e9b8fe644571fc7216a96f1dacfdc274a0e4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-243-42/+7
|\| | | | | | | Change-Id: I5025f2136d4e1ab80095032052d15d115a20ba45
| * Webbrowser example: Fix crash due to deprecated code.v5.3.0-alpha1Friedemann Kleint2014-02-203-42/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The example uses a Qt Designer form with widgets on a QToolBar imported from Qt 3 which is not supported in Qt 4 and later. In the code generated by uic, a QLabel is constructed passing the toolbar as parent and added to the toolbar using QToolBar::addWidget() which then causes a crash in Qt 4. Move the widgets from the form into the class to avoid this. Task-number: QTBUG-36948 Change-Id: Ia4af871ce99faf555bebc6ebde19bcae0de4d29e Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Bump module version to 5.4.0Thiago Macieira2014-02-201-1/+1
|/ | | | | | Change-Id: I8d376c67efe0a9b9675bf78ca39f2168da8c643f Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-122-1/+29
|\ | | | | | | Change-Id: I5eed3f81fe220f82d1eba27d7e7a62803fea5e49
| * Merge remote-tracking branch 'origin/release' into stableold/5.2Frederik Gladhorn2014-01-271-0/+28
| |\ | | | | | | | | | Change-Id: Icbc8dda64ebc3591a1cf8751ce513ab843d5233f
| | * Update changelog for 5.2.1v5.2.1Thiago Macieira2014-01-231-0/+28
| | | | | | | | | | | | | | | Change-Id: Ieca0a1ed696a81019c8a0d223c6511b3ed6f0201 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * | Doc: Fix typoRobert Loehning2014-01-231-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I4975f634da1b02e90e84f704583e5cabdf277e5a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Skip compilation on WinRTMaurice Kalinowski2014-01-243-4/+4
| | | | | | | | | | | | | | | | | | | | | Still allow creating documentation like on other platforms. Change-Id: Ie09ec71bca129d7194c19883cc5f4893fd650663 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | | Replace win32-g++ with mingw scopeKai Koehne2014-01-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I36449cfa199db8bd25ffb0f7b384346cd74897d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | whitespace fixesOswald Buddenhagen2014-01-2057-2050/+2050
| | | | | | | | | | | | | | | | | | | | | expand tabs, fix indentation, remove trailing whitespace. Change-Id: Ibec1bbad9e8faff81671ce9d1c7bb4fb9b340bb9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I79653f486b1c67f5dc2647847b4f79fa8b5f593f
| * | Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| |/ | | | | | | | | Change-Id: Ia101e6e6f0aa4ff113fa9dd702a4ecdd4f335366 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-103-3/+3
|\| | | | | | | Change-Id: Ia6e9b1180bd3125a40bf7f244fbf4c9b0e9766a2
| * Doc: Fix broken links and "Cannot find base function" errorsSze Howe Koh2014-01-093-3/+3
| | | | | | | | | | | | | | "qtgui" dependency is not needed, but others are. Change-Id: I883f0c3dd2c41b9073231bae5b1eccffc76e140c Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Prospective build fix on Windows for explicit QMetaStringTable constructorSimon Hausmann2013-12-241-1/+4
| | | | | | | | | | | | | | See build failure in https://codereview.qt-project.org/#change,74370 Change-Id: I2565614aa76bae8c7dc338cd751337a0bb3f6dce Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-12-162-43/+74
|\| | | | | | | Change-Id: I5cbf1209d614936db36d20ece05922237cbfa562
| * Fixed various crashes in connection point enumeratorssbk2013-12-101-41/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-35136 Task-number: QTBUG-35262 Task-number: QTBUG-35263 Task-number: QTBUG-35264 Task-number: QTBUG-35265 Task-number: QTBUG-35266 Task-number: QTBUG-35267 Task-number: QTBUG-35283 Task-number: QTBUG-35284 Task-number: QTBUG-35285 Task-number: QTBUG-35286 Change-Id: Icc51137fa52dd9a10b4c3ce1ca7fe6c56d556b7a Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Prospective build fix after internal API change of QMetaStringTableSimon Hausmann2013-12-091-2/+1
| | | | | | | | | | | | | | | | The first string entered is always the class name, and it's passed to the constructor now. Change-Id: I7cf199e03cb62ddf7e41b7a4d3848332d4332c73 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Completely bootstrap idc.Friedemann Kleint2013-12-042-27/+76
| | | | | | | | | | | | | | | | | | | | idc dynamically loads libraries depending on QtCore.dll whose static instances can then cause clashes. Task-number: QTBUG-35275 Change-Id: Icd219a2bb36b0a5c3927c3163e93dc07bb5317aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-11-292-24/+32
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6e1ef2cfdde5dc34d6971bfd6ed89c6102daf679
| * Point QCoreApplication to location of DLL in ActiveQt.Friedemann Kleint2013-11-261-0/+6
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-34989 [ChangeLog][ActiveQt][QTBUG-34989] Pick up plugins from deployment location of Active X DLLs. Change-Id: I53f1f8789ede9b6816c2d794b5a991cdf78b1c50 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: Id69361a4d4dbe371318c47a0768894002054e29a Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * replace slashify function with toNativeSeparatorsJoerg Bornemann2013-11-251-16/+4
| | | | | | | | | | | | Change-Id: I619823767e02261e75d441e3924fd111a0ff7cb7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * do not lower-case input file namesJoerg Bornemann2013-11-221-8/+22
| | | | | | | | | | | | | | | | | | The idc tool modified the case of its DLL or EXE input, causing it to be all lowercase. Task-number: QTBUG-2870 Change-Id: Ic3c028a2696786fc5b11a4018bd3fc28e362935b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0827-86/+5
|\| | | | | | | Change-Id: Id54a18b587384a7fc0ee23e1c16a3b929be69cbd
| * Doc: Updated url variable in qdocconf files.v5.2.0-rc1v5.2.0Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I0a44435c179323aae89af13de339fa387eb04cd6 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * use private linkage where possibleOswald Buddenhagen2013-10-311-3/+3
| | | | | | | | | | Change-Id: I4e5194d271168d563c3e190ad2a3086565c5cb07 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix doc build pathOswald Buddenhagen2013-10-301-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-34456 Change-Id: I8b2207e9419bda7fb95785f26370e451248e3ee2 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * remove pointless #ifndef QT_NO_WIN_ACTIVEQTOswald Buddenhagen2013-10-2825-82/+0
| | | | | | | | | | | | | | the way to disable the feature is to not compile the module. Change-Id: Ifd9bf1b6136c82683b039b49d5901a89e4899281 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-111-51/+169
|\| | | | | | | Change-Id: Ifecd41f7cbee854babdfe62baeba16617807205e
| * Improve the AxSelect-Dialog.v5.2.0-beta1Friedemann Kleint2013-10-071-51/+169
| | | | | | | | | | | | | | | | | | | | Give it a tooltip listing DLL, version and word size. For 64 bit executables, append the 32 bit controls as disabled controls at the end to make them visible. Task-number: QTBUG-33711 Change-Id: I2800a78cfc826bd08c591f491bb42f22eeda5b25 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Bump qtactiveqt version to 5.3.0Sergio Ahumada2013-09-251-1/+1
|/ | | | | Change-Id: Ie25c646aef7667f8e5fda884b404fb65a55ed79c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use QLineEdit's clear button feature in Active Qt.v5.2.0-alpha1Friedemann Kleint2013-08-265-481/+9
| | | | | | | | | Remove old filter widget. Change-Id: I1ee7d8695d98044cc22e83fad81dd1f2b486b419 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-08-051-0/+25
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I71fe9944c94bac1b7438a641ad9fdaf670103f2c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 22:11:53 +0000