diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-04-02 12:29:06 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-04-02 12:29:06 -0500 |
| commit | 76a105261e4ce60555931b4b2dfe1c6a25971825 (patch) | |
| tree | da22ae1cba48e5433e95725364943a7e2e354f07 | |
| parent | fbe5ba831795008361f4de4347e7ecb6d868b4eb (diff) | |
| parent | 199ed44aae08fa225a64b7036006e2cb24db3f0e (diff) | |
| download | monzero-gui-76a105261e4ce60555931b4b2dfe1c6a25971825.tar.gz monzero-gui-76a105261e4ce60555931b4b2dfe1c6a25971825.tar.xz monzero-gui-76a105261e4ce60555931b4b2dfe1c6a25971825.zip | |
Merge pull request #1240
199ed44 Bring QTQuick.Controls version down to 2.0
| -rw-r--r-- | components/Input.qml | 2 | ||||
| -rw-r--r-- | components/InputMulti.qml | 2 | ||||
| -rw-r--r-- | pages/Receive.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/Input.qml b/components/Input.qml index befeecc0..b4310212 100644 --- a/components/Input.qml +++ b/components/Input.qml @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.0 import QtQuick 2.7 import "../components" as MoneroComponents diff --git a/components/InputMulti.qml b/components/InputMulti.qml index 88766ba7..5698dcc6 100644 --- a/components/InputMulti.qml +++ b/components/InputMulti.qml @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.0 import QtQuick 2.7 import "../js/TxUtils.js" as TxUtils diff --git a/pages/Receive.qml b/pages/Receive.qml index 497851e7..e5f8df19 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -27,7 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.0 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.2 |