diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml index a4196dbdcd3c03eb8e901554e22b818688f8abf5..b3652701ed143a30bfaa84b0240a9c88990496ab 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml +++ b/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "script/script.js" as Script +import "script/script.mjs" as Script Package { Item { id: stackItem; Package.name: 'stack'; width: 160; height: 153; z: stackItem.PathView.z } diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.js b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs similarity index 94% rename from examples/demos/photoviewer/PhotoViewerCore/script/script.js rename to examples/demos/photoviewer/PhotoViewerCore/script/script.mjs index 0b3cae5ff3550283fdd835e350a874821298fc44..1eb7cac7ed84631e106f8b9b0d12c9b66e1fd09f 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/script/script.js +++ b/examples/demos/photoviewer/PhotoViewerCore/script/script.mjs @@ -48,22 +48,20 @@ ** ****************************************************************************/ -.pragma library - -function getWidth(string) { +export function getWidth(string) { return (string.match(/width=\"([0-9]+)\"/))[1] } -function getHeight(string) { +export function getHeight(string) { return (string.match(/height=\"([0-9]+)\"/))[1] } -function getImagePath(string) { +export function getImagePath(string) { var pattern = /src=\"http:\/\/(\S+)\"/ return (string.match(pattern))[1] } -function calculateScale(width, height, cellSize) { +export function calculateScale(width, height, cellSize) { var widthScale = (cellSize * 1.0) / width var heightScale = (cellSize * 1.0) / height var scale = 0 diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro index aa9bb82d563af65e30566d93a0508447f67d71bc..234318057cd55ddfbf694e1253ac2f7c7e6342b7 100644 --- a/examples/demos/photoviewer/photoviewer.pro +++ b/examples/demos/photoviewer/photoviewer.pro @@ -28,7 +28,7 @@ RESOURCES += main.qml \ PhotoViewerCore/images/box-shadow.png \ PhotoViewerCore/images/busy.png \ PhotoViewerCore/images/cardboard.png \ - PhotoViewerCore/script/script.js \ + PhotoViewerCore/script/script.mjs \ target.path = $$[QT_INSTALL_EXAMPLES]/demos/photoviewer