Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove warning about 4.7 imports

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-06-05 20:34:07 +03:00
parent 75f1668d88
commit 4650511e32
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/declarative/qml/qdeclarativemetatype.cpp
View file

@ -704,15 +704,6 @@ int QDeclarativePrivate::qmlregister(RegistrationType type, void *data)
*/ */
bool QDeclarativeMetaType::isModule(const QByteArray &module, int versionMajor, int versionMinor) bool QDeclarativeMetaType::isModule(const QByteArray &module, int versionMajor, int versionMinor)
{ {
// "import Qt 4.7" should have died off
if (strcmp(module.constData(), "Qt") == 0 && versionMajor == 4 && versionMinor == 7) {
static bool qt47Registered = false;
if (!qt47Registered) {
qWarning() << Q_FUNC_INFO << "Qt 4.7 import detected; please note that Qt 4.7 is directly reusable as QtQuick 1.x with no code changes.";
qt47Registered = true;
}
}
const QDeclarativeMetaTypeData *data = metaTypeData(); const QDeclarativeMetaTypeData *data = metaTypeData();
const QDeclarativeMetaTypeData::ModuleInfoHash::const_iterator it = data->modules.constFind(module); const QDeclarativeMetaTypeData::ModuleInfoHash::const_iterator it = data->modules.constFind(module);
return it != data->modules.constEnd() return it != data->modules.constEnd()

2
tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject.qml
View file

@ -19,6 +19,6 @@
** **
****************************************************************************/ ****************************************************************************/
import Qt.test 4.6 import Qt.test 2.0
MyQmlObject {} MyQmlObject {}

2
tests/benchmarks/declarative/qdeclarativecomponent/data/myqmlobject_binding.qml
View file

@ -19,7 +19,7 @@
** **
****************************************************************************/ ****************************************************************************/
import Qt.test 4.6 import Qt.test 2.0
MyQmlObject { MyQmlObject {
result: value result: value