← Back to branch summary

~ubuntu-branches/ubuntu/utopic/kde4libs/utopic

« back to all changes in this revision

Viewing changes to plasma/widgets/declarativewidget.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2011-12-16 13:53:22 UTC
  • mfrom: (1.14.11)
  • Revision ID: package-import@ubuntu.com-20111216135322-joct6gdco90t3koc
Tags: 4:4.7.90-0ubuntu1
* New upstream beta release
* Remove kubuntu_mobile patches, kactivities is split out now and they 
  will be out of date, keep 
  kubuntu-mobile-07-serviceAvailabilityChanged-bool-signal.diff
  for binary compatibility reasons

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/widgets/declarativewidget.cpp
94
94
        return;
95
95
    }
96
96
 
97
 
    component->loadUrl(fileName);
98
 
 
99
97
    KDeclarative kdeclarative;
100
98
    kdeclarative.setDeclarativeEngine(engine);
101
99
    kdeclarative.initialize();
102
100
    //binds things like kconfig and icons
103
101
    kdeclarative.setupBindings();
 
102
 
 
103
    component->loadUrl(fileName);
 
104
 
104
105
    scriptEngine = kdeclarative.scriptEngine();
105
106
    registerDataEngineMetaTypes(scriptEngine);
106
107
 
194
195
 
195
196
    d->engine = new QDeclarativeEngine(this);
196
197
    d->engine->setNetworkAccessManagerFactory(new DeclarativeNetworkAccessManagerFactory);
197
 
    foreach(const QString &importPath, KGlobal::dirs()->findDirs("module", "imports")) {
198
 
        d->engine->addImportPath(importPath);
199
 
    }
200
198
 
201
199
    d->component = new QDeclarativeComponent(d->engine, this);
202
200
}