diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
| commit | d148019f16e3c95916731e59e0324e7c470cc1fc (patch) | |
| tree | d9c0640c9055f24379468b8f55b3419f30a37c47 /config.tests/unix/libjpeg | |
| parent | 8ceab12814a7437a01d917c83ec28fd6e81c459e (diff) | |
| parent | 6b9c57f8cd3df65702db327616913fa9d8172237 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
Diffstat (limited to 'config.tests/unix/libjpeg')
| -rw-r--r-- | config.tests/unix/libjpeg/libjpeg.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/unix/libjpeg/libjpeg.cpp b/config.tests/unix/libjpeg/libjpeg.cpp index 9187133393..106043c608 100644 --- a/config.tests/unix/libjpeg/libjpeg.cpp +++ b/config.tests/unix/libjpeg/libjpeg.cpp @@ -43,9 +43,10 @@ extern "C" { #include <jpeglib.h> } +j_compress_ptr cinfo; + int main(int, char **) { - j_compress_ptr cinfo; jpeg_create_compress(cinfo); return 0; } |