Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-15 04:22:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code maintenance for Qt 5:

Browse source 
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-10-19 13:25:06 +00:00
parent 230caadb89
commit 6dbcc3e99b
18 changed files with 139 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/retroshare-gui.pro
View file

@ -1,4 +1,13 @@
CONFIG += qt gui uic qrc resources uitools idle bitdht
QT += network xml script
CONFIG += qt gui uic qrc resources idle bitdht
greaterThan(QT_MAJOR_VERSION, 4) {
# Qt 5
QT += uitools widgets multimedia printsupport
} else {
# Qt 4
CONFIG += uitools
}
# Below is for GXS services.
# Should be disabled for releases.
@ -26,9 +35,6 @@ gxs {
#CONFIG += framecatcher
#CONFIG += blogs
QT += network xml script
TEMPLATE = app
TARGET = RetroShare
@ -361,6 +367,7 @@ HEADERS += rshare.h \
util/misc.h \
util/HandleRichText.h \
util/ObjectPainter.h \
util/QtVersion.h \
gui/bwgraph/bwgraph.h \
gui/profile/ProfileWidget.h \
gui/profile/ProfileManager.h \