diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-15 15:30:54 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-15 20:29:56 +0100 |
| commit | 28c303433cac3a9bc90197f599c7c322c2717089 (patch) | |
| tree | 7c85316b05719a628597f8d2cdc7cc30a3167d05 | |
| parent | 864b17ec1bbea826a19dfad113e560c58cc65e61 (diff) | |
| download | qtbase-28c303433cac3a9bc90197f599c7c322c2717089.tar.gz | |
MODULE_INCLUDEPATH is supposed to be one path
Avoid the moving of jconfig.h, and messing up MODULE_INCLUDEPATH
Change-Id: Ib66e8a47cff80f252a7bfb3363b73f63bdbaab8a
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | src/3rdparty/libjpeg/libjpeg.pro | 6 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/src/jconfig.h (renamed from src/3rdparty/libjpeg/jconfig.h) | 0 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libjpeg/libjpeg.pro b/src/3rdparty/libjpeg/libjpeg.pro index 7a555a2d6e..5c3563aae3 100644 --- a/src/3rdparty/libjpeg/libjpeg.pro +++ b/src/3rdparty/libjpeg/libjpeg.pro @@ -6,11 +6,11 @@ CONFIG += \ exceptions_off rtti_off warn_off \ installed -MODULE_INCLUDEPATH = $$PWD $$PWD/src +MODULE_INCLUDEPATH = $$PWD/src MODULE_EXT_HEADERS = $$PWD/src/jpeglib.h \ $$PWD/src/jerror.h \ - $$PWD/jconfig.h \ - $$PWD/src/jmorecfg.h + $$PWD/src/jconfig.h \ + $$PWD/src/jmorecfg.h INCLUDEPATH += $$PWD $$PWD/src diff --git a/src/3rdparty/libjpeg/jconfig.h b/src/3rdparty/libjpeg/src/jconfig.h index 74a74f754c..74a74f754c 100644 --- a/src/3rdparty/libjpeg/jconfig.h +++ b/src/3rdparty/libjpeg/src/jconfig.h |