summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-03-13 16:38:56 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2012-03-13 19:49:28 +0100
commit06100e103459d0149c8c3c37e524715e7e7fbdd5 (patch)
tree9ca460952b2e4787ca38e2b7d3e36c400996f895 /examples
parentb294bdc12d2523be67584b3fb200ca612f0d1e06 (diff)
Keep common just for the tools.
All other files should be in the lib anyway. Fix includes. Change-Id: I654fadf0a77b8d19953a6b47820e6398af11e2df Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/downloadspeed/downloadspeed.pro4
-rw-r--r--examples/testapp/mainwindow.cpp5
-rw-r--r--examples/testapp/updateagent.cpp7
-rw-r--r--examples/testapp/updatesettingsdialog.cpp3
-rw-r--r--examples/testapp/updatesettingswidget.cpp5
5 files changed, 10 insertions, 14 deletions
diff --git a/examples/downloadspeed/downloadspeed.pro b/examples/downloadspeed/downloadspeed.pro
index e082c1f65..820753e79 100644
--- a/examples/downloadspeed/downloadspeed.pro
+++ b/examples/downloadspeed/downloadspeed.pro
@@ -1,6 +1,6 @@
include(../../installerbuilder/libinstaller/libinstaller.pri)
-DEPENDPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
-INCLUDEPATH += ../../installerbuilder/libinstaller ../../installerbuilder/common
+DEPENDPATH += . .. ../../installerbuilder/libinstaller
+INCLUDEPATH += . .. ../../installerbuilder/libinstaller
TEMPLATE = app
CONFIG += console
diff --git a/examples/testapp/mainwindow.cpp b/examples/testapp/mainwindow.cpp
index bf81e81f4..97c534e2d 100644
--- a/examples/testapp/mainwindow.cpp
+++ b/examples/testapp/mainwindow.cpp
@@ -29,15 +29,14 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
-
#include "mainwindow.h"
#include "componentselectiondialog.h"
#include "updateagent.h"
#include "updatesettingsdialog.h"
-#include <common/binaryformat.h>
-#include <common/errors.h>
+#include <binaryformat.h>
+#include <errors.h>
#include <updatesettings.h>
#include <kdselfrestarter.h>
diff --git a/examples/testapp/updateagent.cpp b/examples/testapp/updateagent.cpp
index 545ccf293..6e3377933 100644
--- a/examples/testapp/updateagent.cpp
+++ b/examples/testapp/updateagent.cpp
@@ -29,12 +29,11 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
-
#include "updateagent.h"
-#include <common/binaryformatenginehandler.h>
-#include <common/binaryformat.h>
-#include <common/errors.h>
+#include <binaryformatenginehandler.h>
+#include <binaryformat.h>
+#include <errors.h>
#include <component.h>
#include <packagemanagercore.h>
#include <updatesettings.h>
diff --git a/examples/testapp/updatesettingsdialog.cpp b/examples/testapp/updatesettingsdialog.cpp
index 26be572d9..a4ad7cab1 100644
--- a/examples/testapp/updatesettingsdialog.cpp
+++ b/examples/testapp/updatesettingsdialog.cpp
@@ -29,11 +29,10 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
-
#include "updatesettingsdialog.h"
#include "ui_updatesettingsdialog.h"
-#include <common/repository.h>
+#include <repository.h>
#include <updatesettings.h>
#include <QtCore/QDateTime>
diff --git a/examples/testapp/updatesettingswidget.cpp b/examples/testapp/updatesettingswidget.cpp
index 5f47718c9..2c2f2ae46 100644
--- a/examples/testapp/updatesettingswidget.cpp
+++ b/examples/testapp/updatesettingswidget.cpp
@@ -29,12 +29,11 @@
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
-
#include "updatesettingswidget.h"
#include "ui_updatesettingswidget.h"
-#include <common/repository.h>
-#include "updatesettings.h"
+#include <repository.h>
+#include <updatesettings.h>
#include <QtCore/QDateTime>