Ubuntu UI Toolkit

Merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-ubuntu-qt-module-projects-clean-up into lp:ubuntu-ui-toolkit/staging

  1. uitk-ubuntu-qt-module-projects-clean-up
  2. Merge into staging
Proposed by Loïc Molinari
Status: Merged
Approved by: Zsombor Egri
Approved revision: 2098
Merged at revision: 2098
Proposed branch: lp:~loic.molinari/ubuntu-ui-toolkit/uitk-ubuntu-qt-module-projects-clean-up
Merge into: lp:ubuntu-ui-toolkit/staging
Prerequisite: lp:~loic.molinari/ubuntu-ui-toolkit/uitk-header-inclusion-clean-up
Diff against target: 642 lines (+274/-292)
4 files modified
features/ubuntu_qt_module.prf (+11/-4)
src/UbuntuGestures/UbuntuGestures.pro (+29/-34)
src/UbuntuMetrics/UbuntuMetrics.pro (+16/-22)
src/UbuntuToolkit/UbuntuToolkit.pro (+218/-232)
To merge this branch: bzr merge lp:~loic.molinari/ubuntu-ui-toolkit/uitk-ubuntu-qt-module-projects-clean-up
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+305443@code.launchpad.net

Commit message

Cleaned up ubuntu_qt_module.prf and the libs using it.

1/ Moved the common config options from the pro files to the prf file to avoid duplications and simplify the files.

2/ Removed the useless "TEMPLATE=lib" and "load(qt_build_config)" lines from the pro files since it's done for us by qt_module.prf.

3/ Use QT= instead of QT*= since it's well defined that by default its content is "core gui".

4/ Prefixed headers and sources by $$PWD/ and sorted the lines alphabetically.

5/ Merged the SOURCES declarations in UbuntuToolkit.pro.

6/ Removed the useless "DEFINES += QT_USE_QSTRINGBUILDER" line from UbuntuToolkit.pro since it's done for us by qt_module.prf.

7/ Removed the useless "QMAKE_CXXFLAGS -= -Werror=deprecated-declarations" and "DEFINES -= QT_DEPRECATED_WARNINGS" lines from UbuntuToolkit.pro since it's already done in ubuntu_qt_module.prf.

8/ Added a few comments.

Description of the change

Cleaned up ubuntu_qt_module.prf and the libs using it.

1/ Moved the common config options from the pro files to the prf file to avoid duplications and simplify the files.

2/ Removed the useless "TEMPLATE=lib" and "load(qt_build_config)" lines from the pro files since it's done for us by qt_module.prf.

3/ Use QT= instead of QT*= since it's well defined that by default its content is "core gui".

4/ Prefixed headers and sources by $$PWD/ and sorted the lines alphabetically.

5/ Merged the SOURCES declarations in UbuntuToolkit.pro.

6/ Removed the useless "DEFINES += QT_USE_QSTRINGBUILDER" line from UbuntuToolkit.pro since it's done for us by qt_module.prf.

7/ Removed the useless "QMAKE_CXXFLAGS -= -Werror=deprecated-declarations" and "DEFINES -= QT_DEPRECATED_WARNINGS" lines from UbuntuToolkit.pro since it's already done in ubuntu_qt_module.prf.

8/ Added a few comments.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1167/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6207/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1167/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1376/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6208/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1376/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1383/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6210/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1383/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1133/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6211/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1133/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/735/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1376/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1383
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1167
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1133
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6212/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6208
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6210
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6207
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6211

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/735/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1169/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6217/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1169/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1385/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6218/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1385/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1135/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6219/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1135/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1378/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6220/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1378/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/737/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1378
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1378/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1385
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1169
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1135
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6221/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6220
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6218
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6217
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6219

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/737/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Looks good.

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1175/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6246/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1175/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1391/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6247/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1391/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1141/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6248/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1141/rebuild

review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

