diff --git a/LICENSE.md b/LICENSE.md index 27c3147..73dc818 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ MIT License =========== -Copyright 2013 - [Reliable Bits Software by Blommers IT](http://blommersit.nl). All Rights Reserved. +Copyright 2013-2015 [Reliable Bits Software by Blommers IT](http://blommersit.nl). All Rights Reserved. Author [Rick Blommers](mailto:rick@blommersit.nl) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp index 27f4a46..84064e0 100644 --- a/QtAwesome/QtAwesome.cpp +++ b/QtAwesome/QtAwesome.cpp @@ -1,7 +1,9 @@ /** * QtAwesome - use font-awesome (or other font icons) in your c++ / Qt Application * - * Copyright 2013 - Reliable Bits Software by Blommers IT. All Rights Reserved. + * MIT Licensed + * + * Copyright 2013-2015 - Reliable Bits Software by Blommers IT. All Rights Reserved. * Author Rick Blommers */ @@ -167,7 +169,7 @@ bool QtAwesome::initFontAwesome( ) Q_INIT_RESOURCE(QtAwesome); // load the font file - QFile res(":/fonts/fontawesome-4.2.0.ttf"); + QFile res(":/fonts/fontawesome-4.3.0.ttf"); if(!res.open(QIODevice::ReadOnly)) { qDebug() << "Font awesome font could not be loaded!"; return false; @@ -198,7 +200,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("alignright", fa::alignright); m.insert("ambulance", fa::ambulance); m.insert("anchor", fa::anchor); - m.insert("androidicon", fa::androidicon); + m.insert("android", fa::android); m.insert("angellist", fa::angellist); m.insert("angledoubledown", fa::angledoubledown); m.insert("angledoubleleft", fa::angledoubleleft); @@ -237,6 +239,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("barcharto", fa::barcharto); m.insert("barcode", fa::barcode); m.insert("bars", fa::bars); + m.insert("bed", fa::bed); m.insert("beer", fa::beer); m.insert("behance", fa::behance); m.insert("behancesquare", fa::behancesquare); @@ -264,6 +267,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("bullhorn", fa::bullhorn); m.insert("bullseye", fa::bullseye); m.insert("bus", fa::bus); + m.insert("buysellads", fa::buysellads); m.insert("cab", fa::cab); m.insert("calculator", fa::calculator); m.insert("calendar", fa::calendar); @@ -279,6 +283,8 @@ bool QtAwesome::initFontAwesome( ) m.insert("caretsquareoright", fa::caretsquareoright); m.insert("caretsquareoup", fa::caretsquareoup); m.insert("caretup", fa::caretup); + m.insert("cartarrowdown", fa::cartarrowdown); + m.insert("cartplus", fa::cartplus); m.insert("cc", fa::cc); m.insert("ccamex", fa::ccamex); m.insert("ccdiscover", fa::ccdiscover); @@ -327,6 +333,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("commentso", fa::commentso); m.insert("compass", fa::compass); m.insert("compress", fa::compress); + m.insert("connectdevelop", fa::connectdevelop); m.insert("copy", fa::copy); m.insert("copyright", fa::copyright); m.insert("creditcard", fa::creditcard); @@ -338,11 +345,13 @@ bool QtAwesome::initFontAwesome( ) m.insert("cut", fa::cut); m.insert("cutlery", fa::cutlery); m.insert("dashboard", fa::dashboard); + m.insert("dashcube", fa::dashcube); m.insert("database", fa::database); m.insert("dedent", fa::dedent); m.insert("delicious", fa::delicious); m.insert("desktop", fa::desktop); m.insert("deviantart", fa::deviantart); + m.insert("diamond", fa::diamond); m.insert("digg", fa::digg); m.insert("dollar", fa::dollar); m.insert("dotcircleo", fa::dotcircleo); @@ -372,6 +381,8 @@ bool QtAwesome::initFontAwesome( ) m.insert("eyeslash", fa::eyeslash); m.insert("eyedropper", fa::eyedropper); m.insert("facebook", fa::facebook); + m.insert("facebookf", fa::facebookf); + m.insert("facebookofficial", fa::facebookofficial); m.insert("facebooksquare", fa::facebooksquare); m.insert("fastbackward", fa::fastbackward); m.insert("fastforward", fa::fastforward); @@ -413,6 +424,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("folderopen", fa::folderopen); m.insert("folderopeno", fa::folderopeno); m.insert("font", fa::font); + m.insert("forumbee", fa::forumbee); m.insert("forward", fa::forward); m.insert("foursquare", fa::foursquare); m.insert("frowno", fa::frowno); @@ -423,6 +435,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("ge", fa::ge); m.insert("gear", fa::gear); m.insert("gears", fa::gears); + m.insert("genderless", fa::genderless); m.insert("gift", fa::gift); m.insert("git", fa::git); m.insert("gitsquare", fa::gitsquare); @@ -437,6 +450,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("googleplussquare", fa::googleplussquare); m.insert("googlewallet", fa::googlewallet); m.insert("graduationcap", fa::graduationcap); + m.insert("gratipay", fa::gratipay); m.insert("group", fa::group); m.insert("hsquare", fa::hsquare); m.insert("hackernews", fa::hackernews); @@ -449,9 +463,11 @@ bool QtAwesome::initFontAwesome( ) m.insert("headphones", fa::headphones); m.insert("heart", fa::heart); m.insert("hearto", fa::hearto); + m.insert("heartbeat", fa::heartbeat); m.insert("history", fa::history); m.insert("home", fa::home); m.insert("hospitalo", fa::hospitalo); + m.insert("hotel", fa::hotel); m.insert("html5", fa::html5); m.insert("ils", fa::ils); m.insert("image", fa::image); @@ -475,6 +491,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("lastfm", fa::lastfm); m.insert("lastfmsquare", fa::lastfmsquare); m.insert("leaf", fa::leaf); + m.insert("leanpub", fa::leanpub); m.insert("legal", fa::legal); m.insert("lemono", fa::lemono); m.insert("leveldown", fa::leveldown); @@ -488,7 +505,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("link", fa::link); m.insert("linkedin", fa::linkedin); m.insert("linkedinsquare", fa::linkedinsquare); - m.insert("linuxicon", fa::linuxicon); + m.insert("linux", fa::linux); m.insert("list", fa::list); m.insert("listalt", fa::listalt); m.insert("listol", fa::listol); @@ -506,10 +523,17 @@ bool QtAwesome::initFontAwesome( ) m.insert("mailreplyall", fa::mailreplyall); m.insert("male", fa::male); m.insert("mapmarker", fa::mapmarker); + m.insert("mars", fa::mars); + m.insert("marsdouble", fa::marsdouble); + m.insert("marsstroke", fa::marsstroke); + m.insert("marsstrokeh", fa::marsstrokeh); + m.insert("marsstrokev", fa::marsstrokev); m.insert("maxcdn", fa::maxcdn); m.insert("meanpath", fa::meanpath); + m.insert("medium", fa::medium); m.insert("medkit", fa::medkit); m.insert("meho", fa::meho); + m.insert("mercury", fa::mercury); m.insert("microphone", fa::microphone); m.insert("microphoneslash", fa::microphoneslash); m.insert("minus", fa::minus); @@ -521,8 +545,10 @@ bool QtAwesome::initFontAwesome( ) m.insert("money", fa::money); m.insert("moono", fa::moono); m.insert("mortarboard", fa::mortarboard); + m.insert("motorcycle", fa::motorcycle); m.insert("music", fa::music); m.insert("navicon", fa::navicon); + m.insert("neuter", fa::neuter); m.insert("newspapero", fa::newspapero); m.insert("openid", fa::openid); m.insert("outdent", fa::outdent); @@ -546,8 +572,8 @@ bool QtAwesome::initFontAwesome( ) m.insert("piechart", fa::piechart); m.insert("piedpiper", fa::piedpiper); m.insert("piedpiperalt", fa::piedpiperalt); - m.insert("piedpipersquare", fa::piedpipersquare); m.insert("pinterest", fa::pinterest); + m.insert("pinterestp", fa::pinterestp); m.insert("pinterestsquare", fa::pinterestsquare); m.insert("plane", fa::plane); m.insert("play", fa::play); @@ -597,8 +623,10 @@ bool QtAwesome::initFontAwesome( ) m.insert("search", fa::search); m.insert("searchminus", fa::searchminus); m.insert("searchplus", fa::searchplus); + m.insert("sellsy", fa::sellsy); m.insert("send", fa::send); m.insert("sendo", fa::sendo); + m.insert("server", fa::server); m.insert("share", fa::share); m.insert("sharealt", fa::sharealt); m.insert("sharealtsquare", fa::sharealtsquare); @@ -607,11 +635,15 @@ bool QtAwesome::initFontAwesome( ) m.insert("shekel", fa::shekel); m.insert("sheqel", fa::sheqel); m.insert("shield", fa::shield); + m.insert("ship", fa::ship); + m.insert("shirtsinbulk", fa::shirtsinbulk); m.insert("shoppingcart", fa::shoppingcart); m.insert("signin", fa::signin); m.insert("signout", fa::signout); m.insert("signal", fa::signal); + m.insert("simplybuilt", fa::simplybuilt); m.insert("sitemap", fa::sitemap); + m.insert("skyatlas", fa::skyatlas); m.insert("skype", fa::skype); m.insert("slack", fa::slack); m.insert("sliders", fa::sliders); @@ -650,10 +682,12 @@ bool QtAwesome::initFontAwesome( ) m.insert("stepforward", fa::stepforward); m.insert("stethoscope", fa::stethoscope); m.insert("stop", fa::stop); + m.insert("streetview", fa::streetview); m.insert("strikethrough", fa::strikethrough); m.insert("stumbleupon", fa::stumbleupon); m.insert("stumbleuponcircle", fa::stumbleuponcircle); m.insert("subscript", fa::subscript); + m.insert("subway", fa::subway); m.insert("suitcase", fa::suitcase); m.insert("suno", fa::suno); m.insert("superscript", fa::superscript); @@ -688,12 +722,17 @@ bool QtAwesome::initFontAwesome( ) m.insert("toggleon", fa::toggleon); m.insert("toggleright", fa::toggleright); m.insert("toggleup", fa::toggleup); + m.insert("train", fa::train); + m.insert("transgender", fa::transgender); + m.insert("transgenderalt", fa::transgenderalt); m.insert("trash", fa::trash); m.insert("trasho", fa::trasho); m.insert("tree", fa::tree); m.insert("trello", fa::trello); m.insert("trophy", fa::trophy); m.insert("truck", fa::truck); + m.insert("try", fa::fa_try); + m.insert("fa_try", fa::fa_try); m.insert("tty", fa::tty); m.insert("tumblr", fa::tumblr); m.insert("tumblrsquare", fa::tumblrsquare); @@ -713,7 +752,14 @@ bool QtAwesome::initFontAwesome( ) m.insert("usd", fa::usd); m.insert("user", fa::user); m.insert("usermd", fa::usermd); + m.insert("userplus", fa::userplus); + m.insert("usersecret", fa::usersecret); + m.insert("usertimes", fa::usertimes); m.insert("users", fa::users); + m.insert("venus", fa::venus); + m.insert("venusdouble", fa::venusdouble); + m.insert("venusmars", fa::venusmars); + m.insert("viacoin", fa::viacoin); m.insert("videocamera", fa::videocamera); m.insert("vimeosquare", fa::vimeosquare); m.insert("vine", fa::vine); @@ -725,9 +771,10 @@ bool QtAwesome::initFontAwesome( ) m.insert("wechat", fa::wechat); m.insert("weibo", fa::weibo); m.insert("weixin", fa::weixin); + m.insert("whatsapp", fa::whatsapp); m.insert("wheelchair", fa::wheelchair); m.insert("wifi", fa::wifi); - m.insert("windowsicon", fa::windowsicon); + m.insert("windows", fa::windows); m.insert("won", fa::won); m.insert("wordpress", fa::wordpress); m.insert("wrench", fa::wrench); @@ -740,7 +787,6 @@ bool QtAwesome::initFontAwesome( ) m.insert("youtubeplay", fa::youtubeplay); m.insert("youtubesquare", fa::youtubesquare); - return true; } diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h index 46388bc..4c4c399 100644 --- a/QtAwesome/QtAwesome.h +++ b/QtAwesome/QtAwesome.h @@ -1,7 +1,9 @@ /** * QtAwesome - use font-awesome (or other font icons) in your c++ / Qt Application * - * Copyright 2013 - Reliable Bits Software by Blommers IT. All Rights Reserved. + * MIT Licensed + * + * Copyright 2013-2015 - Reliable Bits Software by Blommers IT. All Rights Reserved. * Author Rick Blommers */ @@ -26,7 +28,7 @@ enum class fa { alignright = 0xf038, ambulance = 0xf0f9, anchor = 0xf13d, - androidicon = 0xf17b, + android = 0xf17b, angellist = 0xf209, angledoubledown = 0xf103, angledoubleleft = 0xf100, @@ -65,6 +67,7 @@ enum class fa { barcharto = 0xf080, barcode = 0xf02a, bars = 0xf0c9, + bed = 0xf236, beer = 0xf0fc, behance = 0xf1b4, behancesquare = 0xf1b5, @@ -92,6 +95,7 @@ enum class fa { bullhorn = 0xf0a1, bullseye = 0xf140, bus = 0xf207, + buysellads = 0xf20d, cab = 0xf1ba, calculator = 0xf1ec, calendar = 0xf073, @@ -107,6 +111,8 @@ enum class fa { caretsquareoright = 0xf152, caretsquareoup = 0xf151, caretup = 0xf0d8, + cartarrowdown = 0xf218, + cartplus = 0xf217, cc = 0xf20a, ccamex = 0xf1f3, ccdiscover = 0xf1f2, @@ -155,6 +161,7 @@ enum class fa { commentso = 0xf0e6, compass = 0xf14e, compress = 0xf066, + connectdevelop = 0xf20e, copy = 0xf0c5, copyright = 0xf1f9, creditcard = 0xf09d, @@ -166,11 +173,13 @@ enum class fa { cut = 0xf0c4, cutlery = 0xf0f5, dashboard = 0xf0e4, + dashcube = 0xf210, database = 0xf1c0, dedent = 0xf03b, delicious = 0xf1a5, desktop = 0xf108, deviantart = 0xf1bd, + diamond = 0xf219, digg = 0xf1a6, dollar = 0xf155, dotcircleo = 0xf192, @@ -200,6 +209,8 @@ enum class fa { eyeslash = 0xf070, eyedropper = 0xf1fb, facebook = 0xf09a, + facebookf = 0xf09a, + facebookofficial = 0xf230, facebooksquare = 0xf082, fastbackward = 0xf049, fastforward = 0xf050, @@ -241,6 +252,7 @@ enum class fa { folderopen = 0xf07c, folderopeno = 0xf115, font = 0xf031, + forumbee = 0xf211, forward = 0xf04e, foursquare = 0xf180, frowno = 0xf119, @@ -251,6 +263,7 @@ enum class fa { ge = 0xf1d1, gear = 0xf013, gears = 0xf085, + genderless = 0xf1db, gift = 0xf06b, git = 0xf1d3, gitsquare = 0xf1d2, @@ -265,6 +278,7 @@ enum class fa { googleplussquare = 0xf0d4, googlewallet = 0xf1ee, graduationcap = 0xf19d, + gratipay = 0xf184, group = 0xf0c0, hsquare = 0xf0fd, hackernews = 0xf1d4, @@ -277,9 +291,11 @@ enum class fa { headphones = 0xf025, heart = 0xf004, hearto = 0xf08a, + heartbeat = 0xf21e, history = 0xf1da, home = 0xf015, hospitalo = 0xf0f8, + hotel = 0xf236, html5 = 0xf13b, ils = 0xf20b, image = 0xf03e, @@ -303,6 +319,7 @@ enum class fa { lastfm = 0xf202, lastfmsquare = 0xf203, leaf = 0xf06c, + leanpub = 0xf212, legal = 0xf0e3, lemono = 0xf094, leveldown = 0xf149, @@ -316,7 +333,7 @@ enum class fa { link = 0xf0c1, linkedin = 0xf0e1, linkedinsquare = 0xf08c, - linuxicon = 0xf17c, + linux = 0xf17c, list = 0xf03a, listalt = 0xf022, listol = 0xf0cb, @@ -334,10 +351,17 @@ enum class fa { mailreplyall = 0xf122, male = 0xf183, mapmarker = 0xf041, + mars = 0xf222, + marsdouble = 0xf227, + marsstroke = 0xf229, + marsstrokeh = 0xf22b, + marsstrokev = 0xf22a, maxcdn = 0xf136, meanpath = 0xf20c, + medium = 0xf23a, medkit = 0xf0fa, meho = 0xf11a, + mercury = 0xf223, microphone = 0xf130, microphoneslash = 0xf131, minus = 0xf068, @@ -349,8 +373,10 @@ enum class fa { money = 0xf0d6, moono = 0xf186, mortarboard = 0xf19d, + motorcycle = 0xf21c, music = 0xf001, navicon = 0xf0c9, + neuter = 0xf22c, newspapero = 0xf1ea, openid = 0xf19b, outdent = 0xf03b, @@ -374,8 +400,8 @@ enum class fa { piechart = 0xf200, piedpiper = 0xf1a7, piedpiperalt = 0xf1a8, - piedpipersquare = 0xf1a7, pinterest = 0xf0d2, + pinterestp = 0xf231, pinterestsquare = 0xf0d3, plane = 0xf072, play = 0xf04b, @@ -425,8 +451,10 @@ enum class fa { search = 0xf002, searchminus = 0xf010, searchplus = 0xf00e, + sellsy = 0xf213, send = 0xf1d8, sendo = 0xf1d9, + server = 0xf233, share = 0xf064, sharealt = 0xf1e0, sharealtsquare = 0xf1e1, @@ -435,11 +463,15 @@ enum class fa { shekel = 0xf20b, sheqel = 0xf20b, shield = 0xf132, + ship = 0xf21a, + shirtsinbulk = 0xf214, shoppingcart = 0xf07a, signin = 0xf090, signout = 0xf08b, signal = 0xf012, + simplybuilt = 0xf215, sitemap = 0xf0e8, + skyatlas = 0xf216, skype = 0xf17e, slack = 0xf198, sliders = 0xf1de, @@ -478,10 +510,12 @@ enum class fa { stepforward = 0xf051, stethoscope = 0xf0f1, stop = 0xf04d, + streetview = 0xf21d, strikethrough = 0xf0cc, stumbleupon = 0xf1a4, stumbleuponcircle = 0xf1a3, subscript = 0xf12c, + subway = 0xf239, suitcase = 0xf0f2, suno = 0xf185, superscript = 0xf12b, @@ -516,12 +550,16 @@ enum class fa { toggleon = 0xf205, toggleright = 0xf152, toggleup = 0xf151, + train = 0xf238, + transgender = 0xf224, + transgenderalt = 0xf225, trash = 0xf1f8, trasho = 0xf014, tree = 0xf1bb, trello = 0xf181, trophy = 0xf091, truck = 0xf0d1, + fa_try = 0xf195, // add prefix fa_ (try is a keyword) tty = 0xf1e4, tumblr = 0xf173, tumblrsquare = 0xf174, @@ -541,7 +579,14 @@ enum class fa { usd = 0xf155, user = 0xf007, usermd = 0xf0f0, + userplus = 0xf234, + usersecret = 0xf21b, + usertimes = 0xf235, users = 0xf0c0, + venus = 0xf221, + venusdouble = 0xf226, + venusmars = 0xf228, + viacoin = 0xf237, videocamera = 0xf03d, vimeosquare = 0xf194, vine = 0xf1ca, @@ -553,9 +598,10 @@ enum class fa { wechat = 0xf1d7, weibo = 0xf18a, weixin = 0xf1d7, + whatsapp = 0xf232, wheelchair = 0xf193, wifi = 0xf1eb, - windowsicon = 0xf17a, + windows = 0xf17a, won = 0xf159, wordpress = 0xf19a, wrench = 0xf0ad, diff --git a/QtAwesome/QtAwesome.pro.user.3.2-pre1 b/QtAwesome/QtAwesome.pro.user.3.2-pre1 new file mode 100644 index 0000000..da1058e --- /dev/null +++ b/QtAwesome/QtAwesome.pro.user.3.2-pre1 @@ -0,0 +1,262 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + false + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + false + false + 1 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.3 clang 64bit + Desktop Qt 5.3 clang 64bit + qt.53.clang_64_kit + 0 + 0 + 0 + + /Users/rick/bit/github/qtawesome/build-QtAwesome-Desktop_Qt_5_3_clang_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /Users/rick/bit/github/qtawesome/build-QtAwesome-Desktop_Qt_5_3_clang_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + /opt/local/bin/valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + + false + %{buildDir} + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {a846ca6b-770e-4f80-9331-daae2d8c60b6} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/QtAwesome/QtAwesome.qrc b/QtAwesome/QtAwesome.qrc index b5c6082..4b13b64 100644 --- a/QtAwesome/QtAwesome.qrc +++ b/QtAwesome/QtAwesome.qrc @@ -1,5 +1,5 @@ - fonts/fontawesome-4.2.0.ttf + fonts/fontawesome-4.3.0.ttf diff --git a/QtAwesome/fonts/fontawesome-4.2.0.ttf b/QtAwesome/fonts/fontawesome-4.3.0.ttf similarity index 81% rename from QtAwesome/fonts/fontawesome-4.2.0.ttf rename to QtAwesome/fonts/fontawesome-4.3.0.ttf index 96a3639..ed9372f 100644 Binary files a/QtAwesome/fonts/fontawesome-4.2.0.ttf and b/QtAwesome/fonts/fontawesome-4.3.0.ttf differ diff --git a/QtAwesomeSample/QtAwesomeSample.pro.user.3.2-pre1 b/QtAwesomeSample/QtAwesomeSample.pro.user.3.2-pre1 new file mode 100644 index 0000000..1814da0 --- /dev/null +++ b/QtAwesomeSample/QtAwesomeSample.pro.user.3.2-pre1 @@ -0,0 +1,263 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + false + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + false + false + 1 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.3 clang 64bit + Desktop Qt 5.3 clang 64bit + qt.53.clang_64_kit + 0 + 0 + 0 + + /Users/rick/bit/github/qtawesome/build-QtAwesomeSample-Desktop_Qt_5_3_clang_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /Users/rick/bit/github/qtawesome/build-QtAwesomeSample-Desktop_Qt_5_3_clang_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + /opt/local/bin/valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + QtAwesomeSample + + Qt4ProjectManager.Qt4RunConfiguration:/Users/rick/bit/github/qtawesome/QtAwesomeSample/QtAwesomeSample.pro + + QtAwesomeSample.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.EnvironmentId + {a846ca6b-770e-4f80-9331-daae2d8c60b6} + + + ProjectExplorer.Project.Updater.FileVersion + 15 + + diff --git a/QtAwesomeSample/main.cpp b/QtAwesomeSample/main.cpp index cec506a..390470e 100644 --- a/QtAwesomeSample/main.cpp +++ b/QtAwesomeSample/main.cpp @@ -1,5 +1,7 @@ /** - * Copyright 2011-2013 - Reliable Bits Software by Blommers IT. All Rights Reserved. + * MIT Licensed + * + * Copyright 2011-2015 - Reliable Bits Software by Blommers IT. All Rights Reserved. * Author Rick Blommers */ diff --git a/README.md b/README.md index 7360e6c..2a6b7d4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Updated to FontAwesome 4 and c++11 This library has been updated to Font Awesome version 4 and now requires c++11 specific features. -The current Font Awesome version is **4.2.0**. +The current Font Awesome version is **4.3.0**. You can find the previous FontAwesome 3 library in the [fontawesome-3 branch](https://github.com/gamecreature/QtAwesome/tree/fontawesome-3). This branch is c++11 free!