| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
|
| |
| |
| |
| |
| |
| |
| |
| | |
This patch adds missing include statement where the QRegExp class is
used and remove them where not.
Change-Id: I857dbc18af9f4ef5a3d9552b61c814e9fd85a438
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-61970
Change-Id: I188638ac433f3f313a1e93b5f26f73f8fc680ed6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I4d94e662fb8608a90cb548b5c79f82482d5d819b
|
| |
| |
| |
| |
| | |
Change-Id: I4873179ec8ff42173009973ac96dea3a2bbdb014
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|/
|
|
|
| |
Change-Id: I00033e7be4103e22d0b78b079ec4bd313cd813f2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
|
|
|
|
|
|
|
| |
Switch to debug log and point it out in message.
Change-Id: I0809a1da0c6d5dab148705fae32004af0dc8e371
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
|
|
|
|
|
|
|
|
| |
Add "About Qt" and "About Testcon" which displays Qt version
and build.
Change-Id: Iddedf0ccf4d1e753a9deb5812c3df482e5a2e480
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
Use range based for.
Change-Id: If91077be5bb13aa1447866c4243511db72d4f46c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Windows COM runtime uses delay-unloading of unused COM DLLs, with a default
delay of 10min. The new menu entry enables immediate unload of unused COM DLLs,
thus avoiding the need to wait for 10min. This makes it easier to investigate
DLL lifetime issues in ActiveX controls that would otherwise require a 10min
wait after the control have been closed.
Reference: https://msdn.microsoft.com/en-us/library/windows/desktop/ms678413.aspx
Change-Id: I48ea7748cc3d976a912f050ccb54c2be4a86486e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|\
| |
| |
| | |
Change-Id: I3439e998c2a86d7bf28becca3b5db174839fb825
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Revert a part of change 1a7b140eb8f3f03354452c4669aabae2f141b9c8,
which removed the assignment to a different variable.
Task-number: QTBUG-54000
Change-Id: Ic15411259445afa50770487a37f8762fe57975e9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-54352
Change-Id: I608a253819241d23241f9f8d37782726a1f93a03
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/activeqt/container/qaxwidget.h
Change-Id: Ic6e7267fc71e3ace14e75b392ad3f7cac0df41a1
|
| |
| |
| |
| |
| |
| |
| |
| | |
Remove C-style casts and fix integer conversion issues.
Task-number: QTBUG-50804
Change-Id: Ib5913bc5262a2c141f34d9f70fe6ec4139a63e4f
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47
|
| |
| |
| |
| |
| |
| |
| |
| | |
The enumeration values are mostly used as flags with some unnecessary
casts. Clean this up by introducing flags.
Change-Id: Iab03acb9ab83624bd0e3a6812255d7215d502003
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Avoid conversion from QString to QByteArray.
- Replace a = a.mid() by a.remove().
- Replace a = a.left() by a.truncate().
- Streamline code extracting an error code.
Change-Id: I43c1f04e947632f725bbb86af5abf108b2b02261
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Make it possible to set Qt::AA_DisableHighDpiScaling
and Qt::AA_DontCreateNativeWidgetSiblings.
Task-number: QTBUG-50206
Change-Id: Ib5f0e9f29a78b22c99edfef3b6687482150d9896
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
From Qt 5.7 -> tools & applications are licensed under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I28b956229a96fd982b22640226a716c1a4f3aa0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Resize main window and select dialog according to
available screen size.
Task-number: QTBUG-50206
Change-Id: I66fa527dceb19fab87ac84ee3063f5b84e487fb4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Otherwise, the application crashes when debug messages
are emitted while creating window. Amends
fc55372413a064baa049f28a13cba1406b132cfb.
Task-number: QTBUG-49712
Change-Id: I393d46431fbafb6aab95866848466dc72820fa89
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
When debugging controls potentially crashing testcon, it makes sense
to use the standard tools to capture debug output. Add an option
and move the handler code to main.cpp.
Task-number: QTBUG-49712
Change-Id: I9fd60513e7b3e6fc8a20019778a5844ad99d554e
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
When loading controls using the same version of Qt,
QGuiApplication::quitOnLastWindowClosed is set to false.
Overwrite MainWindow::closeEvent() to fix this.
Task-number: QTBUG-49712
Change-Id: I7425cf2a4a70353e017ed5cad463e1b66b819247
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Use a struct and log a warning when registration fails.
Task-number: QTBUG-49712
Change-Id: I138ec010cde6c97867994c1a4f4f75a460a4061d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-49712
Change-Id: I0460264dede9109f9627d8557d0264ffb0a9acaa
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
Factor out load methods and add command line parser.
Task-number: QTBUG-49355
Change-Id: Ic7c15c19e0b51e666fc13d74751713ccdc97dd9d
Reviewed-by: Fredrik Orderud <forderud@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The script demonstrates how to navigate between custom Qt objects
from a scripting language. None of the existing scripts demonstrate
this capability, so the script should therefore be useful.
The background for sending this patch is that scripting ActiveQt
can be a bit tricky. Adding more sample scripts will hopefully
make it easier for newcomers to get started.
Change-Id: I06820339bc92b556229af101ca2cc177da96ccc2
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I0308544188e73d94b836685f07e44337ca57a723
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
vtable-stubs inherit QAxObject and can thus not be copied. When
using qRegisterMetaType<> on them, cryptic error messages are
generated:
src/activeqt/container/qaxobject.h(58) : error C2248: 'QObject::QObject' : cannot access private member declared in class 'QObject'
src/corelib/kernel/qobject.h(275) : see declaration of 'QObject::QObject'
include\qtcore\../../src/corelib/kernel/qobject.h(96) : see declaration of 'QObject'
To fix this, extract a list of the stubs at the beginning and suppress
the generation of qRegisterMetaType<> for them.
When writing out the class declaration, explicitly disable copy
for them to make error messages clearer.
Task-number: QTBUG-27792
Change-Id: Ia538a68864f3621234c1aab366b097ded881e859
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
produces:
/****************************************************************************
**
** Namespace TestLib generated by dumpcpp v5.5.0 using
** dumpcpp -o test Test.tlb
** from the type library Test.tlb
**
****************************************************************************/
Task-number: QTBUG-27792
Change-Id: I22ef45c424f07ae89e2cbae1d8c05686b0646c5c
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I37609a137247e3203d09942e187ec880c6eba884
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QMetaMethod::methodSignature() produces for an invokable slot with
array type parameters (void foo(const char p1[10],int p2)):
foo(const char[10],int)
Split off the array specification and append it to the parameter name.
Task-number: QTBUG-46177
Change-Id: I58670570357472f6f5b7fcf0e841d3b7cb4189c8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|/
|
|
|
|
|
|
| |
This option was used as a hack for qmake.
We know better hacks these days.
Change-Id: I9fb6b40f7d2ddd40cd51ae758c86fd6d3b060035
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
| |
Change-Id: Ifb2d18d57602260546cc8a29af221298442575ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Task-number: QTBUG-41130
Change-Id: I0ee3668e302e89cb538fafc6eb4bda9d9e05f4ac
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Remove function generateClass() and unused variable castType.
Change-Id: Iefbb5405e64491b9a9580128c2fa46161c074188
Task-number: QTBUG-41130
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I4a92d228b16fd1cd7008b36fa9fe39838a90ef9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I92c4df2ca8a75d6caafa1900db0730d2e0abaf07
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I492841b4c34396da250254822509e71193645ed7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ifbdc828a646cab18548683829c2f45c84da0076b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Remove some single character string constants.
Change-Id: I73cba7645d9ae4dc752538a9f7cab6d280aefecb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I73907afab82cdef8e717def6095cd7d03236fadf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: I4321103f75a13688de3400a1a238ac5414a0efd8
QByteArray::toLower() returns a lowercase copy of the byte array.
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|