diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /src/widgets/widgets.pro | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
| download | qtbase-6697f2a899fac47a65122a85691b2cfe63c6152c.tar.gz | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'src/widgets/widgets.pro')
| -rw-r--r-- | src/widgets/widgets.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index d46e20fc32..671d7d3759 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -13,6 +13,8 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore +HEADERS += $$QT_SOURCE_TREE/src/widgets/qtwidgetsversion.h + include(../qbase.pri) contains(QT_CONFIG, x11sm):CONFIG += x11sm |