← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-baseapps/quantal

« back to all changes in this revision

Viewing changes to konqueror/src/konqprofiledlg.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-05-25 17:26:17 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20120525172617-xr9bzhlugldbflvq
Tags: 4:4.8.80a-0ubuntu1
* Merge with debian git, remainging changes:
  - keep breaks/replaces
  - keep symbol files
  - keep kubuntu patches
  - dolphin suggests and not recommends ruby
  - add kfind, konsole and kompare to dolphin suggests
* konq-plugins breaks/replaces kde-baseapps-data << 4:4.8.80

* Drop squence numbers from kubuntu patches 

* New upstream beta release
  - refresh kubuntu_fix_systemsettings_about_me.diff
  - add new doc images to {konqueror,dolphin}.install

Show diffs side-by-side

added added

removed removed

Lines of Context:
konqueror/src/konqprofiledlg.cpp
22
22
#include "konqsettingsxt.h"
23
23
#include "ui_konqprofiledlg_base.h"
24
24
 
25
 
#include <QtGui/QCheckBox>
 
25
#include <QCheckBox>
26
26
#include <QtCore/QDir>
27
27
#include <kvbox.h>
28
 
#include <QtGui/QLabel>
29
 
#include <QtGui/QLineEdit>
30
 
#include <QtGui/QListWidgetItem>
 
28
#include <QLabel>
 
29
#include <QLineEdit>
 
30
#include <QListWidgetItem>
31
31
 
32
32
#include <kdebug.h>
33
33
#include <kstandardguiitem.h>