summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-10 17:18:35 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-10 17:18:35 (GMT)
commit1eda0e0025550acde2c0c9c937a29063227201b1 (patch)
treea8401714b4ae7e12c86b6b24113bb53ff9f7baa5 /Swift/QtUI
parent2edf74915432242ba99e7820a7633a06c755c17b (diff)
downloadswift-1eda0e0025550acde2c0c9c937a29063227201b1.zip
swift-1eda0e0025550acde2c0c9c937a29063227201b1.tar.bz2
Migrated all configure flags to SCons.
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtSystemTray.cpp2
-rw-r--r--Swift/QtUI/Roster/QtTreeWidgetItem.cpp2
-rw-r--r--Swift/QtUI/Roster/RosterDelegate.h2
-rw-r--r--Swift/QtUI/Roster/RosterModel.cpp2
-rw-r--r--Swift/QtUI/Roster/RosterModel.h2
-rw-r--r--Swift/QtUI/SConscript4
6 files changed, 7 insertions, 7 deletions
diff --git a/Swift/QtUI/QtSystemTray.cpp b/Swift/QtUI/QtSystemTray.cpp
index b22da6b..f1c8e27 100644
--- a/Swift/QtUI/QtSystemTray.cpp
+++ b/Swift/QtUI/QtSystemTray.cpp
@@ -18,4 +18,4 @@ void QtSystemTray::setUnreadMessages(bool some) {
trayIcon_->setIcon(some ? newMessageIcon_ : standardIcon_);
}
-} \ No newline at end of file
+}
diff --git a/Swift/QtUI/Roster/QtTreeWidgetItem.cpp b/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
index 51784df..27e978c 100644
--- a/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
@@ -152,4 +152,4 @@ bool QtTreeWidgetItem::isExpanded() {
return expanded_;
}
-} \ No newline at end of file
+}
diff --git a/Swift/QtUI/Roster/RosterDelegate.h b/Swift/QtUI/Roster/RosterDelegate.h
index 934f0bb..9ec800f 100644
--- a/Swift/QtUI/Roster/RosterDelegate.h
+++ b/Swift/QtUI/Roster/RosterDelegate.h
@@ -8,7 +8,7 @@ namespace Swift {
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const;
void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
private:
- static const int avatarSize_ = 32;
+ static const int avatarSize_ = 28;
static const int margin_ = 4;
};
}
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index 1df2117..f54290a 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -68,4 +68,4 @@ int RosterModel::rowCount(const QModelIndex& parent) const {
return item->rowCount();
}
-} \ No newline at end of file
+}
diff --git a/Swift/QtUI/Roster/RosterModel.h b/Swift/QtUI/Roster/RosterModel.h
index fc9b1f3..d32f241 100644
--- a/Swift/QtUI/Roster/RosterModel.h
+++ b/Swift/QtUI/Roster/RosterModel.h
@@ -26,4 +26,4 @@ private:
QtTreeWidgetItem* tree_;
};
-} \ No newline at end of file
+}
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index a5993be..36cf850 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -38,13 +38,13 @@ myenv.MergeFlags(env["EXPAT_FLAGS"])
myenv.MergeFlags(env["ZLIB_FLAGS"])
myenv.MergeFlags(env["OPENSSL_FLAGS"])
-myenv.Tool("qt4")
+myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.EnableQt4Modules(['QtCore', 'QtGui', 'QtWebKit'], debug = False)
myenv.Append(CPPPATH = ["/usr/include/phonon"])
myenv.Append(CPPPATH = ["."])
-myenv.Command("DefaultTheme.qrc", "../resources/themes/Default", generateDefaultTheme)
+myenv.Command("DefaultTheme.qrc", "../resources/themes/Default", Action(generateDefaultTheme, cmdstr = "$GENCOMSTR"))
sources = [
"main.cpp",