summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1Frederik Gladhorn2015-03-038-14/+14
|\ | | | | | | Change-Id: Ifd323d19d2f8d9f58098f904fe44321327fa9bc8
| * Doc: corrections to solve autolink issuesNico Vertriest2015-02-238-14/+14
| | | | | | | | | | | | Task-number: QTBUG-43810 Change-Id: Ide165158a226beb731e9d300df57b142cf456d5d Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fixed license file headersJani Heikkinen2015-02-1678-224/+224
| | | | | | | | | | Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-132-18/+62
|\ \ | |/ | | | | Change-Id: Ibe92491d7059eb9af7fd7df8a5c5b07ef78f6ac7
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-0/+27
| |\ | | | | | | | | | Change-Id: Ibc7268c6da083cff8a71b27c92fd9223ac57eb90
| | * Add changelog for Qt 5.4.1 releasev5.4.15.4.1Friedemann Kleint2015-02-021-0/+27
| | | | | | | | | | | | | | | Change-Id: Ife0885c19e961f26ddb142c51b44c67b380a459c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
| * | Fix handling of unsupported out parameters in QVariantToVARIANT().Friedemann Kleint2015-01-231-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clear the VARIANT and Bail out before performing any actions on the parameters. Task-number: QTBUG-44048 Change-Id: Id382ba7dc8a3a0cda1a2d7a20b1ffb59152e95fa Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | Update copyright headersJani Heikkinen2015-02-11121-741/+701
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I2febb46d711c51eeb08f13418a4fc15ab0502f1a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | dumpcpp: Add Q_DECLARE_OPAQUE_POINTER() for referenced types.Friedemann Kleint2015-02-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors occurring for forward-declared types in the generated header like: qmetatype.h(1354) : error C2027: use of undefined type 'stdole::Font' vcgantt.h(26) : see declaration of 'stdole::Font' qmetatype.h(1539) : see reference to class template instantiation 'QtPrivate::IsPointerToTypeDerivedFromQObject<T>' being compiled with [ T=stdole::Font * ] qmetatype.h(1546) : see reference to class template instantiation 'QMetaTypeId<T>' being compiled with [ T=stdole::Font * ] \vcgantt.h(33401) : see reference to class template instantiation 'QMetaTypeId2<T>' being compiled with [ T=stdole::Font * ] qmetatype.h(1354) : error C2338: Type argument of Q_DECLARE_METATYPE(T*) must be fully defined Task-number: QTBUG-26587 Change-Id: I9e6c87551b462bc27f94d8e8bd36497075dac8d3 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | Clean up code dealing with VARIANT.Friedemann Kleint2015-02-022-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize arguments before the function call and add checks for IDispatch ** type variants to clearVARIANT(). Task-number: QTBUG-44048 Change-Id: Idceab05852bca8b0cb7e60672e392ee08a3be594 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | | dumpcpp: Introduce QCommandLineParser.Friedemann Kleint2015-02-021-93/+117
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41130 Change-Id: I0ee3668e302e89cb538fafc6eb4bda9d9e05f4ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | dumpcpp: Remove unused code.Friedemann Kleint2015-02-021-100/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove function generateClass() and unused variable castType. Change-Id: Iefbb5405e64491b9a9580128c2fa46161c074188 Task-number: QTBUG-41130 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | dumpcpp: Refactor code handling options strings.Friedemann Kleint2015-02-021-49/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the type from QByteArray to QString, removing some conversion code. Move nameSpace option parameter into main and turn into a QString as well. Task-number: QTBUG-41130 Change-Id: Ife42f099f725a83e91cc2b73b49cee3fa8c3898b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-191-12/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4a6ccd88ddb51cbb750d08e6b271089f2edbb8b9
| * | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/ | | | | | | Change-Id: I46de93ed31100fdda7baba19ddf5bb98526dff2b
| * Fix invocation of QVariant-return type verbs.Friedemann Kleint2015-01-151-12/+11
| | | | | | | | | | | | | | | | Detect QMetaType::QVariant as QVariant. Task-number: QTBUG-43446 Change-Id: Ib1911e79b62b241e01374586321a934303e705fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix single character string constants in dumpcpp.Friedemann Kleint2015-01-121-54/+54
| | | | | | | | | | Change-Id: I4a92d228b16fd1cd7008b36fa9fe39838a90ef9f Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use Qt 5 signals & slots syntax.Friedemann Kleint2014-12-226-26/+25
| | | | | | | | | | Change-Id: I92c4df2ca8a75d6caafa1900db0730d2e0abaf07 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+22
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9211d15553ae9b316784183a448bf1fbab1b07fc
| * Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: Id247df4d821c8041cd14748e0cda909eb55cce25
| * Add changelog for Qt 5.4.0 releaseFriedemann Kleint2014-12-031-0/+22
| | | | | | | | | | Change-Id: Iebf89c615421ec39c1e5ce73b89d1f7e25372b39 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Add categorized logging for registration of Active X controls.Friedemann Kleint2014-12-111-0/+13
| | | | | | | | | | | | | | | | | | | | Setting the environment variable QT_LOGGING_RULES=qt.activeqt.registration.debug=true produces output about the registration. Task-number: QTBUG-42824 Change-Id: I964e1eafd345babdf3581399192a7b5702dea5a4 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Streamline code updating the registry.Friedemann Kleint2014-12-111-89/+96
| | | | | | | | | | | | | | | | | | | | - Remove repetive string additions. - Use one instance of QSettings only. - Remove unused variable typeLibVersion. Task-number: QTBUG-42824 Change-Id: I058cd3f7d844b185b0a9b3d1384bde1fb2dd1881 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | One less duplicated condition by moving the Windows only messageOliver Wolff2014-12-102-3/+1
| | | | | | | | | | | | Change-Id: I1877f1e8b77407c724f41fc076a113cdeba86431 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix broken wince buildsAlex Blasche2014-12-083-3/+3
| | | | | | | | | | | | | | | | | | | | The qmake guards were completely wrong. The wince code was removed from the source base but qmake was never told to exclude wince from the build. Change-Id: I5627d321a64669f642749d353e6c0b51704f1dcc Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | De-inline QAxAggregated::widget().Friedemann Kleint2014-12-084-92/+147
| | | | | | | | | | | | | | | | | | The QWidget-class definition might not be present when using QAxAggregate with QAxWindow. Task-number: QTBUG-41130 Change-Id: Ib8f2097ebdc6af13e3f1e1b51bfcd23512564c0b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Use Q_DECL_OVERRIDE where applicable.Friedemann Kleint2014-12-084-7/+7
| | | | | | | | | | | | Task-number: QTBUG-41130 Change-Id: I4951e2cc27d5652fd9802216511bbc3a4cdeb186 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-211-0/+1
|\ \ | |/ | | | | Change-Id: I78af1c606fb7a620559a47cb5369dd98004834de
| * Release the connection after removing it from the listv5.4.0-rc1v5.4.05.4.0Andy Shaw2014-10-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | This got accidently removed in the 0d29579baffd4f31a3ec39590117f4fee821694d change so this reintroduces it. Change-Id: I8d1eabc9f7f42852c29173f0034a9d6a2183e35a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Sergey Korepanov <SergeyKorepanov@gmail.com>
* | Update activeqt to use new QMetaType::registerNormalizedType signatureJędrzej Nowacki2014-11-171-9/+0
| | | | | | | | | | Change-Id: I492841b4c34396da250254822509e71193645ed7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Suppress DISPATCH_PROPERTYGET for calls from QAxScript.Friedemann Kleint2014-11-076-27/+128
| | | | | | | | | | | | | | | | | | | | Factor out a version QAxBase::dynamicCall() taking a flag that allows for suppressing DISPATCH_PROPERTYGET and use that from QAxScript to fix return types. Add autotest. Task-number: QTBUG-42289 Change-Id: I1900061bc2de6d5987cb7323bb388df806e53e96 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-275-293/+16
|\ \ | |/ | | | | Change-Id: I72ed450d1229d6ef89aae40ac7f0028477aaaf99
| * In some controls the property can be listed twice so merge the flagsAndy Shaw2014-10-242-1/+14
| | | | | | | | | | | | | | | | | | | | In the remote desktop client control there were separate entries for the getter and setter of the properties and the flags for the getter would override the other. Therefore the flags should be combined as the relevant function would be used anyway for the purpose. Change-Id: I212b23cf69c96be71dcd8a7493e8a57cb69ff5fe Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * explicitly declare the module master headerOswald Buddenhagen2014-10-212-0/+2
| | | | | | | | | | | | | | | | | | | | we are delegating to the axbase module, but the master header generation does not resolve transitive deps, so we need this crutch. Task-number: QTBUG-41892 Change-Id: Ief7e8c4bde6fbea7ce6503f67d3b9d5787e09007 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove unnecessary LICENSE.GPLv2Jani Heikkinen2014-10-211-292/+0
| | | | | | | | | | Change-Id: I67d2208542e76463e2519379de62bab3d8b9426d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2014-10-202-4/+3
|\ \ | |/ | | | | Change-Id: I9c2d50304f8f12e8e609929c90332ae405020b62
| * Do not use QVersionNumber in webbrowser example.Friedemann Kleint2014-10-151-3/+2
| | | | | | | | | | Change-Id: Ib7f269cc9a4841c9477c92e2cb906a052f6c5911 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-141-1/+1
| |\ | | | | | | | | | Change-Id: Icb9ffc6e896998c39117bf8ae345902968b9e001
| | * Exclude from Windows CE build.5.3Friedemann Kleint2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41127 Change-Id: I54ef76f67b7bccc87845d7a49f20470ca25aaa59 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-10-142-5/+19
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-092-5/+19
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I1961b2fa015b4fc50b13379d357cb9be4af21631
| | * | Doc: Applied title case to section1 titlesv5.4.0-beta1Nico Vertriest2014-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBASE-41250 Change-Id: I1c766c3be413d1ed010665522c4e559d16a4f3a6 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * | Adapt web browser example to new web site.Friedemann Kleint2014-10-081-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change URL to qt.io. - Save version number to settings and overwrite saved bookmarks unless version exists (enabling further updates depending on version). - Save geometry and make initial geometry large to accommodate qt.io and High DPI screens. Task-number: QTBUG-41798 Task-number: QTBUG-38858 Change-Id: I4da1d6e66135ff2867b6c678f5742767dbcb59fd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | Use QString/QByteArray::prepend() where appropriate.Friedemann Kleint2014-10-093-10/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifbdc828a646cab18548683829c2f45c84da0076b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | | Fix usage of QString::left()/QString::right().Friedemann Kleint2014-10-098-30/+34
|/ / / | | | | | | | | | | | | | | | | | | | | | QString::truncate(), QString::remove() or QString::chop() should be used when assigning to self. Change-Id: Ic0582ad3bc9389cbd315dee885921628197747f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Fix qmake warning.Friedemann Kleint2014-10-061-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ic21c9b47cf4d52b89a59e21cf94bf0fad36d089d ActiveQt: WARNING: qtactiveqt/src/activeqt/shared/qaxtypes.h includes qaxtypefunctions.h when it should include ActiveQt/qaxtypefunctions.h Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Remove repeated invocations of end() in iterations.Friedemann Kleint2014-10-068-158/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | Assign end() to a variable. Where possible, use foreach() to iterate over lists or map values or use Qt convenience APIs. Change-Id: Ie6a6f56d1b0ddb419d06a7ccf4be2f8b32c029b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Refactor string handling in testcon.Friedemann Kleint2014-10-062-16/+12
| | | | | | | | | | | | | | | | | | | | | Remove some single character string constants. Change-Id: I73cba7645d9ae4dc752538a9f7cab6d280aefecb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Use case insensitive comparison instead of toLower().Friedemann Kleint2014-09-264-6/+6
| | | | | | | | | | | | | | | Change-Id: I73907afab82cdef8e717def6095cd7d03236fadf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Remove remains of Windows CE and MSVC pre 2008.Friedemann Kleint2014-09-2314-475/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-41127 Task-number: QTBUG-41130 Change-Id: I0907e92c99ed8861227e90beca579baeb25a06b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status