feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesinger.NodeInstances: Set version number

Browse Source
This commit is contained in:
Marco Bubke
2011-02-23 19:19:27 +01:00
parent eef08c0b91
commit 9b7baaf9a2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
View File

@@ -744,6 +744,8 @@ QObject *createComponent(const QString &componentPath, QDeclarativeContext *cont
tweakObjects(object); tweakObjects(object);
component.completeCreate(); component.completeCreate();
Q_ASSERT(QDeclarativeEngine::contextForObject(object));
return object; return object;
} }
@@ -768,6 +770,8 @@ QObject *createPrimitive(const QString &typeName, int majorNumber, int minorNumb
if (object && context) if (object && context)
QDeclarativeEngine::setContextForObject(object, context); QDeclarativeEngine::setContextForObject(object, context);
Q_ASSERT(QDeclarativeEngine::contextForObject(object));
return object; return object;
} }

1
src/tools/qmlpuppet/main.cpp
View File

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName("Nokia"); QCoreApplication::setOrganizationName("Nokia");
QCoreApplication::setOrganizationDomain("nokia.com"); QCoreApplication::setOrganizationDomain("nokia.com");
QCoreApplication::setApplicationName("QmlPuppet"); QCoreApplication::setApplicationName("QmlPuppet");
QCoreApplication::setApplicationVersion("1.0.0");
#ifdef ENABLE_QT_BREAKPAD #ifdef ENABLE_QT_BREAKPAD
QtSystemExceptionHandler systemExceptionHandler; QtSystemExceptionHandler systemExceptionHandler;