Commit 376004bb authored by Michael Zanetti's avatar Michael Zanetti
Browse files

remove Qt modules from includes and adjust CMakeLists.txt to add missing modules

parent b859fc7a
......@@ -251,22 +251,26 @@ endif(APPLE)
####################################################
# Specific options for if building with Qt or kde4 libs
if(QTONLY)
find_package(Qt4 REQUIRED)
set( QT_USE_QTXML ON )
set( QT_USE_QTNETWORK ON )
set( QT_USE_QTTEST ON )
set( QT_USE_QTSCRIPT ON )
include( ${QT_USE_FILE} )
marble_set_package_properties( Qt4 PROPERTIES DESCRIPTION "cross-platform application framework" )
marble_set_package_properties( Qt4 PROPERTIES URL "http://qt.digia.com/" )
marble_set_package_properties( Qt4 PROPERTIES TYPE REQUIRED PURPOSE "core framework" )
IF ( NOT QT_QTDECLARATIVE_LIBRARY )
# older cmake versions have a FindQt4.cmake without support for declarative,
# but the library may still be available
FIND_LIBRARY(QT_QTDECLARATIVE_LIBRARY NAMES QtDeclarative HINTS ${QT_LIBRARY_DIR})
ENDIF()
find_package(Qt4 REQUIRED)
set( QT_USE_QTXML ON )
set( QT_USE_QTNETWORK ON )
set( QT_USE_QTTEST ON )
set( QT_USE_QTSCRIPT ON )
set( QT_USE_QTWEBKIT ON )
set( QT_USE_QTSVG ON )
set( QT_USE_QTDECLARATIVE ON )
set( QT_USE_QTSQL ON )
include( ${QT_USE_FILE} )
marble_set_package_properties( Qt4 PROPERTIES DESCRIPTION "cross-platform application framework" )
marble_set_package_properties( Qt4 PROPERTIES URL "http://qt.digia.com/" )
marble_set_package_properties( Qt4 PROPERTIES TYPE REQUIRED PURPOSE "core framework" )
IF ( NOT QT_QTDECLARATIVE_LIBRARY )
# older cmake versions have a FindQt4.cmake without support for declarative,
# but the library may still be available
FIND_LIBRARY(QT_QTDECLARATIVE_LIBRARY NAMES QtDeclarative HINTS ${QT_LIBRARY_DIR})
ENDIF()
if(QTONLY)
# add a flag to be able to distinguish between qt
# and kde mode in the sources
add_definitions(-DQTONLY)
......
......@@ -23,9 +23,9 @@
#include <opencv2/highgui/highgui.hpp>
#include <opencv2/imgproc/imgproc.hpp>
#include <QtCore/QTimeLine>
#include <QtCore/qmath.h>
#include <QtGui/QApplication>
#include <QTimeLine>
#include <qmath.h>
#include <QApplication>
#include <cstdio>
......
......@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QApplication>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
#include <marble/RouteRequest.h>
......
......@@ -15,10 +15,10 @@
#include <marble/GeoDataLineString.h>
#include <marble/LayerInterface.h>
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtGui/QApplication>
#include <QtGui/QKeyEvent>
#include <QTime>
#include <QTimer>
#include <QApplication>
#include <QKeyEvent>
using namespace Marble;
......
......@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QApplication>
#include <marble/MarbleWidget.h>
#include <marble/GeoPainter.h>
......
......@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QApplication>
#include <marble/MarbleWidget.h>
using namespace Marble;
......
......@@ -8,10 +8,10 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
#include <QtGui/QApplication>
#include <QtGui/QTreeView>
#include <QDebug>
#include <QFileInfo>
#include <QApplication>
#include <QTreeView>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
......
......@@ -8,11 +8,11 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QApplication>
#include <QtGui/QLayout>
#include <QtGui/QSlider>
#include <QtGui/QLabel>
#include <QLayout>
#include <QSlider>
#include <QLabel>
#include <marble/MarbleWidget.h>
......
......@@ -8,7 +8,7 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QApplication>
#include <marble/MarbleGlobal.h>
#include <marble/MarbleWidget.h>
......
......@@ -8,8 +8,8 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QtCore/QDebug>
#include <QApplication>
#include <QDebug>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
......
......@@ -8,8 +8,8 @@
// Copyright 2012 Dennis Nienhüser <earthwings@gentoo.org>
//
#include <QtGui/QApplication>
#include <QtCore/QDebug>
#include <QApplication>
#include <QDebug>
#include <marble/MarbleWidget.h>
#include <marble/MarbleModel.h>
......
......@@ -8,13 +8,13 @@
// Copyright 2012 Illya Kovalevskyy <illya.kovalevskyy@gmail.com>
//
#include <QtGui/QApplication>
#include <QtCore/QThread>
#include <QtCore/QTimer>
#include <QtCore/QHash>
#include <QtCore/qmath.h>
#include <QtCore/QDebug>
#include <QtGui/QVBoxLayout>
#include <QApplication>
#include <QThread>
#include <QTimer>
#include <QHash>
#include <qmath.h>
#include <QDebug>
#include <QVBoxLayout>
#include <marble/MarbleWidget.h>
#include <marble/MarbleGlobal.h>
......
......@@ -12,28 +12,28 @@
#include "ControlView.h"
#include <QtGui/QLayout>
#include <QtGui/QSplitter>
#include <QtGui/QStringListModel>
#include <QtGui/QPrintDialog>
#include <QtGui/QPrintPreviewDialog>
#include <QtGui/QPrinter>
#include <QtGui/QPainter>
#include <QtGui/QTextDocument>
#include <QtCore/QPointer>
#include <QtCore/QUrl>
#include <QtGui/QDesktopServices>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QtNetwork/QNetworkRequest>
#include <QtCore/QProcess>
#include <QtCore/QTimer>
#include <QtCore/QFileInfo>
#include <QtGui/QMessageBox>
#include <QtGui/QMainWindow>
#include <QtGui/QDockWidget>
#include <QtGui/QShortcut>
#include <QtGui/QMenu>
#include <QLayout>
#include <QSplitter>
#include <QStringListModel>
#include <QPrintDialog>
#include <QPrintPreviewDialog>
#include <QPrinter>
#include <QPainter>
#include <QTextDocument>
#include <QPointer>
#include <QUrl>
#include <QDesktopServices>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QNetworkRequest>
#include <QProcess>
#include <QTimer>
#include <QFileInfo>
#include <QMessageBox>
#include <QMainWindow>
#include <QDockWidget>
#include <QShortcut>
#include <QMenu>
#include "GeoSceneDocument.h"
#include "GeoSceneHead.h"
......
......@@ -13,8 +13,8 @@
#include "KdeMainWindow.h"
// Qt
#include <QtGui/QProgressBar>
#include <QtGui/QToolBar>
#include <QProgressBar>
#include <QToolBar>
// KDE
#include <kaction.h>
......
......@@ -11,10 +11,10 @@
#include "MarbleTest.h"
#include <QtCore/QCoreApplication>
#include <QtCore/QTime>
#include <QtGui/QMessageBox>
#include <QtGui/QFileDialog>
#include <QCoreApplication>
#include <QTime>
#include <QMessageBox>
#include <QFileDialog>
#include <MarbleGlobal.h>
#include <MarbleDebug.h>
......
......@@ -14,35 +14,35 @@
#include "QtMainWindow.h"
#include "MarbleDebug.h"
#include <QtCore/QList>
#include <QtCore/QSettings>
#include <QtCore/QUrl>
#include <QtGui/QCloseEvent>
#include <QtCore/QTimer>
#include <QtCore/QVariant>
#include <QtCore/QVector>
#include <QtGui/QAction>
#include <QtGui/QLabel>
#include <QtGui/QWhatsThis>
#include <QtGui/QApplication>
#include <QtGui/QIcon>
#include <QtGui/QMenuBar>
#include <QtGui/QStatusBar>
#include <QtGui/QProgressBar>
#include <QtGui/QToolBar>
#include <QtGui/QDesktopServices>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <QtGui/QPrintDialog>
#include <QtGui/QPrinter>
#include <QtGui/QDialogButtonBox>
#include <QtGui/QHBoxLayout>
#include <QtGui/QScrollArea>
#include <QtGui/QClipboard>
#include <QtGui/QShortcut>
#include <QtGui/QDockWidget>
#include <QtNetwork/QNetworkProxy>
#include <QList>
#include <QSettings>
#include <QUrl>
#include <QCloseEvent>
#include <QTimer>
#include <QVariant>
#include <QVector>
#include <QAction>
#include <QLabel>
#include <QWhatsThis>
#include <QApplication>
#include <QIcon>
#include <QMenuBar>
#include <QStatusBar>
#include <QProgressBar>
#include <QToolBar>
#include <QDesktopServices>
#include <QFileDialog>
#include <QMessageBox>
#include <QPrintDialog>
#include <QPrinter>
#include <QDialogButtonBox>
#include <QHBoxLayout>
#include <QScrollArea>
#include <QClipboard>
#include <QShortcut>
#include <QDockWidget>
#include <QNetworkProxy>
#include "EditBookmarkDialog.h"
#include "BookmarkManagerDialog.h"
......@@ -82,7 +82,7 @@
// For zoom buttons on Maemo
#ifdef Q_WS_MAEMO_5
#include <QtGui/QX11Info>
#include <QX11Info>
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#endif // Q_WS_MAEMO_5
......
......@@ -18,7 +18,7 @@
#include <KConfigGroup>
#include <KGlobal>
#include <QtCore/QFile>
#include <QFile>
#include "ControlView.h"
#include "KdeMainWindow.h"
......@@ -27,7 +27,7 @@
#include "MarbleTest.h"
#ifdef STATIC_BUILD
#include <QtCore/QtPlugin>
#include <QtPlugin>
Q_IMPORT_PLUGIN(qjpeg)
Q_IMPORT_PLUGIN(qsvg)
#endif
......
......@@ -21,13 +21,13 @@
#include "MarbleDebug.h"
// Qt
#include <QtCore/QEvent>
#include <QtCore/QTimer>
#include <QtGui/QMouseEvent>
#include <QtGui/QRegion>
#include <QtDeclarative/QDeclarativeComponent>
#include <QtDeclarative/QDeclarativeItem>
#include <QtDeclarative/QDeclarativeContext>
#include <QEvent>
#include <QTimer>
#include <QMouseEvent>
#include <QRegion>
#include <QDeclarativeComponent>
#include <QDeclarativeItem>
#include <QDeclarativeContext>
namespace Marble
{
......
......@@ -17,9 +17,9 @@
#include "MarbleDebug.h"
// Qt
#include <QtGui/QAction>
#include <QtCore/QRect>
#include <QtCore/QSize>
#include <QAction>
#include <QRect>
#include <QSize>
namespace Marble
{
......
......@@ -12,13 +12,13 @@
#include "AbstractDataPluginModel.h"
// Qt
#include <QtCore/QUrl>
#include <QtCore/QTimer>
#include <QtCore/QPointF>
#include <QtCore/QtAlgorithms>
#include <QtCore/QVariant>
#include <QtCore/QAbstractListModel>
#include <QtCore/QMetaProperty>
#include <QUrl>
#include <QTimer>
#include <QPointF>
#include <QtAlgorithms>
#include <QVariant>
#include <QAbstractListModel>
#include <QMetaProperty>
// Marble
#include "MarbleDebug.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment