diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-30 08:28:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-30 09:16:58 +0100 |
| commit | 87204c856ae3d8495c41af998ac196a12fe1c779 (patch) | |
| tree | 5af64eaa3acde506d19fe4ab1c88b028a2197adf /examples/widgets/effects/lighting/lighting.pro | |
| parent | 498ef7f9d77fca75bcba2f657aaac38c8dc78aea (diff) | |
| parent | d0812cbdabcff4d388334c499c23992cce98d4da (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/thread/qsemaphore.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: Id35b535e88df63fdfe4007ea92ed4a39c4b6d707
Diffstat (limited to 'examples/widgets/effects/lighting/lighting.pro')
| -rw-r--r-- | examples/widgets/effects/lighting/lighting.pro | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/examples/widgets/effects/lighting/lighting.pro b/examples/widgets/effects/lighting/lighting.pro deleted file mode 100644 index 0a3b397de5..0000000000 --- a/examples/widgets/effects/lighting/lighting.pro +++ /dev/null @@ -1,8 +0,0 @@ -QT += widgets - -SOURCES += main.cpp lighting.cpp -HEADERS += lighting.h - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/lighting -INSTALLS += target |