summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
|/ | | | | Change-Id: Ia101e6e6f0aa4ff113fa9dd702a4ecdd4f335366 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* 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>
* 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>
* 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>
* 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>
* 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>
* 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
| * Merge remote-tracking branch 'origin/release' into stableold/5.1Sergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: Ie8125e55d25a0a3d1ada3641398c31993a573107
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | | | | Change-Id: I03dbfd3adae98d270205d340683f130fec1e3784 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: I7536d511c622d33c3d401c7648e0c6b1dcf12c8f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-022-0/+2
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I4e1a292c8319181d5cb75ae271252e0098139bb0 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-231-0/+1
|\ \ | |/ | | | | Change-Id: I65a7c4f0ef8522d7099ba921c310d45045c830e8
| * Use QMetaType::Float as this is what type() returns nowAndy Shaw2013-07-191-0/+1
| | | | | | | | | | | | | | | | | | | | QVariant::Type is obsolete and type() is really returning a QMetaType::Type instead. So for the float case we just add that in to ensure it works as before in Qt 4.x. Change-Id: I190a4eb2c37492386ea202fc52d39b431e5f02ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-118-17/+14
|\ \ | |/ | | | | Change-Id: I9fa5695799a21d0938fe35dfec5351b99f8232b9
| * Documentation: Remove references to Nokia and obsolete QSA-product.Friedemann Kleint2013-07-117-10/+9
| | | | | | | | | | Change-Id: I427e1b98fd196686f44f3862167f90252e8d665e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix call to deprecated method QPixmap::grabWidget().Friedemann Kleint2013-07-111-1/+1
| | | | | | | | | | | | Change-Id: I3bf8f22065b40b41f5914787eb8204212a191412 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * QAxServer: Enable Q_INVOKABLE methods.Friedemann Kleint2013-07-111-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-26011 Change-Id: I2d91941e460e816dc6e518e4a3f059a40343bd83 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| * Set native parent handle property on widget.Friedemann Kleint2013-07-111-5/+3
| | | | | | | | | | | | | | | | | | | | QWidgetWindow may not exist at that point. Task-number: QTBUG-31672 Task-number: QTBUG-32343 Change-Id: Ia74e4d9250704ac97aac17b892bc8de9a6d535fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-06-276-110/+106
|\ \ | | | | | | | | | refs/staging/dev
| * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-276-110/+106
| |\ \ | | |/ | | | | | | Change-Id: I14edee594efc9368a491d00f8e04d14652b58cf7
| | * Doc: Fix module namesDebao Zhang2013-06-272-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ieed52fcbff27662d1e84f1d598429050ee717b1c Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-254-108/+104
| | |\ | | | | | | | | | | | | Change-Id: I012213390ffe24567cfadeacbbbb8d14074b887c
| | | * Fix licensing for static librariesv5.1.0-rc2v5.1.0Jonathan Liu2013-06-244-108/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt 4, files that are part of ActiveQt static libraries linked into the application are licensed as BSD. In Qt 5, additional files were added to the static libraries that are incorrectly licensed as LGPL. Unify the licensing of these files as BSD. Task-number: QTBUG-29918 Change-Id: I26735cf9a6003c4110ceef2a722c43dc13a9f63f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | | Doc: Setting landing page variableJerome Pasion2013-06-271-0/+2
|/ / / | | | | | | | | | | | | | | | Change-Id: Ib1f9c6a130d800c96eff5537d2367e2a6ca07c4c Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I304d68e33d4d54dd803163363c36d69f4ab4a5aa
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| |/ | | | | | | | | Change-Id: Ic769eef90df7ace20e961903e1f347a6393a258a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * sync.profile: Point dependencies to an empty stringv5.1.0-rc1Sergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I4da67e288a68fd193cb451c233a2c7c4642d4725 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-236-35/+55
|\ \ | |/ | | | | Change-Id: I8c55a2177a3daac033165a7601c574ecfdd4f658
| * Add changes-5.1.0 fileSergio Ahumada2013-05-221-0/+22
| | | | | | | | | | | | Change-Id: I3ae9d748d7218337f124e6713f6327861b486770 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * adjust to new "configure -nomake tools" semanticsv5.1.0-beta1Oswald Buddenhagen2013-05-061-0/+4
| | | | | | | | | | Change-Id: Ie5fdbf5b01dc1d522dd6bbed6d73efb95da4ae85 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * idc is a host toolOswald Buddenhagen2013-05-061-0/+2
| | | | | | | | | | Change-Id: I13b8e1308090c68c0c78a2f8bb25295be935a03c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * fix memory leak in QAxServerBase::internalActivateJoerg Bornemann2013-04-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | There is no need to call QStringToBSTR, because the method IOleInPlaceUIWindow::SetActiveObject expects an POLESTR, not a PBSTR. Task-number: QTBUG-30890 Change-Id: I98e42d400400cae849198d2d9c7cbb9c6de7991d Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
| * Doc: Remove instructions for using qtdemo from examples READMETopi Reinio2013-04-161-33/+3
| | | | | | | | | | | | | | | | | | The Qt Examples and Demos Launcher is not maintained anymore. Edit the README to mention Qt Creator as the way to find and launch examples. Task-number: QTBUG-28388 Change-Id: Ic907e2a430571a0f5b3dc1ff8582c3d296ef1682 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-0/+22
| |\ | | | | | | | | | Change-Id: I5b71788a8d02b27d99841768d7fcbc2aa8e81766
| | * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+22
| | | | | | | | | | | | | | | Change-Id: Ic3edfb9336b0e56f887f7cc7315d35f4e6110362 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | | Update module version to 5.2.0Frederik Gladhorn2013-03-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I394a164ddf66fa9590e42a1ed684fb5f28216290 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-274-6/+5
|\ \ \ | |/ / | | | | | | Change-Id: If85c74001ef26286ece426cd5ddc32603151ff46
| * | Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | | | | | | Change-Id: I5be8b6f802045cc1c649f9fd200042775a04909c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * | Merge branch 'dev' into stableSergio Ahumada2013-03-1925-290/+666
| |\ \ | |/ / |/| | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: Id15d554ef88f18638f2662abb6611faaa1a72e05
View Lorry Controller Status