[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble/qt5] src: Merge branch 'master' into qt5
From:       Michael Zanetti <michael_zanetti () gmx ! net>
Date:       2013-09-17 19:46:37
Message-ID: E1VM1EL-0007uR-1M () scm ! kde ! org
[Download RAW message or body]

Git commit 763837ffd23cbd1b95c125175f94d045d6c85104 by Michael Zanetti.
Committed on 17/09/2013 at 19:46.
Pushed by mzanetti into branch 'qt5'.

Merge branch 'master' into qt5

Conflicts:
	src/lib/StackedTile.cpp

M  +8    -2    src/lib/CMakeLists.txt
M  +2    -2    src/plugins/declarative/Search.cpp
M  +5    -4    src/plugins/declarative/Search.h

http://commits.kde.org/marble/763837ffd23cbd1b95c125175f94d045d6c85104

diff --cc src/plugins/declarative/Search.cpp
index a7eb9ba,a261b2e..93a035a
--- a/src/plugins/declarative/Search.cpp
+++ b/src/plugins/declarative/Search.cpp
@@@ -13,17 -13,9 +13,18 @@@
  #include "MarbleDeclarativeWidget.h"
  #include "MarbleModel.h"
  #include "MarblePlacemarkModel.h"
+ #include "SearchRunnerManager.h"
  #include "ViewportParams.h"
  
 +#if QT_VERSION < 0x050000
 +  #include <QDeclarativeContext>
 +  typedef QDeclarativeItem QQuickItem;
 +  typedef QDeclarativeContext QQmlContext;
 +  typedef QDeclarativeComponent QQmlComponent;
 +#else
 +  #include <QQmlContext>
 +#endif
 +
  Search::Search( QObject* parent ) : QObject( parent ),
      m_marbleWidget( 0 ), m_runnerManager( 0 ),
      m_searchResult( 0 ), m_placemarkDelegate( 0 )
diff --cc src/plugins/declarative/Search.h
index e7ee9b9,f6587bf..d64130d
--- a/src/plugins/declarative/Search.h
+++ b/src/plugins/declarative/Search.h
@@@ -12,20 -12,14 +12,21 @@@
  #define MARBLE_DECLARATIVE_SEARCH_H
  
  #include <QObject>
 -#include <QtDeclarative>
 +#if QT_VERSION < 0x050000
 +  #include <QtDeclarative/qdeclarative.h>
 +  #include <QDeclarativeComponent>
 +  #include <QDeclarativeItem>
 +#else
 +  #include <QtQml/qqml.h>
 +  #include <QQuickItem>
 +#endif
  
- #include "MarbleRunnerManager.h"
- 
  class QAbstractItemModel;
  
- namespace Marble { class MarblePlacemarkModel; }
+ namespace Marble {
+     class MarblePlacemarkModel;
+     class SearchRunnerManager;
+ }
  
  class MarbleWidget;
  
[prev in list] [next in list] [prev in thread] [next in thread]