status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed all QML versions from 2.3 to 3.1

This commit is contained in:
Nikolaos Ftylitakis 2021-01-26 11:51:42 +02:00
parent 71101ccf5d
commit cfc728583b
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -159,7 +159,7 @@ int main()
The in the QML file The in the QML file
```qml ```qml
import QZXing 2.3 import QZXing 3.1
function decode(preview) { function decode(preview) {
imageToDecode.source = preview imageToDecode.source = preview
@ -250,7 +250,7 @@ QZXing::registerQMLImageProvider(engine);
Default settings: Default settings:
```qml ```qml
import QZXing 2.3 import QZXing 3.1
TextField { TextField {
id: inputField id: inputField
@ -275,7 +275,7 @@ Or use the encoding function with the optional custom settings that are passed l
the size of the image can be adjusted by using the Image.sourceWidth and Image.sourceHeight properties of Image QML element. the size of the image can be adjusted by using the Image.sourceWidth and Image.sourceHeight properties of Image QML element.
```qml ```qml
import QZXing 2.3 import QZXing 3.1
TextField { TextField {
id: inputField id: inputField

2
examples/QZXingDragNDropTest/qml/QZXingDragNDropTest/main_QtQuick1.qml
View File

@ -1,7 +1,7 @@
// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5 // import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
import QtQuick 1.1 import QtQuick 1.1
import DropArea 1.0 import DropArea 1.0
import QZXing 2.3 import QZXing 3.1
Rectangle { Rectangle {
width: 360 width: 360

2
examples/QZXingDragNDropTest/qml/QZXingDragNDropTest/main_QtQuick2.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.0 import QtQuick 2.0
import QZXing 2.3 import QZXing 3.1
Rectangle { Rectangle {
width: 360 width: 360

2
examples/QZXingLive/main.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtMultimedia 5.5 import QtMultimedia 5.5
import QZXing 2.3 import QZXing 3.1
ApplicationWindow ApplicationWindow
{ {

4
src/QZXing.cpp
View File

@ -98,10 +98,10 @@ QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(par
#if QT_VERSION >= 0x040700 #if QT_VERSION >= 0x040700
void QZXing::registerQMLTypes() void QZXing::registerQMLTypes()
{ {
qmlRegisterType<QZXing>("QZXing", 2, 3, "QZXing"); qmlRegisterType<QZXing>("QZXing", 3, 1, "QZXing");
#ifdef QZXING_MULTIMEDIA #ifdef QZXING_MULTIMEDIA
qmlRegisterType<QZXingFilter>("QZXing", 2, 3, "QZXingFilter"); qmlRegisterType<QZXingFilter>("QZXing", 3, 1, "QZXingFilter");
#endif //QZXING_MULTIMEDIA #endif //QZXING_MULTIMEDIA
} }