summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_model-view-programming.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2010-11-23 11:32:30 (GMT)
committerJoão Abecasis <joao.abecasis@nokia.com>2010-11-23 11:37:32 (GMT)
commitc8aa3d037ead9a7d1d62dc9ba454de8ff7eae9c4 (patch)
tree06fe671f076c28bc291aaddb3a009cd959d52451 /doc/src/snippets/code/doc_src_model-view-programming.cpp
parent802498fcd43558a10bb7477d3957cdd27fd8ec09 (diff)
downloadQt-c8aa3d037ead9a7d1d62dc9ba454de8ff7eae9c4.zip
Qt-c8aa3d037ead9a7d1d62dc9ba454de8ff7eae9c4.tar.gz
Qt-c8aa3d037ead9a7d1d62dc9ba454de8ff7eae9c4.tar.bz2
Adding #ifdefs/#defines lost in the merge to master
The file-engine-refactor moved a lot of code around. So simple merge conflict resolution didn't cut it to finish the merge. Lighthouse on OS X adds Q_WS_QPA, where we were already using QWS. Also introduced QT_NO_CORESERVICES.
Diffstat (limited to 'doc/src/snippets/code/doc_src_model-view-programming.cpp')
0 files changed, 0 insertions, 0 deletions