FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflicts in main.

Browse Source
This commit is contained in:
Martin Rotter 2016-08-23 07:14:18 +02:00
commit 361ed3d849
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/binaries

@ -1 +1 @@
Subproject commit 8cfd61f5f70aaf1c1bfef064f18921d10b0ded4b Subproject commit 33d704f78bdab434c42466e3eb4c521a62ee0427

7
resources/macosx/Info.plist.in
View File

@ -2,7 +2,10 @@
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9"> <plist version="0.9">
<dict> <dict>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
@ -22,7 +25,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>@SHORT_VERSION@</string> <string>@SHORT_VERSION@</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>@TYPEINFO@<string> <string>@TYPEINFO@</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.0.0</string> <string>1.0.0</string>
<key>CSResourcesFileMapped</key> <key>CSResourcesFileMapped</key>

3
src/main.cpp
View File

@ -78,6 +78,9 @@ int main(int argc, char *argv[]) {
application.setFeedReader(new FeedReader(&application)); application.setFeedReader(new FeedReader(&application));
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
// Register needed metatypes. // Register needed metatypes.
qRegisterMetaType<QList<Message> >("QList<Message>"); qRegisterMetaType<QList<Message> >("QList<Message>");
qRegisterMetaType<QList<RootItem*> >("QList<RootItem*>"); qRegisterMetaType<QList<RootItem*> >("QList<RootItem*>");