Commit 5806009d authored by hjk's avatar hjk
Browse files

Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
parents 89687ddd 13e04273
#-------------------------------------------------
#
# Project created by QtCreator 2010-05-26T16:46:58
#
#-------------------------------------------------
QT += core gui
TARGET = BatteryIndicator
TEMPLATE = app
SOURCES += main.cpp\
batteryindicator.cpp
HEADERS += batteryindicator.h
FORMS += batteryindicator.ui
CONFIG += mobility
MOBILITY = systeminfo
symbian {
TARGET.UID3 = 0xecbd72d7
# TARGET.CAPABILITY +=
TARGET.EPOCSTACKSIZE = 0x14000
TARGET.EPOCHEAPSIZE = 0x020000 0x800000
}
#include "batteryindicator.h"
#include "ui_batteryindicator.h"
//! [2]
BatteryIndicator::BatteryIndicator(QWidget *parent) :
QDialog(parent),
ui(new Ui::BatteryIndicator),
deviceInfo(NULL)
{
ui->setupUi(this);
setupGeneral();
}
//! [2]
BatteryIndicator::~BatteryIndicator()
{
delete ui;
}
//! [1]
void BatteryIndicator::setupGeneral()
{
deviceInfo = new QSystemDeviceInfo(this);
ui->batteryLevelBar->setValue(deviceInfo->batteryLevel());
connect(deviceInfo, SIGNAL(batteryLevelChanged(int)),
ui->batteryLevelBar, SLOT(setValue(int)));
}
//! [1]
#ifndef BATTERYINDICATOR_H
#define BATTERYINDICATOR_H
#include <QDialog>
//! [1]
#include <QSystemInfo>
//! [1]
//! [2]
QTM_USE_NAMESPACE
//! [2]
namespace Ui {
class BatteryIndicator;
}
class BatteryIndicator : public QDialog
{
Q_OBJECT
public:
explicit BatteryIndicator(QWidget *parent = 0);
~BatteryIndicator();
//! [3]
private:
Ui::BatteryIndicator *ui;
void setupGeneral();
QSystemDeviceInfo *deviceInfo;
//! [3]
};
#endif // BATTERYINDICATOR_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>BatteryIndicator</class>
<widget class="QDialog" name="BatteryIndicator">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>800</width>
<height>480</height>
</rect>
</property>
<property name="windowTitle">
<string>BatteryIndicator</string>
</property>
<widget class="QProgressBar" name="batteryLevelBar">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>118</width>
<height>23</height>
</rect>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections/>
</ui>
#include <QtGui/QApplication>
#include "batteryindicator.h"
int main(int argc, char *argv[])
{
QApplication a(argc, argv);
BatteryIndicator w;
#if defined(Q_WS_S60)
w.showMaximized();
#else
w.show();
#endif
return a.exec();
}
doc/images/qmldesigner-run-settings.png

63.4 KB | W: | H:

doc/images/qmldesigner-run-settings.png

29.5 KB | W: | H:

doc/images/qmldesigner-run-settings.png
doc/images/qmldesigner-run-settings.png
doc/images/qmldesigner-run-settings.png
doc/images/qmldesigner-run-settings.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-add-resource.png

43.4 KB | W: | H:

doc/images/qtcreator-add-resource.png

33.5 KB | W: | H:

doc/images/qtcreator-add-resource.png
doc/images/qtcreator-add-resource.png
doc/images/qtcreator-add-resource.png
doc/images/qtcreator-add-resource.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-breakdown.png

91.4 KB | W: | H:

doc/images/qtcreator-breakdown.png

104 KB | W: | H:

doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
doc/images/qtcreator-breakdown.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-class-info.png

14.5 KB | W: | H:

doc/images/qtcreator-class-info.png

31 KB | W: | H:

doc/images/qtcreator-class-info.png
doc/images/qtcreator-class-info.png
doc/images/qtcreator-class-info.png
doc/images/qtcreator-class-info.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-compile-pane.png

48.2 KB | W: | H:

doc/images/qtcreator-compile-pane.png

24.5 KB | W: | H:

doc/images/qtcreator-compile-pane.png
doc/images/qtcreator-compile-pane.png
doc/images/qtcreator-compile-pane.png
doc/images/qtcreator-compile-pane.png
  • 2-up
  • Swipe
  • Onion skin
doc/images/qtcreator-formedit.png

88.5 KB | W: | H:

doc/images/qtcreator-formedit.png

147 KB | W: | H:

doc/images/qtcreator-formedit.png
doc/images/qtcreator-formedit.png
doc/images/qtcreator-formedit.png
doc/images/qtcreator-formedit.png
  • 2-up
  • Swipe
  • Onion skin
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