(trunk qt) #4316 "Transmission 2.31 crashes (segfaults) immediately after launch" -- sync the Qt client to the changes made in r12514

This commit is contained in:
Jordan Lee 2011-06-25 19:56:48 +00:00
parent b4ffdaac42
commit 6717816c2c
2 changed files with 0 additions and 2 deletions

View File

@ -85,7 +85,6 @@ Prefs::PrefItem Prefs::myItems[] =
{ INCOMPLETE_DIR, TR_PREFS_KEY_INCOMPLETE_DIR, QVariant::String }, { INCOMPLETE_DIR, TR_PREFS_KEY_INCOMPLETE_DIR, QVariant::String },
{ INCOMPLETE_DIR_ENABLED, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, QVariant::Bool }, { INCOMPLETE_DIR_ENABLED, TR_PREFS_KEY_INCOMPLETE_DIR_ENABLED, QVariant::Bool },
{ MSGLEVEL, TR_PREFS_KEY_MSGLEVEL, QVariant::Int }, { MSGLEVEL, TR_PREFS_KEY_MSGLEVEL, QVariant::Int },
{ OPEN_FILE_LIMIT, TR_PREFS_KEY_OPEN_FILE_LIMIT, QVariant::Int },
{ PEER_LIMIT_GLOBAL, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, QVariant::Int }, { PEER_LIMIT_GLOBAL, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, QVariant::Int },
{ PEER_LIMIT_TORRENT, TR_PREFS_KEY_PEER_LIMIT_TORRENT, QVariant::Int }, { PEER_LIMIT_TORRENT, TR_PREFS_KEY_PEER_LIMIT_TORRENT, QVariant::Int },
{ PEER_PORT, TR_PREFS_KEY_PEER_PORT, QVariant::Int }, { PEER_PORT, TR_PREFS_KEY_PEER_PORT, QVariant::Int },

View File

@ -90,7 +90,6 @@ class Prefs: public QObject
INCOMPLETE_DIR, INCOMPLETE_DIR,
INCOMPLETE_DIR_ENABLED, INCOMPLETE_DIR_ENABLED,
MSGLEVEL, MSGLEVEL,
OPEN_FILE_LIMIT,
PEER_LIMIT_GLOBAL, PEER_LIMIT_GLOBAL,
PEER_LIMIT_TORRENT, PEER_LIMIT_TORRENT,
PEER_PORT, PEER_PORT,