Skip to content

Commit

Permalink
changed all QML versions from 2.3 to 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ftylitak committed Jan 26, 2021
1 parent 71101cc commit cfc7285
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ int main()
The in the QML file

```qml
import QZXing 2.3
import QZXing 3.1
function decode(preview) {
imageToDecode.source = preview
Expand Down Expand Up @@ -250,7 +250,7 @@ QZXing::registerQMLImageProvider(engine);
Default settings:

```qml
import QZXing 2.3
import QZXing 3.1
TextField {
id: inputField
Expand All @@ -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.

```qml
import QZXing 2.3
import QZXing 3.1
TextField {
id: inputField
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
import QtQuick 1.1
import DropArea 1.0
import QZXing 2.3
import QZXing 3.1

Rectangle {
width: 360
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import QtQuick 2.0
import QZXing 2.3
import QZXing 3.1

Rectangle {
width: 360
Expand Down
2 changes: 1 addition & 1 deletion examples/QZXingLive/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import QtQuick.Controls 2.0
import QtQuick.Layouts 1.1
import QtMultimedia 5.5

import QZXing 2.3
import QZXing 3.1

ApplicationWindow
{
Expand Down
4 changes: 2 additions & 2 deletions src/QZXing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ QZXing::QZXing(QZXing::DecoderFormat decodeHints, QObject *parent) : QObject(par
#if QT_VERSION >= 0x040700
void QZXing::registerQMLTypes()
{
qmlRegisterType<QZXing>("QZXing", 2, 3, "QZXing");
qmlRegisterType<QZXing>("QZXing", 3, 1, "QZXing");

#ifdef QZXING_MULTIMEDIA
qmlRegisterType<QZXingFilter>("QZXing", 2, 3, "QZXingFilter");
qmlRegisterType<QZXingFilter>("QZXing", 3, 1, "QZXingFilter");
#endif //QZXING_MULTIMEDIA

}
Expand Down

0 comments on commit cfc7285

Please sign in to comment.