Commit Graph

17 Commits

Author SHA1 Message Date
Liang Qi 435774ced1 Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
	src/qml/qml/qqmlimport.cpp

Change-Id: I26f8d18fe8af664ee8573116f182fe12b71e089a
2017-03-13 07:29:03 +01:00
Ulf Hermann 408620ea99 Fix building with -no-feature-process
Drop an unused include, don't try to build qmlplugindump in this
case, and add some guards around QProcess includes and usages.

Change-Id: I6ce5985a8dd1967f146016a7acd1ea31fb3bda2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-02 11:43:49 +00:00
Robin Burchell 01f7a9dbe2 QQmlApplicationEngine: Yet another fix after QUrl behavior changes in QtBase
Picture the following application:
    QQmlApplication qAppEngine("main.qml");

With main.qml:
    ...
    AComponentInTheSameDirectory {
    }
    ...

This was failing, with the error:
    file:main.qml:13 AComponentInTheSameDirectory is not a type

Which is wrong, but also reveals the root cause in that the
original filename was not a fully resolved path.

Change-Id: Ifc5557cc43f4bb92fd121ea9f7a37f09b3b38a9b
Reviewed-by: David Faure <david.faure@kdab.com>
2017-01-16 15:13:49 +00:00
Lars Knoll e579076bb3 Get rid of most QT_NO_FOO usages
Instead use QT_CONFIG(foo). This change actually detected a few
mis-spelled macros and invalid usages.

Change-Id: I06ac327098dd1a458e6bc379d637b8e2dac52f85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-29 10:10:27 +00:00
Dmitry Shachnev 650b5db06b Make tst_qqmlapplicationengine pass when JIT is not available
When the platform does not have JIT, a warning about this is printed
into the process stderr, so the test fails.

Change-Id: I67c605bd09659c444d0a05f476314e9c7fc2ce6d
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-11 14:51:16 +00:00
Jani Heikkinen 38ec3bd755 Updated license headers
From Qt 5.7 -> tools & applications are lisenced 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: I04760a0801837cfc516d1c7c02d4f503f6bb70b6
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2016-01-20 11:46:25 +00:00
Jani Heikkinen c5796292ad Update copyright headers
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: I61120571787870c0ed17066afb31779b1e6e30e9
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-02-12 10:28:11 +00:00
Jani Heikkinen e7ceacda70 Update license headers and add new licenses
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-25 11:28:46 +02:00
David Faure 8dbc32a48e tst_qqmlapplicationengine: clear $QT_MESSAGE_PATTERN
The test fails if it's set, because it looks at the output from testapp
and compares it with expected output.

Change-Id: Idc82e2f9024b72cb8be919c2d1bfa4efb4957e4e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-30 17:36:51 +02:00
Oliver Wolff 4c6c6d9a17 Fixed qqmlapplicationengine autotest build for QT_NO_PROCESS
Change-Id: Ie5993fac36a29a7d7edcadf5030dc2b5bf95b506
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-03-10 09:43:36 +01:00
Giorgos Tsiapaliokas 6e5caf0431 Add the features of QLoggingCategory to QML's debugging methods.
It is now possible to modify the output of QML's debugging methods. Also the
prefix of "qml" makes it possible to capture the output from the QML
files using qInstallMessageHandler.
This commit depends on qtbase/4967c7106568d5df0be4d40bf793583c7c6bdb69

Change-Id: I2c7a2cb96a0b91fd3249dc2dacbab63e6ac68243
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-03-07 12:20:24 +01:00
Sergio Ahumada d286f5bf75 Prefer to use normalised signal/slot signatures
Change-Id: I9856c110399c4b6b1ea6aba2d92392cecff04656
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-03 10:08:49 +01:00
Friedemann Kleint 1849f7e34d Fix MSVC-warning about unused variable in tst_qqmlapplicationengine.cpp
Change-Id: I808e56db47d3967f4361cb8b96644834fafb533a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-24 17:28:28 +01:00
J-P Nurmi 8cc60ac9cc Fix Qt.application.xxx notifier signals
QCoreApplication now provides change notifications.

Change-Id: Icd7e1247426f4b5ad124d6d9b72a2ba99225ee08
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
2013-07-04 20:52:48 +02:00
J-P Nurmi 101a518513 Add Qt.application.organization/domain
Change-Id: Ic4a161b59d51e621e13c960f104d1a3be2ee64f8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2013-06-29 11:51:03 +02:00
Alan Alpert cbd82ea95e Stabilize Test
Use QProcess::waitForFinished over a signal spy. Has a
chance of stabilizing the test, but also cleans up the code.

Change-Id: I888c3b9da6d44d11516227c085bcc12a5ccb5e8a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-04-10 23:52:00 +02:00
Alan Alpert 471645f6db Add QQmlApplicationEngine
This helper class exposes QML application functionality that QML-only
applications want to have, but QML-using applications may not.

Change-Id: If91c3f55ffa2a4aecdd9d6cc62f6ad09fd35b0dd
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
2013-03-20 06:48:30 +01:00