From e20c97b3734026535d9733c53bff375eac252e5f Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Tue, 21 Aug 2018 13:41:17 +0200
Subject: [PATCH] Port TweetSearch demo to use ES modules
Replace the non-standard .pragma library style with the standard ES
modules and export statements for functions used from the outside.
Change-Id: Idd6bd0a5316edb690337b1b750c93060207d797b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
examples/demos/tweetsearch/content/TweetDelegate.qml | 2 +-
examples/demos/tweetsearch/content/TweetsModel.qml | 2 +-
.../content/{tweetsearch.js => tweetsearch.mjs} | 8 +++-----
examples/demos/tweetsearch/tweetsearch.pro | 2 +-
examples/demos/tweetsearch/tweetsearch.qml | 2 +-
examples/demos/tweetsearch/tweetsearch.qrc | 2 +-
6 files changed, 8 insertions(+), 10 deletions(-)
rename examples/demos/tweetsearch/content/{tweetsearch.js => tweetsearch.mjs} (97%)
diff --git a/examples/demos/tweetsearch/content/TweetDelegate.qml b/examples/demos/tweetsearch/content/TweetDelegate.qml
index b8953314..dfcb3dc7 100644
--- a/examples/demos/tweetsearch/content/TweetDelegate.qml
+++ b/examples/demos/tweetsearch/content/TweetDelegate.qml
@@ -49,7 +49,7 @@
****************************************************************************/
import QtQuick 2.0
-import "tweetsearch.js" as Helper
+import "tweetsearch.mjs" as Helper
Item {
id: container
diff --git a/examples/demos/tweetsearch/content/TweetsModel.qml b/examples/demos/tweetsearch/content/TweetsModel.qml
index 492f85be..e6001ac3 100644
--- a/examples/demos/tweetsearch/content/TweetsModel.qml
+++ b/examples/demos/tweetsearch/content/TweetsModel.qml
@@ -49,7 +49,7 @@
****************************************************************************/
import QtQuick 2.0
-import "tweetsearch.js" as Helper
+import "tweetsearch.mjs" as Helper
Item {
id: wrapper
diff --git a/examples/demos/tweetsearch/content/tweetsearch.js b/examples/demos/tweetsearch/content/tweetsearch.mjs
similarity index 97%
rename from examples/demos/tweetsearch/content/tweetsearch.js
rename to examples/demos/tweetsearch/content/tweetsearch.mjs
index ca6352e6..3659a390 100644
--- a/examples/demos/tweetsearch/content/tweetsearch.js
+++ b/examples/demos/tweetsearch/content/tweetsearch.mjs
@@ -48,15 +48,13 @@
**
****************************************************************************/
-.pragma library
-
-function formatDate(date)
+export function formatDate(date)
{
var da = new Date(date)
return da.toDateString()
}
-function demoToken()
+export function demoToken()
{
var a = new Array(22).join('A')
return a + String.fromCharCode(0x44, 0x69, 0x4a, 0x52, 0x51, 0x41, 0x41, 0x41, 0x41,
@@ -83,7 +81,7 @@ function textForEntity(entity)
(entity.screen_name ? entity.screen_name : entity.text))
}
-function insertLinks(text, entities)
+export function insertLinks(text, entities)
{
if (typeof text !== 'string')
return "";
diff --git a/examples/demos/tweetsearch/tweetsearch.pro b/examples/demos/tweetsearch/tweetsearch.pro
index 0668d272..bc4a09e1 100644
--- a/examples/demos/tweetsearch/tweetsearch.pro
+++ b/examples/demos/tweetsearch/tweetsearch.pro
@@ -6,7 +6,7 @@ RESOURCES += tweetsearch.qrc
OTHER_FILES = tweetsearch.qml \
content/*.qml \
- content/*.js \
+ content/*.mjs \
content/resources/*
target.path = $$[QT_INSTALL_EXAMPLES]/demos/tweetsearch
diff --git a/examples/demos/tweetsearch/tweetsearch.qml b/examples/demos/tweetsearch/tweetsearch.qml
index 40e258d7..8e9ea22a 100644
--- a/examples/demos/tweetsearch/tweetsearch.qml
+++ b/examples/demos/tweetsearch/tweetsearch.qml
@@ -50,7 +50,7 @@
import QtQuick 2.0
import "content"
-import "content/tweetsearch.js" as Helper
+import "content/tweetsearch.mjs" as Helper
Rectangle {
id: main
diff --git a/examples/demos/tweetsearch/tweetsearch.qrc b/examples/demos/tweetsearch/tweetsearch.qrc
index b23c3c55..253be77a 100644
--- a/examples/demos/tweetsearch/tweetsearch.qrc
+++ b/examples/demos/tweetsearch/tweetsearch.qrc
@@ -7,7 +7,7 @@
<file>content/ListHeader.qml</file>
<file>content/SearchDelegate.qml</file>
<file>content/TweetDelegate.qml</file>
- <file>content/tweetsearch.js</file>
+ <file>content/tweetsearch.mjs</file>
<file>content/TweetsModel.qml</file>
<file>content/resources/anonymous.png</file>
<file>content/resources/bird-anim-sprites.png</file>
--
GitLab