diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /examples/itemviews/spreadsheet/spreadsheet.pro | |
parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'examples/itemviews/spreadsheet/spreadsheet.pro')
-rw-r--r-- | examples/itemviews/spreadsheet/spreadsheet.pro | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/examples/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro index f00dfb4c81..93fc5e95c6 100644 --- a/examples/itemviews/spreadsheet/spreadsheet.pro +++ b/examples/itemviews/spreadsheet/spreadsheet.pro @@ -1,17 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Thu Mar 5 14:39:33 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - QT += widgets printsupport -CONFIG += qt warn_on #unix:contains(QT_CONFIG, dbus):QT += dbus widgets -# Input HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h SOURCES += main.cpp \ printview.cpp \ @@ -20,7 +9,6 @@ SOURCES += main.cpp \ spreadsheetitem.cpp RESOURCES += spreadsheet.qrc - build_all:!build_pass { CONFIG -= build_all CONFIG += release |