← Back to branch summary

~mterry/qtmir/warn-on-xapp

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/Application.pro

  • Committer: Gerry Boland
  • Date: 2014-07-01 13:38:06 UTC
  • mto: This revision was merged to the branch mainline in revision 158.
  • Revision ID: gerry.boland@canonical.com-20140701133806-lwfnplkijthydzj4
Update QML plugin: rename to Unity.Application, merge latest unity-mir changes, add tests (not passing yet) and use category logging

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/Application.pro
4
4
QT       += core quick dbus
5
5
QT       += quick-private qml-private core-private
6
6
QT       += gui-private # annoyingly needed by included NativeInterface
7
 
CONFIG   += link_pkgconfig plugin debug
 
7
CONFIG   += link_pkgconfig plugin debug no_keywords # keywords clash with ProcessC++
8
8
 
9
9
# CONFIG += c++11 # only enables C++0x
10
 
QMAKE_CXXFLAGS = -std=c++11 -fvisibility=hidden -fvisibility-inlines-hidden -Werror -Wall
 
10
QMAKE_CXXFLAGS = -std=c++11 -Werror -Wall
11
11
QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
12
12
 
13
 
PKGCONFIG += mircommon mirclient mirserver glib-2.0 ubuntu-app-launch-2
 
13
PKGCONFIG += mircommon mirclient mirserver glib-2.0 process-cpp ubuntu-app-launch-2
14
14
 
15
15
INCLUDEPATH += ../../../platforms/mirserver
16
16
LIBS += -L../../../platforms/mirserver -lqpa-mirserver
34
34
    ubuntukeyboardinfo.cpp \
35
35
    mirsurfaceitem.cpp \
36
36
    mirbuffersgtexture.cpp \
37
 
    windowscreenshotprovider.cpp
 
37
    processcontroller.cpp \
 
38
    proc_info.cpp \
 
39
    windowscreenshotprovider.cpp \
 
40
    upstart/applicationcontroller.cpp \
 
41
 
38
42
 
39
43
HEADERS += application_manager.h \
 
44
    applicationcontroller.h \
40
45
    application.h \
41
46
    debughelpers.h \
42
47
    desktopfilereader.h \
48
53
    /usr/include/unity/shell/application/ApplicationManagerInterface.h \
49
54
    /usr/include/unity/shell/application/ApplicationInfoInterface.h \
50
55
    mirsurfaceitem.h \
51
 
    mirbuffersgtexture.h
52
 
    windowscreenshotprovider.h
 
56
    mirbuffersgtexture.h \
 
57
    processcontroller.h \
 
58
    proc_info.h \
 
59
    windowscreenshotprovider.h \
 
60
    upstart/applicationcontroller.h
53
61
 
54
62
installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
55
63