Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 61a404e

Browse files
committed
fix QString/QByteArray QML comparison
1 parent c494439 commit 61a404e

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.qmake.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
99

1010
MODULE_VERSION_MAJOR = 1
1111
MODULE_VERSION_MINOR = 1
12-
MODULE_VERSION_PATCH = 1
12+
MODULE_VERSION_PATCH = 2
1313
MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
1414
MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}

src/imports/mvvmquick/DialogPresenter.qml

+7-7
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ QtObject {
8383
* @sa QtMvvm::MessageConfig, QtMvvm::MessageResult, QtMvvmApp::showDialog
8484
*/
8585
function showDialog(config, result) {
86-
if(config.type === "msgbox")
86+
if(config.type == "msgbox")
8787
return createMsgBox(config, result)
88-
else if(config.type === "input")
88+
else if(config.type == "input")
8989
return createInput(config, result)
90-
else if(config.type === "file")
90+
else if(config.type == "file")
9191
return createFile(config, result)
92-
else if(config.type === "color")
92+
else if(config.type == "color")
9393
return createColor(config, result)
94-
else if(config.type === "progress")
94+
else if(config.type == "progress")
9595
return createProgress(config, result)
9696
else
9797
return false;
@@ -267,7 +267,7 @@ QtObject {
267267
props["msgConfig"] = config;
268268
props["msgResult"] = result;
269269
var incubator = null;
270-
if(config.subType === "folder")
270+
if(config.subType == "folder")
271271
incubator = _folderComponent.incubateObject(rootItem, props, Qt.Synchronous);
272272
else
273273
incubator = _fileComponent.incubateObject(rootItem, props, Qt.Synchronous);
@@ -287,7 +287,7 @@ QtObject {
287287
* @sa DialogPresenter::showDialog
288288
*/
289289
function createColor(config, result) {
290-
config.viewProperties["alpha"] = (config.subType === "argb");
290+
config.viewProperties["alpha"] = (config.subType == "argb");
291291
config.type = "input";
292292
config.subType = "QColor";
293293
return createInput(config, result);

src/imports/mvvmquick/FileDialog.qml

+4-4
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ Labs.FileDialog {
6969
modality: Qt.WindowModal
7070
folder: msgConfig.defaultValue
7171
fileMode: {
72-
if(msgConfig.subType === "open")
72+
if(msgConfig.subType == "open")
7373
return Labs.FileDialog.OpenFile;
74-
else if(msgConfig.subType === "files")
74+
else if(msgConfig.subType == "files")
7575
return Labs.FileDialog.OpenFiles;
76-
else if(msgConfig.subType === "save")
76+
else if(msgConfig.subType == "save")
7777
return Labs.FileDialog.SaveFile;
7878
else {
7979
return Labs.FileDialog.OpenFile; //fallback
@@ -88,7 +88,7 @@ Labs.FileDialog {
8888

8989
onAccepted: {
9090
if(msgResult) {
91-
if(msgConfig.subType === "files")
91+
if(msgConfig.subType == "files")
9292
msgResult.result = _fileDialog.files;
9393
else
9494
msgResult.result = _fileDialog.file;

src/imports/mvvmquick/MsgBoxBase.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ AlertDialog {
8888
_msgBoxBase.buttonClicked(button);
8989
if(msgResult && autoHandleBtns) {
9090
_allBtns.forEach(function(sBtn) {
91-
if(button === standardButton(sBtn)) {
91+
if(button == standardButton(sBtn)) {
9292
msgResult.complete(sBtn);
9393
msgResult = null;
9494
_msgBoxBase.done(sBtn);

src/imports/mvvmquick/ProgressDialog.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ MsgBoxBase {
3737
}
3838

3939
function tryCancel(button) {
40-
if(_cancelAction === MessageConfig.NoButton) {
40+
if(_cancelAction == MessageConfig.NoButton) {
4141
_cancelAction = button;
4242
footer.enabled = false;
4343
if(progressControl)

0 commit comments

Comments
 (0)