lp:~ivan-karpan/4eturntracker/upgrade-to-qt5.1

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:4eturntracker

Paul McCullagh: Pending requested 2013-12-04

Diff: 1914 lines (+336/-667)

45 files modified

.bzrignore (+1/-0)
project/4eTurnTracker.pro (+5/-1)
project/4eTurnTracker.pro.user (+213/-549)
src/actions.cpp (+1/-1)
src/attributestorage.cpp (+3/-3)
src/characters.cpp (+1/-1)
src/characterswindow.cpp (+1/-1)
src/creature.cpp (+30/-30)
src/creaturelistmodel.cpp (+3/-3)
src/creaturewidget.cpp (+1/-1)
src/dialog.cpp (+1/-1)
src/dogtag.cpp (+1/-1)
src/effectdialog.cpp (+1/-1)
src/effectdialog.h (+1/-1)
src/effectlistmodel.cpp (+1/-1)
src/encounter.cpp (+1/-1)
src/encounters.cpp (+5/-5)
src/eventlistmodel.cpp (+1/-1)
src/global.cpp (+26/-26)
src/global.h (+3/-3)
src/history.cpp (+1/-1)
src/initiativedialog.cpp (+1/-1)
src/jumpindialog.cpp (+1/-1)
src/main.cpp (+1/-1)
src/mainwindow.cpp (+7/-7)
src/mainwindow.h (+1/-1)
src/managerwindow.cpp (+1/-1)
src/messagedialog.cpp (+2/-2)
src/monsters.cpp (+1/-1)
src/objectstream.cpp (+1/-1)
src/pickcharactersdialog.cpp (+1/-1)
src/pickencounterdialog.cpp (+1/-1)
src/pickmonsterdialog.cpp (+1/-1)
src/playerswindow.cpp (+1/-1)
src/power.h (+1/-1)
src/powerdialog.cpp (+1/-1)
src/progressbardelegate.cpp (+1/-1)
src/richtextdelegate.cpp (+1/-1)
src/savingthrowdialog.cpp (+1/-1)
src/selecttargetsdialog.cpp (+1/-1)
src/selecttargetsdialog.h (+1/-1)
src/setaliasdialog.cpp (+1/-1)
src/sr_action_dialog.cpp (+1/-1)
src/terms.cpp (+2/-2)
src/translation.cpp (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

191. By Ivan Karpan on 2013-12-04

Added Mac OS spefic file to ingore (.DS_Store)
Upgraded to qt5.1

190. By Paul McCullagh on 2013-10-03

Merged: Resolves KI57, KI55, TO-DO 108, parts of 046, improvements to players window, and dice roller

189. By Paul McCullagh on 2013-09-19

Merged to-do 102

188. By Paul McCullagh on 2013-09-15

New translations

187. By Paul McCullagh on 2013-06-15

Remove creatures from selection when history changes

186. By Paul McCullagh on 2013-06-15

Removed program age notification

185. By Paul McCullagh on 2013-06-15

Fixed crash that occurred when openning the C&E dialog when initiative list empty

184. By Paul McCullagh on 2013-01-23

Updated the build time

183. By Paul McCullagh on 2013-01-23

Incremented build number, removed debug

182. By Paul McCullagh on 2013-01-06

Improved tracking of power usage, so that only powers that need to are reset on short or extended rest