Merge branch '2.2' into 3.0

Author: grossmj

gns3/modules/qemu/ui/qemu_vm_configuration_page.ui

@@ -94,7 +94,10 @@
           <number>32</number>
          </property>
          <property name="maximum">
-          <number>65535</number>
+          <number>2147483647</number>
+         </property>
+         <property name="singleStep">
+          <number>1024</number>
          </property>
          <property name="value">
           <number>256</number>

gns3/modules/qemu/ui/qemu_vm_configuration_page_ui.py

@@ -59,7 +59,8 @@ def setupUi(self, QemuVMConfigPageWidget):
         self.gridLayout_4.addWidget(self.uiRamLabel, 4, 0, 1, 1)
         self.uiRamSpinBox = QtWidgets.QSpinBox(self.uiGeneralSettingsTab)
         self.uiRamSpinBox.setMinimum(32)
-        self.uiRamSpinBox.setMaximum(65535)
+        self.uiRamSpinBox.setMaximum(2147483647)
+        self.uiRamSpinBox.setSingleStep(1024)
         self.uiRamSpinBox.setProperty("value", 256)
         self.uiRamSpinBox.setObjectName("uiRamSpinBox")
         self.gridLayout_4.addWidget(self.uiRamSpinBox, 4, 1, 1, 1)