# # # delete "bin/monkey_on_16x16.png" # # delete "monkey_on_16x16.png" # # add_file "res/guitone.qrc" # content [62342ad04bd984fa2c0afa866b86f312509dee14] # # add_file "res/monkey_on_16x16.png" # content [fb67346a6e53f66071e806daed640c58671c33fa] # # patch "guitone.pro" # from [e837191122075b7f915e6a1553480449110b81b1] # to [19fe2c9a2fba8a515bb8517cf06def5cdec920c1] # # patch "src/model/Monotone.h" # from [7afc04bc452e6c37fbb8588ce5f9f3ee9a8e11ba] # to [59896b98bae3c244a57712fbd463c07e456c7af9] # # patch "src/model/WorkspaceItem.cpp" # from [fd2f171c4ed0087abee3dba8eba3c893ab6aba4e] # to [4d20969b57c1bb254e982a35a4a11a44ecabc133] # # set "res/monkey_on_16x16.png" # attr "mtn:manual_merge" # value "true" # ============================================================ --- res/guitone.qrc 62342ad04bd984fa2c0afa866b86f312509dee14 +++ res/guitone.qrc 62342ad04bd984fa2c0afa866b86f312509dee14 @@ -0,0 +1,5 @@ + + + monkey_on_16x16.png + + ============================================================ # res/monkey_on_16x16.png is binary ============================================================ --- guitone.pro e837191122075b7f915e6a1553480449110b81b1 +++ guitone.pro 19fe2c9a2fba8a515bb8517cf06def5cdec920c1 @@ -21,3 +21,5 @@ DESTDIR = bin QT += qt3support TRANSLATIONS = i18n/guitone_de.ts +RESOURCES = res/guitone.qrc + ============================================================ --- src/model/Monotone.h 7afc04bc452e6c37fbb8588ce5f9f3ee9a8e11ba +++ src/model/Monotone.h 59896b98bae3c244a57712fbd463c07e456c7af9 ============================================================ --- src/model/WorkspaceItem.cpp fd2f171c4ed0087abee3dba8eba3c893ab6aba4e +++ src/model/WorkspaceItem.cpp 4d20969b57c1bb254e982a35a4a11a44ecabc133 @@ -144,7 +144,7 @@ { if(column == 0) { - return QIcon("monkey_on_16x16.png"); + return QIcon(":/monkey_on_16x16.png"); } else {