Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Make headersclean in qtdeclarative enforce correct header conventions.
This test wasn't testing much before. Refactor it to reuse headersclean from qtbase. It will now fail to compile if the headers from this module don't follow the rules. Change-Id: I2816b85543da74f66b993b7ee705cdb9e1c0f1c8 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
- Loading branch information
Rohan McGovern
authored and
Qt by Nokia
committed
Mar 11, 2012
1 parent
ed74ec4
commit c46b030
Showing
3 changed files
with
17 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,9 @@ | ||
CONFIG += testcase | ||
TARGET = tst_headersclean | ||
SOURCES += tst_headersclean.cpp | ||
QT = core testlib | ||
QT = core testlib declarative qml quick qmltest qmldevtools | ||
HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri | ||
isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) { | ||
warning("headersclean.pri from QtCore sources not available. test disabled") | ||
TEMPLATE=subdirs | ||
} | ||
|
||
contains(QT_CONFIG,qml): QT += qml qml-private | ||
# shadowing problems in scenegraph, allow it for now | ||
*-g++*: QMAKE_CXXFLAGS -= -Wshadow |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,5 @@ | ||
TEMPLATE=subdirs | ||
|
||
# FIXME | ||
# This test is crrently broken: | ||
#SUBDIRS=\ | ||
#headersclean \ | ||
|
||
SUBDIRS= | ||
SUBDIRS=\ | ||
headersclean \ | ||
|