Merge conflicts in main.
This commit is contained in:
commit
361ed3d849
@ -1 +1 @@
|
||||
Subproject commit 8cfd61f5f70aaf1c1bfef064f18921d10b0ded4b
|
||||
Subproject commit 33d704f78bdab434c42466e3eb4c521a62ee0427
|
@ -2,7 +2,10 @@
|
||||
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
|
||||
<plist version="0.9">
|
||||
<dict>
|
||||
|
||||
<key>NSPrincipalClass</key>
|
||||
<string>NSApplication</string>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<string>True</string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
@ -22,7 +25,7 @@
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>@SHORT_VERSION@</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>@TYPEINFO@<string>
|
||||
<string>@TYPEINFO@</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1.0.0</string>
|
||||
<key>CSResourcesFileMapped</key>
|
||||
|
@ -78,6 +78,9 @@ int main(int argc, char *argv[]) {
|
||||
|
||||
application.setFeedReader(new FeedReader(&application));
|
||||
|
||||
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
|
||||
// Register needed metatypes.
|
||||
qRegisterMetaType<QList<Message> >("QList<Message>");
|
||||
qRegisterMetaType<QList<RootItem*> >("QList<RootItem*>");
|
||||
|
Loading…
x
Reference in New Issue
Block a user