| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
This patch adds missing include statement where the QRegExp class is
used.
Change-Id: I059825d8d3a9b97775d88f429d7e45564c0b44f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
|
|
|
|
|
|
|
| |
This code was never compiled, the Qt Designer
plugin is under src/plugins.
Change-Id: Ic25dc965bcca458322c089a3b5dfe4765fec0556
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.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: I9e68d256991ef7325c29c38ce9c007506ce6b150
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix warnings when using MinGW:
main.cpp: In function 'int main(int, char**)':
main.cpp:734:55: warning: statement has no effect [-Wunused-value]
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
^
main.cpp:735:53: warning: statement has no effect [-Wunused-value]
_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG);
^
main.cpp:736:54: warning: statement has no effect [-Wunused-value]
_CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG);
where _CrtSetReportMode() is an empty macro.
Change-Id: Ibd9024246f59e0c5d1a6a6a017cd680fd60b0113
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|
|
|
|
|
|
|
|
| |
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL
Change-Id: I736aeb1a53f8aac59e8df360447864fea64d3dee
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
|
|\
| |
| |
| | |
Change-Id: Ie53408303d45db4bbc2030d3076f1ec868afedb2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On windows the debug version of qmlplugindumper used to show a panel on
assert failure. Failure should be silent.
Done-with: Thomas Hartmann <thomas.hartmann@digia.com>
Task-number: QTCREATORBUG-12644
Change-Id: I0491ab745a546687772cd0d70fb6b8be0f03bb75
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/declarative/qml/qdeclarativemetatype.cpp
Change-Id: I133752e1df91677925005fa8c1268b32fba312ea
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fix warning:
Project WARNING: CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead.
Change-Id: I33330bdbe7639de777b4f0fedd4ecadd184733bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|/
|
|
|
|
|
|
| |
remove trailing spaces & expand tabs
Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-32390
Change-Id: Ibaeb0b1ad2ee7b446252fc5e5984c78dbb909a3f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
* use -nonrelocatable as flag
* always emit meta object revisions
Change-Id: I8bab4e4faf458f403dbfdc9e6c11c0ad17c27295
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: Ibb906772daf7a6bc6d56874db0a4ced2cafa67a4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
this also reverts f47715f0a4 on the way, as this should make it
obsolete.
Change-Id: Ib54177b35f2378d7e6df497f546a8c4f19d00914
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
Embed Info.plist in qmlplugindump executable in a special way.
Change-Id: Ia83cf15a1dc8c7e37560a280bd711ff2e4468ad8
(cherry-picked from qtdeclarative/4d173d5f16c103f640d4089feed44a74b14e9004)
Reviewed-by: Liang Qi <liang.qi@digia.com>
|
|
|
|
|
|
|
|
| |
Currently, apps for iOS needs to be build through Xcode. So
disable building tools for now, until a proper solution is ready.
Change-Id: Ib31ad29d83c9043be94881e536975682adca4061
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
|
|
|
|
|
| |
Change-Id: Id5f3f66a353a360e98957541e339a28ad0d301e5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
|
|
|
|
|
|
| |
Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess]
qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value]
util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member]
qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter]
qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags]
Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444
Reviewed-by: Alan Alpert <aalpert@rim.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Use exit code 1 on Windows to indicate failures as negative
exit codes are reported as crashes by QProcess in the qmlvisual
test. Always use QCoreApplication::exit() to ensure proper cleanup.
Task-number: QTBUG-28611
Task-number: QTBUG-28735
Change-Id: I0b12153449f7371ce7795a5747e3311184bc7b6f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I7006fdc73c459da0e19e08fbda35905f32f2aebc
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
| |
qt is already added by spec_pre.prf.
Change-Id: Ie2cf7c733718319437a823993c09778507c423ef
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-28131
Change-Id: I9d38b7f2ec94dfd084e2ce23412c4a8348ffe7b4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
| |
Needed for automating static plugin loading.
Task-number: QTBUG-28131
Change-Id: Ia32d3dad2136d0fda468a538fe9be989e72c79eb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Make sure that the minimal platform plugin is used by default.
Change-Id: I32f5ae128f2134f8955d4bdb14974059b98209eb
Reviewed-by: hjk <qthjk@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
Make sure that Gui types are dumped to for -builtins. For
QGuiApplication / type() == QApplication::Tty they weren't registered
otherwise (change e5b200fa06e).
Task-number: QTBUG-28206
Change-Id: Ia6c0902f465ece5411a37b9c23b390172dc58f4b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|
|
|
|
| |
Change-Id: I875fb9563af10f51bb3d51950bc376f44a8f38db
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
some other setup can be skipped as well.
Change-Id: If6e77a42a571e1977875b13bc8519a2cd43df16a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
QtQuick1 uses the Widgets related API of QtWebKit and hence needs
to use the QtWebKitWidgets module.
Change-Id: Idf2e65d053e1dbf2501486c8f0a22b8b25f23efc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Fix check to indicate immediate errors, skip the loading
state and check for errors after loading again.
- Exclude all broken examples.
- Exclude Mac .app folders
- Fix the DeclarativeViewer to check for the presence
of the ImageMagick and ffmpeg executables only once,
reducing test time.
- Do not check for ImageMagick by running its command
line tool 'convert' on Windows, since Windows
has a tool of the same name that converts file
systems (!).
- Fix doc snippets to load correctly.
- Introduce defines in case WebKit or XmlPatterns
are not present (which existed in Qt 4).
Task-number: QTQAINFRA-428
Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
| |
Change-Id: I81588fbe7141fb1df0d56b2dec2e8d495af975a0
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
| |
We dropped the 4.7 import a while ago.
Change-Id: I8ae8d11b890374c3ec6e87556a7de1f064d37f38
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
|
|
|
|
|
|
|
|
|
| |
qmlplugindump is still needed for QtQUick1 modules, since the one in
qtdeclarative will choke on the QtQuick1 dependency. Therefore revive
qmlplugindump in here, but name it qml1plugindump.
Change-Id: I975621cff4758ab71e165eb3f6398d70a1f154be
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
qInstallMsgHandler got deprecated in Qt 5.
Change-Id: I87f5f8d5b28afcbcf8a9c613d1d4b1199f5f4254
Reviewed-by: Martin Jones <martin.r.jones@gmail.com>
|
|
|
|
|
|
|
| |
Apply changes done to qtdeclarative/qmlplugindump here, too.
Change-Id: I55c99fb0ad499c5cb59dda33e320702c0d4722ea
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
|
|
|
|
|
| |
Change-Id: I63cc45662e8f1ac5979ac8cf2ba8c76b42c45895
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.
Change-Id: I6384d32f125fe7800c57e387f48930a1e71fbe08
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
| |
Change-Id: Ic7790b074a138371e28f1be487c2d05c98242134
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
QWeakPointer support for assigning QObjects is deprecated. Use
QPointer instead.
This is required to compile with the deprecated API disabled.
Change-Id: I5b5c9b261d66c297b57889ce072f4bdf98613e36
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
| |
Change-Id: I6afbab3b3cc721eb84abf030ab703c0f0366dcbc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
| |
Try to automatically fall back to qmlscene, print an error if not possible.
Change-Id: I55e7bafe3477bf75d72709fe8a98746b5d9e6442
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia4315c32ba35f9ec7bd7b4e935bfcdbc21c1410d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
| |
Change-Id: I735584db5cf7298ef61f316036df460e79485246
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
| |
Change-Id: I69d237e28303e4d9b6bb57d97e84fb5dae1f4e48
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
| |
Change-Id: I0b4156f01d5d1bfe5cdde724148ed681025ab227
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
QPlainTextEdit::appendPlainText() can take surprisingly long, even
when the widget is hidden. In a demo on embedded hardware we've seen
the frame time go up from ~55 milliseconds to ~85 over the first few
minutes of the demo running. There was one warning emitted per frame.
With this patch there is no significant performance degradation.
Change-Id: Ic80409b29a1544f03431e1573811a00925660338
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
|