diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 16:59:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-16 16:59:33 +0100 |
| commit | 3f3be55835427ea9f1bbcc046e05ee538ca214d7 (patch) | |
| tree | 09d1f54d114855c2b06cc505dfbf74c5890c8419 /config.tests | |
| parent | ae293c1cb220847194fba6dcebdbb9194837bb56 (diff) | |
| parent | 9764f8602719676d1fa15e6fd1e7980af16bfc63 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qplatformtheme.h
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/x11/glxfbconfig/glxfbconfig.cpp (renamed from config.tests/qpa/glx/glx.cpp) | 1 | ||||
| -rw-r--r-- | config.tests/x11/glxfbconfig/glxfbconfig.pro (renamed from config.tests/qpa/glx/glx.pro) | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config.tests/qpa/glx/glx.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp index 03af3f6131..77bedb41c8 100644 --- a/config.tests/qpa/glx/glx.cpp +++ b/config.tests/x11/glxfbconfig/glxfbconfig.cpp @@ -44,7 +44,6 @@ int main(int, char **) { - //We require glxfbconfig, ie. glx 1.3 GLXFBConfig config; config = 0; diff --git a/config.tests/qpa/glx/glx.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro index da51a6d231..65f855a5f2 100644 --- a/config.tests/qpa/glx/glx.pro +++ b/config.tests/x11/glxfbconfig/glxfbconfig.pro @@ -1,4 +1,4 @@ -SOURCES = glx.cpp +SOURCES = glxfbconfig.cpp CONFIG += x11 INCLUDEPATH += $$QMAKE_INCDIR_OPENGL |