Merge branch 'config' of github.com:mavlink/qgroundcontrol into config

src/QGCCore.cc

@@ -77,8 +77,8 @@ QGCCore::QGCCore(bool firstStart, int &argc, char* argv[]) : QApplication(argc,
     // Set application name
     this->setApplicationName(QGC_APPLICATION_NAME);
     this->setApplicationVersion(QGC_APPLICATION_VERSION);
-    this->setOrganizationName(QLatin1String("diydrones"));
-    this->setOrganizationDomain("com.diydrones");
+    this->setOrganizationName(QGC::ORG_NAME);
+    this->setOrganizationDomain(QGC::ORG_DOMAIN);
 
     // Set settings format
     QSettings::setDefaultFormat(QSettings::IniFormat);

src/comm/SerialLink.cc

@@ -106,7 +106,7 @@ QList<QString> SerialLink::getCurrentPorts()
 void SerialLink::loadSettings()
 {
     // Load defaults from settings
-    QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
+    QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
     settings.sync();
     if (settings.contains("SERIALLINK_COMM_PORT"))
     {
@@ -122,7 +122,7 @@ void SerialLink::loadSettings()
 void SerialLink::writeSettings()
 {
     // Store settings
-    QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
+    QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
     settings.setValue("SERIALLINK_COMM_PORT", getPortName());
     settings.setValue("SERIALLINK_COMM_BAUD", getBaudRateType());
     settings.setValue("SERIALLINK_COMM_PARITY", getParityType());

src/configuration.h

@@ -11,14 +11,15 @@
 #define WITH_TEXT_TO_SPEECH 1
 
 #define QGC_APPLICATION_NAME "QGroundControl"
-#define QGC_APPLICATION_VERSION "v. 1.1.2 (beta)"
+#define QGC_APPLICATION_VERSION "v. 2.0.0 (beta)"
 
 namespace QGC
 
 {
 const QString APPNAME = "QGROUNDCONTROL";
-const QString COMPANYNAME = "QGROUNDCONTROL";
-const int APPLICATIONVERSION = 110; // 1.1.0
+const QString ORG_NAME = "QGROUNDCONTROL.ORG"; //can be customized by forks to e.g. mycompany.com to maintain separate Settings for customized apps
+const QString ORG_DOMAIN = "org.qgroundcontrol";//can be customized by forks
+const int APPLICATIONVERSION = 200; // 2.0.0
 }
 
 #endif // QGC_CONFIGURATION_H

src/ui/configuration/terminalconsole.cpp

@@ -265,7 +265,7 @@ void TerminalConsole::setLink(int index)
 void TerminalConsole::loadSettings()
 {
     // Load defaults from settings
-    QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
+    QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
     settings.sync();
     if (settings.contains("TERMINALCONSOLE_COMM_PORT"))
     {
@@ -287,7 +287,7 @@ void TerminalConsole::loadSettings()
 void TerminalConsole::writeSettings()
 {
     // Store settings
-    QSettings settings(QGC::COMPANYNAME, QGC::APPNAME);
+    QSettings settings(QGC::ORG_NAME, QGC::APPNAME);
     settings.setValue("TERMINALCONSOLE_COMM_PORT", m_settings.name);
     settings.setValue("TERMINALCONSOLE_COMM_BAUD", m_settings.baudRate);
     settings.setValue("TERMINALCONSOLE_COMM_PARITY", m_settings.parity);