diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-27 09:58:08 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-27 09:58:33 +0200 |
commit | 01fa9be55572ddb3f69befc68475ed09241eabdf (patch) | |
tree | 03e177b36123aaf32b287eda215014e08b3d269b /Source/WebKit/qt/tests | |
parent | 2e8517924b70a778463e463873eb3d8d0b623eed (diff) | |
parent | a750b262b856178eee47d546944bd095662dccf7 (diff) | |
download | qtwebkit-5.7.0.tar.gz |
Merge remote-tracking branch 'origin/5.6.1' into 5.7.05.7.0
Change-Id: Id8fd457ab1eb501f8f5622cb5f7d88c352e3758f
Diffstat (limited to 'Source/WebKit/qt/tests')
-rw-r--r-- | Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro b/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro index 0e49a7056..99197e1bb 100644 --- a/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro +++ b/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro @@ -1,6 +1,3 @@ -# ------------------------------------------------- -# Project created by QtCreator 2009-12-10T11:25:02 -# ------------------------------------------------- include(../tests.pri) TARGET = hybridPixmap SOURCES += widget.cpp |