PASSED: Continuous integration, rev:2098
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1384/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6249/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1384/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'features/ubuntu_qt_module.prf'
2--- features/ubuntu_qt_module.prf 2016-09-02 12:11:02 +0000
3+++ features/ubuntu_qt_module.prf 2016-09-12 08:45:38 +0000
4@@ -1,12 +1,18 @@
5-# Enable autocreation of include directory
6+# Enables the copy of private and public headers to an include directory at the
7+# root of the sources before compilation and the copy of the compiled libraries
8+# after compilation. Must be set before loading qt_module.
9 CONFIG += git_build
10
11 load(qt_module)
12
13+# Disable CMake config file creation. Must be set after loading qt_module.
14 CONFIG -= create_cmake
15
16-# when building against the system Qt we pick up the CXX_FLAGS for a release build
17-# reset them to the default debug build flags
18+# Common config options.
19+CONFIG += dll no_keywords c++11
20+
21+# When building against the system Qt we pick up the CXX_FLAGS for a release
22+# build reset them to the default debug build flags.
23 !build_with_qt: {
24 CONFIG(debug, debug|release) {
25 QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG
26@@ -14,8 +20,9 @@
27 }
28 }
29
30+# Make all warnings into errors.
31 QMAKE_CXXFLAGS += -Werror
32
33-#do not warn for deprecated declarations
34+# Do not warn for deprecated declarations.
35 QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
36 DEFINES -= QT_DEPRECATED_WARNINGS
37
38=== modified file 'src/UbuntuGestures/UbuntuGestures.pro'
39--- src/UbuntuGestures/UbuntuGestures.pro 2016-09-12 08:45:38 +0000
40+++ src/UbuntuGestures/UbuntuGestures.pro 2016-09-12 08:45:38 +0000
41@@ -1,38 +1,33 @@
42-TEMPLATE=lib
43-TARGET=UbuntuGestures
44-
45-QT *= core-private gui-private qml-private quick-private
46-
47-CONFIG += dll no_keywords c++11
48+TARGET = UbuntuGestures
49+QT = core-private gui-private qml-private quick-private
50
51 DEFINES += UBUNTUGESTURES_LIBRARY
52
53-load(qt_build_config)
54+HEADERS += \
55+ $$PWD/candidateinactivitytimer_p.h \
56+ $$PWD/damper_p.h \
57+ $$PWD/debughelpers_p.h \
58+ $$PWD/pool_p.h \
59+ $$PWD/timer_p.h \
60+ $$PWD/timesource_p.h \
61+ $$PWD/touchownershipevent_p.h \
62+ $$PWD/touchregistry_p.h \
63+ $$PWD/ubuntugesturesglobal.h \
64+ $$PWD/ubuntugesturesmodule.h \
65+ $$PWD/ucswipearea_p.h \
66+ $$PWD/ucswipearea_p_p.h \
67+ $$PWD/unownedtouchevent_p.h
68+
69+SOURCES += \
70+ $$PWD/candidateinactivitytimer.cpp \
71+ $$PWD/damper.cpp \
72+ $$PWD/debughelpers.cpp \
73+ $$PWD/timer.cpp \
74+ $$PWD/timesource.cpp \
75+ $$PWD/touchownershipevent.cpp \
76+ $$PWD/touchregistry.cpp \
77+ $$PWD/ubuntugesturesmodule.cpp \
78+ $$PWD/ucswipearea.cpp \
79+ $$PWD/unownedtouchevent.cpp
80+
81 load(ubuntu_qt_module)
82-
83-HEADERS += candidateinactivitytimer_p.h \
84- debughelpers_p.h \
85- timer_p.h \
86- timesource_p.h \
87- touchownershipevent_p.h \
88- touchregistry_p.h \
89- unownedtouchevent_p.h \
90- ubuntugesturesglobal.h \
91- pool_p.h \
92- ucswipearea_p.h \
93- ucswipearea_p_p.h \
94- damper_p.h \
95- ubuntugesturesmodule.h
96-
97-
98-SOURCES += candidateinactivitytimer.cpp \
99- debughelpers.cpp \
100- timer.cpp \
101- timesource.cpp \
102- touchownershipevent.cpp \
103- touchregistry.cpp \
104- unownedtouchevent.cpp \
105- ucswipearea.cpp \
106- damper.cpp \
107- ubuntugesturesmodule.cpp
108-
109
110=== modified file 'src/UbuntuMetrics/UbuntuMetrics.pro'
111--- src/UbuntuMetrics/UbuntuMetrics.pro 2016-08-04 22:54:21 +0000
112+++ src/UbuntuMetrics/UbuntuMetrics.pro 2016-09-12 08:45:38 +0000
113@@ -1,7 +1,5 @@
114-TEMPLATE=lib
115-TARGET=UbuntuMetrics
116-QT += core-private gui-private quick-private
117-CONFIG += dll no_keywords c++11
118+TARGET = UbuntuMetrics
119+QT = core-private gui-private quick-private
120 LIBS += -ldl
121
122 contains(QT_CONFIG, opengles2) {
123@@ -12,30 +10,26 @@
124 DEFINES += LTTNG_PLUGIN_INSTALL_PATH=\\\"$$[QT_INSTALL_PLUGINS]/ubuntu/metrics/libumlttng.so\\\"
125 DEFINES += LTTNG_PLUGIN_BUILD_PATH=\\\"$$OUT_PWD/lttng/libumlttng.so\\\"
126
127-load(qt_build_config)
128-load(ubuntu_qt_module)
129-
130-PUBLIC_HEADERS = \
131- $$PWD/ubuntumetricsglobal.h \
132- $$PWD/events.h \
133- $$PWD/logger.h \
134- $$PWD/applicationmonitor.h
135-
136 HEADERS += \
137- $${PUBLIC_HEADERS} \
138- $$PWD/ubuntumetricsglobal_p.h \
139+ $$PWD/applicationmonitor.h \
140+ $$PWD/applicationmonitor_p.h \
141+ $$PWD/bitmaptext_p.h \
142 $$PWD/bitmaptextfont_p.h \
143+ $$PWD/events.h \
144 $$PWD/events_p.h \
145+ $$PWD/gputimer_p.h \
146+ $$PWD/logger.h \
147 $$PWD/logger_p.h \
148- $$PWD/gputimer_p.h \
149- $$PWD/bitmaptext_p.h \
150 $$PWD/overlay_p.h \
151- $$PWD/applicationmonitor_p.h
152+ $$PWD/ubuntumetricsglobal.h \
153+ $$PWD/ubuntumetricsglobal_p.h \
154
155 SOURCES += \
156+ $$PWD/applicationmonitor.cpp \
157+ $$PWD/bitmaptext.cpp \
158 $$PWD/events.cpp \
159+ $$PWD/gputimer.cpp \
160 $$PWD/logger.cpp \
161- $$PWD/gputimer.cpp \
162- $$PWD/bitmaptext.cpp \
163- $$PWD/overlay.cpp \
164- $$PWD/applicationmonitor.cpp
165+ $$PWD/overlay.cpp
166+
167+load(ubuntu_qt_module)
168
169=== modified file 'src/UbuntuToolkit/UbuntuToolkit.pro'
170--- src/UbuntuToolkit/UbuntuToolkit.pro 2016-09-12 08:45:38 +0000
171+++ src/UbuntuToolkit/UbuntuToolkit.pro 2016-09-12 08:45:38 +0000
172@@ -1,8 +1,6 @@
173-TEMPLATE=lib
174-TARGET=UbuntuToolkit
175-
176-QT *= core-private gui-private qml-private quick-private testlib dbus svg organizer \
177- UbuntuGestures-private UbuntuMetrics
178+TARGET = UbuntuToolkit
179+QT = core-private gui-private qml-private quick-private testlib dbus svg organizer \
180+ UbuntuGestures-private UbuntuMetrics
181
182 unix {
183 CONFIG += link_pkgconfig
184@@ -12,239 +10,222 @@
185 !contains(QT_ARCH, arm) {
186 DEFINES += UBUNTUTOOLKIT_ENABLE_X11_TOUCH_EMULATION
187 LIBS += -lX11 -lxcb -lXi
188-
189 SOURCES += mousetouchadaptor_x11.cpp
190 }
191
192-CONFIG += dll no_keywords c++11
193-
194 DEFINES += UBUNTUTOOLKIT_LIBRARY
195-#comment in the following line to disable traces
196-#DEFINES += QT_NO_DEBUG_OUTPUT
197-DEFINES += QT_USE_QSTRINGBUILDER
198-
199-load(qt_build_config)
200-load(ubuntu_qt_module)
201-
202-QMAKE_CXXFLAGS -= -Werror=deprecated-declarations
203-DEFINES -= QT_DEPRECATED_WARNINGS
204-DEFINES -= QT_ASCII_CAST_WARNINGS
205-
206-HEADERS += \
207- colorutils_p.h \
208- ubuntutoolkitglobal.h \
209- tree_p.h \
210- asyncloader_p.h \
211- asyncloader_p_p.h \
212- mousetouchadaptor_p.h \
213- mousetouchadaptor_p_p.h \
214- propertychange_p.h \
215- ubuntutoolkitmodule.h \
216- splitview_p.h \
217- splitview_p_p.h \
218- privates/splitviewhandler_p.h \
219- menu_p_p.h \
220- menubar_p_p.h \
221- menu_p.h \
222- menubar_p.h \
223- menugroup_p.h
224-
225-SOURCES += \
226- colorutils.cpp \
227- tree.cpp \
228- asyncloader.cpp \
229- mousetouchadaptor.cpp \
230- propertychange.cpp \
231- ubuntutoolkitmodule.cpp \
232- splitview.cpp \
233- privates/splitviewhandler.cpp \
234- splitviewlayout.cpp \
235- menu.cpp \
236- menubar.cpp \
237- menugroup.cpp
238-
239-HEADERS += \
240- uctheme_p.h \
241- i18n_p.h \
242- listener_p.h \
243- ucscalingimageprovider_p.h \
244- ucunits_p.h \
245- ucqquickimageextension_p.h \
246- quickutils_p.h \
247- ucubuntushapetextures_p.h \
248- ucubuntushape_p.h \
249- ucubuntushapeoverlay_p.h \
250- ucproportionalshape_p.h \
251- inversemouseareatype_p.h \
252- qquickclipboard_p.h \
253- qquickmimedata_p.h \
254- qquickclipboard_p_p.h \
255- ucubuntuanimation_p.h \
256- ucfontutils_p.h \
257- ucapplication_p.h \
258- ucarguments_p.h \
259- ucargument_p.h \
260- ucalarm_p.h \
261- ucalarm_p_p.h \
262- alarmmanager_p_p.h \
263- alarmmanager_p.h \
264- ucalarmmodel_p.h \
265- unitythemeiconprovider_p.h \
266- adapters/alarmsadapter_p.h \
267- ucstatesaver_p.h \
268- sortbehavior_p.h \
269- filterbehavior_p.h \
270- sortfiltermodel_p.h \
271- statesaverbackend_p.h \
272- ucstatesaver_p_p.h \
273- ucurihandler_p.h \
274- ucinversemouse_p.h \
275- ucmouse_p.h \
276- unixsignalhandler_p.h \
277- ucstyleditembase_p.h \
278- ucstyleditembase_p_p.h \
279- ucaction_p.h \
280- ucactioncontext_p.h \
281- ucactionmanager_p.h \
282- adapters/actionsproxy_p.h \
283- adapters/dbuspropertywatcher_p.h \
284- uclistitem_p.h \
285- uclistitem_p_p.h \
286- uclistitemactions_p.h \
287- uclistitemactions_p_p.h \
288- uclistitemstyle_p.h \
289- ucserviceproperties_p.h \
290- ucserviceproperties_p_p.h \
291- privates/listitemdragarea_p.h \
292- privates/listitemdraghandler_p.h \
293- privates/listitemselection_p.h \
294- ucdeprecatedtheme_p.h \
295- ucdefaulttheme_p.h \
296- ucstylehints_p.h \
297- ucslotslayout_p.h \
298- ucslotslayout_p_p.h \
299- livetimer_p.h \
300- livetimer_p_p.h \
301- timeutils_p.h \
302- ucactionitem_p.h \
303- ucactionitem_p_p.h \
304- uchaptics_p.h \
305- ucabstractbutton_p.h \
306- ucabstractbutton_p_p.h \
307- ucmargins_p.h \
308- ucthemingextension_p.h \
309- ucheader_p.h \
310- uclabel_p.h \
311- uclistitemlayout_p.h \
312- privates/threelabelsslot_p.h \
313- ucimportversionchecker_p.h \
314- ucbottomedgehint_p.h \
315- ucbottomedgehint_p_p.h \
316- ucmathutils_p.h \
317- ucbottomedge_p.h \
318- ucbottomedge_p_p.h \
319- ucbottomedgestyle_p.h \
320- ucbottomedgeregion_p.h \
321- ucpagetreenode_p.h \
322- ucpagetreenode_p_p.h \
323- ucmainviewbase_p.h \
324- ucmainviewbase_p_p.h \
325- ucperformancemonitor_p.h \
326- privates/listviewextensions_p.h \
327- privates/frame_p.h \
328- privates/ucpagewrapper_p.h \
329- privates/ucpagewrapper_p_p.h \
330- privates/ucpagewrapperincubator_p.h \
331- privates/appheaderbase_p.h \
332- label_p.h \
333- ucbottomedgeregion_p_p.h \
334- privates/ucscrollbarutils_p.h \
335- actionlist_p.h \
336- exclusivegroup_p.h
337+
338+# Uncomment to compile out qDebug() calls.
339+# DEFINES += QT_NO_DEBUG_OUTPUT
340+
341+HEADERS += \
342+ $$PWD/actionlist_p.h \
343+ $$PWD/adapters/actionsproxy_p.h \
344+ $$PWD/adapters/alarmsadapter_p.h \
345+ $$PWD/adapters/dbuspropertywatcher_p.h \
346+ $$PWD/alarmmanager_p.h \
347+ $$PWD/alarmmanager_p_p.h \
348+ $$PWD/asyncloader_p.h \
349+ $$PWD/asyncloader_p_p.h \
350+ $$PWD/colorutils_p.h \
351+ $$PWD/exclusivegroup_p.h \
352+ $$PWD/filterbehavior_p.h \
353+ $$PWD/i18n_p.h \
354+ $$PWD/inversemouseareatype_p.h \
355+ $$PWD/label_p.h \
356+ $$PWD/listener_p.h \
357+ $$PWD/livetimer_p.h \
358+ $$PWD/livetimer_p_p.h \
359+ $$PWD/menu_p.h \
360+ $$PWD/menu_p_p.h \
361+ $$PWD/menubar_p.h \
362+ $$PWD/menubar_p_p.h \
363+ $$PWD/menugroup_p.h \
364+ $$PWD/mousetouchadaptor_p.h \
365+ $$PWD/mousetouchadaptor_p_p.h \
366+ $$PWD/privates/appheaderbase_p.h \
367+ $$PWD/privates/frame_p.h \
368+ $$PWD/privates/listitemdragarea_p.h \
369+ $$PWD/privates/listitemdraghandler_p.h \
370+ $$PWD/privates/listitemselection_p.h \
371+ $$PWD/privates/listviewextensions_p.h \
372+ $$PWD/privates/splitviewhandler_p.h \
373+ $$PWD/privates/threelabelsslot_p.h \
374+ $$PWD/privates/ucpagewrapper_p.h \
375+ $$PWD/privates/ucpagewrapper_p_p.h \
376+ $$PWD/privates/ucpagewrapperincubator_p.h \
377+ $$PWD/privates/ucscrollbarutils_p.h \
378+ $$PWD/propertychange_p.h \
379+ $$PWD/qquickclipboard_p.h \
380+ $$PWD/qquickclipboard_p_p.h \
381+ $$PWD/qquickmimedata_p.h \
382+ $$PWD/quickutils_p.h \
383+ $$PWD/sortbehavior_p.h \
384+ $$PWD/sortfiltermodel_p.h \
385+ $$PWD/splitview_p.h \
386+ $$PWD/splitview_p_p.h \
387+ $$PWD/statesaverbackend_p.h \
388+ $$PWD/timeutils_p.h \
389+ $$PWD/tree_p.h \
390+ $$PWD/ubuntutoolkitglobal.h \
391+ $$PWD/ubuntutoolkitmodule.h \
392+ $$PWD/ucabstractbutton_p.h \
393+ $$PWD/ucabstractbutton_p_p.h \
394+ $$PWD/ucaction_p.h \
395+ $$PWD/ucactioncontext_p.h \
396+ $$PWD/ucactionitem_p.h \
397+ $$PWD/ucactionitem_p_p.h \
398+ $$PWD/ucactionmanager_p.h \
399+ $$PWD/ucalarm_p.h \
400+ $$PWD/ucalarm_p_p.h \
401+ $$PWD/ucalarmmodel_p.h \
402+ $$PWD/ucapplication_p.h \
403+ $$PWD/ucargument_p.h \
404+ $$PWD/ucarguments_p.h \
405+ $$PWD/ucbottomedge_p.h \
406+ $$PWD/ucbottomedge_p_p.h \
407+ $$PWD/ucbottomedgehint_p.h \
408+ $$PWD/ucbottomedgehint_p_p.h \
409+ $$PWD/ucbottomedgeregion_p.h \
410+ $$PWD/ucbottomedgeregion_p_p.h \
411+ $$PWD/ucbottomedgestyle_p.h \
412+ $$PWD/ucdefaulttheme_p.h \
413+ $$PWD/ucdeprecatedtheme_p.h \
414+ $$PWD/ucfontutils_p.h \
415+ $$PWD/uchaptics_p.h \
416+ $$PWD/ucheader_p.h \
417+ $$PWD/ucimportversionchecker_p.h \
418+ $$PWD/ucinversemouse_p.h \
419+ $$PWD/uclabel_p.h \
420+ $$PWD/uclistitem_p.h \
421+ $$PWD/uclistitem_p_p.h \
422+ $$PWD/uclistitemactions_p.h \
423+ $$PWD/uclistitemactions_p_p.h \
424+ $$PWD/uclistitemlayout_p.h \
425+ $$PWD/uclistitemstyle_p.h \
426+ $$PWD/ucmainviewbase_p.h \
427+ $$PWD/ucmainviewbase_p_p.h \
428+ $$PWD/ucmargins_p.h \
429+ $$PWD/ucmathutils_p.h \
430+ $$PWD/ucmouse_p.h \
431+ $$PWD/ucpagetreenode_p.h \
432+ $$PWD/ucpagetreenode_p_p.h \
433+ $$PWD/ucperformancemonitor_p.h \
434+ $$PWD/ucproportionalshape_p.h \
435+ $$PWD/ucqquickimageextension_p.h \
436+ $$PWD/ucscalingimageprovider_p.h \
437+ $$PWD/ucserviceproperties_p.h \
438+ $$PWD/ucserviceproperties_p_p.h \
439+ $$PWD/ucslotslayout_p.h \
440+ $$PWD/ucslotslayout_p_p.h \
441+ $$PWD/ucstatesaver_p.h \
442+ $$PWD/ucstatesaver_p_p.h \
443+ $$PWD/ucstyleditembase_p.h \
444+ $$PWD/ucstyleditembase_p_p.h \
445+ $$PWD/ucstylehints_p.h \
446+ $$PWD/uctheme_p.h \
447+ $$PWD/ucthemingextension_p.h \
448+ $$PWD/ucubuntuanimation_p.h \
449+ $$PWD/ucubuntushape_p.h \
450+ $$PWD/ucubuntushapeoverlay_p.h \
451+ $$PWD/ucubuntushapetextures_p.h \
452+ $$PWD/ucunits_p.h \
453+ $$PWD/ucurihandler_p.h \
454+ $$PWD/unitythemeiconprovider_p.h \
455+ $$PWD/unixsignalhandler_p.h
456
457 SOURCES += \
458- uctheme.cpp \
459- i18n.cpp \
460- listener.cpp \
461- ucscalingimageprovider.cpp \
462- ucunits.cpp \
463- ucqquickimageextension.cpp \
464- quickutils.cpp \
465- ucubuntushapetextures.cpp \
466- ucubuntushape.cpp \
467- ucubuntushapeoverlay.cpp \
468- ucproportionalshape.cpp \
469- inversemouseareatype.cpp \
470- qquickclipboard.cpp \
471- qquickmimedata.cpp \
472- ucubuntuanimation.cpp \
473- ucfontutils.cpp \
474- ucapplication.cpp \
475- ucarguments.cpp \
476- ucargument.cpp \
477- ucalarm.cpp \
478- alarmmanager_p.cpp \
479- ucalarmmodel.cpp \
480- unitythemeiconprovider.cpp \
481- ucstatesaver.cpp \
482- sortbehavior.cpp \
483- filterbehavior.cpp \
484- sortfiltermodel.cpp \
485- statesaverbackend_p.cpp \
486- ucurihandler.cpp \
487- ucmousefilters.cpp \
488- unixsignalhandler_p.cpp \
489- ucstyleditembase.cpp \
490- ucaction.cpp \
491- ucactioncontext.cpp \
492- ucactionmanager.cpp \
493- adapters/actionsproxy_p.cpp \
494- adapters/dbuspropertywatcher_p.cpp \
495- uclistitem.cpp \
496- uclistitemactions.cpp \
497- uclistitemstyle.cpp \
498- ucviewitemsattached.cpp \
499- ucserviceproperties.cpp \
500- privates/listitemdragarea.cpp \
501- privates/listitemdraghandler.cpp \
502- privates/listitemexpansion.cpp \
503- privates/listitemselection.cpp \
504- ucdeprecatedtheme.cpp \
505- ucdefaulttheme.cpp \
506- ucstylehints.cpp \
507- ucslotslayout.cpp \
508- livetimer.cpp \
509- livetimer_p.cpp \
510- ucactionitem.cpp \
511- uchaptics.cpp \
512- ucabstractbutton.cpp \
513- ucthemingextension.cpp \
514- ucheader.cpp \
515- uclabel.cpp \
516- uclistitemlayout.cpp \
517- privates/threelabelsslot_p.cpp \
518- ucimportversionchecker_p.cpp \
519- ucbottomedgehint.cpp \
520- ucmathutils.cpp \
521- ucbottomedge.cpp \
522- ucbottomedgestyle.cpp \
523- ucbottomedgeregion.cpp \
524- ucpagetreenode.cpp \
525- ucmainviewbase.cpp \
526- ucperformancemonitor.cpp \
527- privates/listviewextensions.cpp \
528- privates/frame.cpp \
529- privates/ucpagewrapper.cpp \
530- privates/ucpagewrapperincubator.cpp \
531- privates/appheaderbase.cpp \
532- privates/ucscrollbarutils.cpp \
533- actionlist.cpp \
534- exclusivegroup.cpp
535-
536-# adapters
537-SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
538-
539-#resources
540+ $$PWD/actionlist.cpp \
541+ $$PWD/adapters/actionsproxy_p.cpp \
542+ $$PWD/adapters/alarmsadapter_organizer.cpp \
543+ $$PWD/adapters/dbuspropertywatcher_p.cpp \
544+ $$PWD/alarmmanager_p.cpp \
545+ $$PWD/asyncloader.cpp \
546+ $$PWD/colorutils.cpp \
547+ $$PWD/exclusivegroup.cpp \
548+ $$PWD/filterbehavior.cpp \
549+ $$PWD/i18n.cpp \
550+ $$PWD/inversemouseareatype.cpp \
551+ $$PWD/listener.cpp \
552+ $$PWD/livetimer.cpp \
553+ $$PWD/livetimer_p.cpp \
554+ $$PWD/menu.cpp \
555+ $$PWD/menubar.cpp \
556+ $$PWD/menugroup.cpp \
557+ $$PWD/mousetouchadaptor.cpp \
558+ $$PWD/privates/appheaderbase.cpp \
559+ $$PWD/privates/frame.cpp \
560+ $$PWD/privates/listitemdragarea.cpp \
561+ $$PWD/privates/listitemdraghandler.cpp \
562+ $$PWD/privates/listitemexpansion.cpp \
563+ $$PWD/privates/listitemselection.cpp \
564+ $$PWD/privates/listviewextensions.cpp \
565+ $$PWD/privates/splitviewhandler.cpp \
566+ $$PWD/privates/threelabelsslot_p.cpp \
567+ $$PWD/privates/ucpagewrapper.cpp \
568+ $$PWD/privates/ucpagewrapperincubator.cpp \
569+ $$PWD/privates/ucscrollbarutils.cpp \
570+ $$PWD/propertychange.cpp \
571+ $$PWD/qquickclipboard.cpp \
572+ $$PWD/qquickmimedata.cpp \
573+ $$PWD/quickutils.cpp \
574+ $$PWD/sortbehavior.cpp \
575+ $$PWD/sortfiltermodel.cpp \
576+ $$PWD/splitview.cpp \
577+ $$PWD/splitviewlayout.cpp \
578+ $$PWD/statesaverbackend_p.cpp \
579+ $$PWD/tree.cpp \
580+ $$PWD/ubuntutoolkitmodule.cpp \
581+ $$PWD/ucabstractbutton.cpp \
582+ $$PWD/ucaction.cpp \
583+ $$PWD/ucactioncontext.cpp \
584+ $$PWD/ucactionitem.cpp \
585+ $$PWD/ucactionmanager.cpp \
586+ $$PWD/ucalarm.cpp \
587+ $$PWD/ucalarmmodel.cpp \
588+ $$PWD/ucapplication.cpp \
589+ $$PWD/ucargument.cpp \
590+ $$PWD/ucarguments.cpp \
591+ $$PWD/ucbottomedge.cpp \
592+ $$PWD/ucbottomedgehint.cpp \
593+ $$PWD/ucbottomedgeregion.cpp \
594+ $$PWD/ucbottomedgestyle.cpp \
595+ $$PWD/ucdefaulttheme.cpp \
596+ $$PWD/ucdeprecatedtheme.cpp \
597+ $$PWD/ucfontutils.cpp \
598+ $$PWD/uchaptics.cpp \
599+ $$PWD/ucheader.cpp \
600+ $$PWD/ucimportversionchecker_p.cpp \
601+ $$PWD/uclabel.cpp \
602+ $$PWD/uclistitem.cpp \
603+ $$PWD/uclistitemactions.cpp \
604+ $$PWD/uclistitemlayout.cpp \
605+ $$PWD/uclistitemstyle.cpp \
606+ $$PWD/ucmainviewbase.cpp \
607+ $$PWD/ucmathutils.cpp \
608+ $$PWD/ucmousefilters.cpp \
609+ $$PWD/ucpagetreenode.cpp \
610+ $$PWD/ucperformancemonitor.cpp \
611+ $$PWD/ucproportionalshape.cpp \
612+ $$PWD/ucqquickimageextension.cpp \
613+ $$PWD/ucscalingimageprovider.cpp \
614+ $$PWD/ucserviceproperties.cpp \
615+ $$PWD/ucslotslayout.cpp \
616+ $$PWD/ucstatesaver.cpp \
617+ $$PWD/ucstyleditembase.cpp \
618+ $$PWD/ucstylehints.cpp \
619+ $$PWD/uctheme.cpp \
620+ $$PWD/ucthemingextension.cpp \
621+ $$PWD/ucubuntuanimation.cpp \
622+ $$PWD/ucubuntushape.cpp \
623+ $$PWD/ucubuntushapeoverlay.cpp \
624+ $$PWD/ucubuntushapetextures.cpp \
625+ $$PWD/ucunits.cpp \
626+ $$PWD/ucurihandler.cpp \
627+ $$PWD/ucviewitemsattached.cpp \
628+ $$PWD/unitythemeiconprovider.cpp \
629+ $$PWD/unixsignalhandler_p.cpp
630+
631 RESOURCES += \
632 $$PWD/resources.qrc
633
634@@ -257,3 +238,8 @@
635 $$PWD/shaders/shapeoverlay_no_dfdy.frag \
636 $$PWD/privates/shaders/frame.vert \
637 $$PWD/privates/shaders/frame.frag
638+
639+load(ubuntu_qt_module)
640+
641+# Remove the ASCII cast warnings added by qt_module.
642+DEFINES -= QT_ASCII_CAST_WARNINGS

Subscribers

People subscribed via source and target branches