← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to krita/main.cc

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/main.cc
42
42
#endif
43
43
 
44
44
    int state;
45
 
    KAboutData * aboutData = newKritaAboutData();
 
45
    KAboutData *aboutData = newKritaAboutData();
46
46
 
47
47
    KCmdLineArgs::init(argc, argv, aboutData);
48
48
 
56
56
    // then create the pixmap from an xpm: we cannot get the
57
57
    // location of our datadir before we've started our components,
58
58
    // so use an xpm.
59
 
    QPixmap pm;
60
 
    int i = random() % 3;
61
 
    if (i < 1) {
62
 
        pm = QPixmap(tear);
63
 
    }
64
 
    else {
65
 
        pm = QPixmap(notear);
66
 
    }
67
 
    
 
59
    QPixmap pm(splash_screen_xpm);
68
60
    QSplashScreen *splash = new KSplashScreen(pm);
69
61
    app.setSplashScreen(splash);
70
62