Skip to content
Commit e2d5c497 authored by Inge Wallin's avatar Inge Wallin
Browse files

Merge frameworks branch into master.

KWordQuiz is now formally a KF5 application!

Squashed commit of the following:

commit 7c708a61
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Fri Nov 14 22:48:33 2014 +0100

    Fix string

commit 2d913926
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Thu Nov 13 17:55:34 2014 -0700

    Port to kf5 a bit more so now it builds.

commit fb8e1d7b
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 23:54:11 2014 +0100

    KF5 port: Avoid lots of warnings in handling models.

commit fd1e679b
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 23:43:06 2014 +0100

    KF5 port: lots of small fixes to remove build errors or warnings

commit 5014598f
Author: Montel Laurent <montel@kde.org>
Date:   Thu Nov 13 09:12:57 2014 +0100

    Convert to qicon

commit 83f14602
Author: Montel Laurent <montel@kde.org>
Date:   Thu Nov 13 09:11:22 2014 +0100

    Fix install uirc, notifyrc file

commit a110d991
Author: Montel Laurent <montel@kde.org>
Date:   Thu Nov 13 09:08:50 2014 +0100

    We need to search Declarative too

commit 18446035
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Nov 12 19:04:27 2014 -0700

    Fix setWindowTitle calls to also call setWindowModified and add [*] placeholder.
    Add KDELibs4Support for now for kapplication->canRecoverFile method.

commit 8cc120c0
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 11:41:14 2014 +0100

    KF5 port: Fix i18nc() issues

commit 0a20ba7a
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 11:34:28 2014 +0100

    KF5 port: Fix default fonts in settings

commit 5ecab612
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 11:12:14 2014 +0100

    KF5 port:
      KGlobalSettings::*font() -->  QFontDatabase::...
      KFileDialog  -->  QFileDialog

commit bc71f1af
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 11:00:17 2014 +0100

    KF5 port: KLineEdit --> QLineEdit

    Note that completion is not yet converted because we need to be able to build
    it to test it.  Guarded by "FIXME KF5:".

commit 0a0ab662
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 10:36:41 2014 +0100

    KF5 port: Include QDialog correctly

commit 0f2efa62
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 10:35:04 2014 +0100

    KF5 port: Remove warning for unused variable

commit d3050c4b
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 10:33:25 2014 +0100

    KF5 port: Make use of automoc

    Don't include moc files explicitly. This saves us a lot of "notes" from cmake.

commit e4f2539b
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 10:29:36 2014 +0100

    KF5 port:  Include everything needed for the types that we use.

commit 656b53ff
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Wed Nov 12 10:26:13 2014 +0100

    KF5 port: kDebug -> qDebug

commit f15d5fe5
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Nov 12 13:08:42 2014 -0700

    WIP: porting to kf5
parent 0cdc9c2a
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment