- Remove version.pro generating;

- New HEADER format for mwm container with mwm data version;
- Increase mom version because of new search index format;

3 files changed, 10 insertions, 19 deletions

diff --git a/qt/about.cpp b/qt/about.cpp
index f04ca97975..738940b3c1 100644
--- a/qt/about.cpp
+++ b/qt/about.cpp
@@ -1,7 +1,5 @@
 #include "about.hpp"
 
-#include "../version/version.hpp"
-
 #include "../platform/platform.hpp"
 
 #include <QtCore/QFile>
@@ -12,6 +10,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QTextBrowser>
 
+
 AboutDialog::AboutDialog(QWidget * parent)
   : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
 {
@@ -22,12 +21,7 @@ AboutDialog::AboutDialog(QWidget * parent)
   QLabel * labelIcon = new QLabel();
   labelIcon->setPixmap(icon.pixmap(128));
 
-  QString const versionString = tr("<h3>%1 %2</h3>"
-                        "<br/>"
-                        "Built on %3"
-                        ).arg(QString("MapsWithMe"), QLatin1String(VERSION_STRING),
-                              QLatin1String(VERSION_DATE_STRING));
-  QLabel * labelVersion = new QLabel(versionString);
+  QLabel * labelVersion = new QLabel(QString::fromAscii("TODO: Insert version to bundle."));
 
   QHBoxLayout * hBox = new QHBoxLayout();
   hBox->addWidget(labelIcon);
@@ -39,8 +33,10 @@ AboutDialog::AboutDialog(QWidget * parent)
     ReaderPtr<Reader> reader = GetPlatform().GetReader("about.html");
     reader.ReadAsString(aboutText);
   }
-  catch (...)
-  {}
+  catch (RootException const & ex)
+  {
+    LOG(LWARNING, ("About text error: ", ex.Msg()));
+  }
 
   if (!aboutText.empty())
   {
diff --git a/qt/main.cpp b/qt/main.cpp
index d498210c14..d31e1c36dc 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -10,8 +10,6 @@
 
 #include "../coding/file_reader.hpp"
 
-#include "../version/version.hpp"
-
 #include "../std/cstdio.hpp"
 
 #include <QtGui/QApplication>
@@ -19,7 +17,6 @@
 
 //#include <google/protobuf/stubs/common.h>
 
-#define SETTING_EULA_ACCEPTED "EulaAccepted"
 
 namespace
 {
@@ -63,9 +60,6 @@ int main(int argc, char * argv[])
   InitializeFinalize mainGuard;
   UNUSED_VALUE(mainGuard);
 
-  LOG_SHORT(LINFO, ("Started MapsWithMe version", VERSION_STRING));
-  LOG_SHORT(LINFO, ("Built on", VERSION_DATE_STRING));
-
   QApplication a(argc, argv);
 
   (void)GetPlatform();
@@ -86,8 +80,9 @@ int main(int argc, char * argv[])
   Settings::Set("Units", u);
 
   // display EULA if needed
+  char const * settingsEULA = "EulaAccepted";
   bool eulaAccepted = false;
-  if (!Settings::Get(SETTING_EULA_ACCEPTED, eulaAccepted) || !eulaAccepted)
+  if (!Settings::Get(settingsEULA, eulaAccepted) || !eulaAccepted)
   {
     QStringList buttons;
     buttons << "Accept" << "Decline";
@@ -99,7 +94,7 @@ int main(int argc, char * argv[])
     }
     qt::InfoDialog eulaDialog("MapsWithMe End User Licensing Agreement", buffer.c_str(), NULL, buttons);
     eulaAccepted = (eulaDialog.exec() == 1);
-    Settings::Set(SETTING_EULA_ACCEPTED, eulaAccepted);
+    Settings::Set(settingsEULA, eulaAccepted);
   }
 
   int returnCode = -1;
diff --git a/qt/qt.pro b/qt/qt.pro
index a8879c79e9..2e493932c8 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -1,7 +1,7 @@
 # Main application in qt.
 ROOT_DIR = ..
 DEPENDENCIES = map gui search storage indexer graphics platform anim geometry coding base \
-               bzip2 freetype expat fribidi tomcrypt jansson version protobuf zlib
+               bzip2 freetype expat fribidi tomcrypt jansson protobuf zlib
 
 include($$ROOT_DIR/common.pri)